commit f8d525b1290641917bbb379325a9694803436c4a
author Pierre Ossman <ossman@cendio.se> Wed Jul 09 17:02:27 2014 +0200
committer Pierre Ossman <ossman@cendio.se> Mon Jul 14 16:03:42 2014 +0200
tree 4512c291db66a801254c4e7db77cf42c3847edb1
parent c0397269fcab67e9acd4fdcbc29f24d79ed0ef39

String literals are constant

vncviewer/vncviewer.cxx

diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
index eaf94ba..3f03937 100644
--- a/vncviewer/vncviewer.cxx
+++ b/vncviewer/vncviewer.cxx
@@ -313,8 +313,8 @@
 createTunnel(const char *gatewayHost, const char *remoteHost,
              int remotePort, int localPort)
 {
-  char *cmd = getenv("VNC_VIA_CMD");
-  char *percent;
+  const char *cmd = getenv("VNC_VIA_CMD");
+  char *cmd2, *percent;
   char lport[10], rport[10];
   sprintf(lport, "%d", localPort);
   sprintf(rport, "%d", remotePort);
@@ -325,9 +325,11 @@
   if (!cmd)
     cmd = "/usr/bin/ssh -f -L \"$L\":\"$H\":\"$R\" \"$G\" sleep 20";
   /* Compatibility with TigerVNC's method. */
-  while ((percent = strchr(cmd, '%')) != NULL)
+  cmd2 = strdup(cmd);
+  while ((percent = strchr(cmd2, '%')) != NULL)
     *percent = '$';
-  system(cmd);
+  system(cmd2);
+  free(cmd2);
 }
 
 static int mktunnel()

win/vncconfig/vncconfig.cxx

diff --git a/win/vncconfig/vncconfig.cxx b/win/vncconfig/vncconfig.cxx
index 16bf172..5719397 100644
--- a/win/vncconfig/vncconfig.cxx
+++ b/win/vncconfig/vncconfig.cxx
@@ -159,7 +159,7 @@
       HICON icon = (HICON)LoadImage(inst, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 0, 0, LR_SHARED);
 
       // Create the PropertySheet handler
-      TCHAR* propSheetTitle = _T("VNC Server Properties (Service-Mode)");
+      const TCHAR* propSheetTitle = _T("VNC Server Properties (Service-Mode)");
       if (configKey == HKEY_CURRENT_USER)
         propSheetTitle = _T("VNC Server Properties (User-Mode)");
       PropSheet sheet(inst, propSheetTitle, pages, icon);