File x2goagent.diff of Package x2goagent

Overview Repositories Revisions Requests Users Attributes Meta

File x2goagent.diff of Package x2goagent

diff -Naur x2goagent-3.4.0-3.orig/nxcomp/Children.cpp x2goagent-3.4.0-3/nxcomp/Children.cpp
--- x2goagent-3.4.0-3.orig/nxcomp/Children.cpp	2008-03-20 17:25:47.000000000 +0100
+++ x2goagent-3.4.0-3/nxcomp/Children.cpp	2011-02-02 21:15:45.447890325 +0100
@@ -69,7 +69,7 @@
 
 extern char *GetClientPath();
 
-extern int CheckParent(char *name, char *type, int parent);
+extern int CheckParent(const char *name, const char *type, int parent);
 
 #ifdef __sun
 extern char **environ;
@@ -81,19 +81,19 @@
 // have been disabled in the main process.
 //
 
-static void SystemCleanup(char *name);
+static void SystemCleanup(const char *name);
 
 //
 // Release all objects allocated in the
 // heap.
 
-static void MemoryCleanup(char *name);
+static void MemoryCleanup(const char *name);
 
 //
 // Remove 'name' from the environment.
 //
 
-static int UnsetEnv(char *name);
+static int UnsetEnv(const char *name);
 
 //
 // Start a nxclient process in dialog mode.
@@ -926,7 +926,7 @@
   exit(0);
 }
 
-void SystemCleanup(char *name)
+void SystemCleanup(const char *name)
 {
   #ifdef TEST
   *logofs << name << ": Performing system cleanup in process "
@@ -942,7 +942,7 @@
   InstallSignals();
 }
 
-void MemoryCleanup(char *name)
+void MemoryCleanup(const char *name)
 {
   #ifdef TEST
   *logofs << name << ": Performing memory cleanup in process "
@@ -977,7 +977,7 @@
   EnableSignals();
 }
 
-int UnsetEnv(char *name)
+int UnsetEnv(const char *name)
 {
   int result;
 
diff -Naur x2goagent-3.4.0-3.orig/nxcomp/Loop.cpp x2goagent-3.4.0-3/nxcomp/Loop.cpp
--- x2goagent-3.4.0-3.orig/nxcomp/Loop.cpp	2008-04-14 15:39:06.000000000 +0200
+++ x2goagent-3.4.0-3/nxcomp/Loop.cpp	2011-02-02 21:16:31.491891608 +0100
@@ -354,7 +354,7 @@
 static int CheckChild(int pid, int status);
 static int WaitChild(int child, const char *label, int force);
 
-int CheckParent(char *name, char *type, int parent);
+int CheckParent(const char *name, const char *type, int parent);
 
 void RegisterChild(int child);
 
@@ -6396,7 +6396,7 @@
   lastChild = child;
 }
 
-int CheckParent(char *name, char *type, int parent)
+int CheckParent(const char *name, const char *type, int parent)
 {
   if (parent != getppid() || parent == 1)
   {
@@ -9995,8 +9995,8 @@
 
   *selectedName = '\0';
 
-  char *localPrefix;
-  char *remotePrefix;
+  const char *localPrefix;
+  const char *remotePrefix;
 
   if (control -> ProxyMode == proxy_client)
   {
@@ -10979,7 +10979,7 @@
                                       packMethod == PACK_LOSSLESS ||
                                           packMethod == PACK_ADAPTIVE)
   {
-    char *dash = rindex(opt, '-');
+    const char *dash = rindex(opt, '-');
 
     if (dash != NULL && strlen(dash) == 2 &&
             *(dash + 1) >= '0' && *(dash + 1) <= '9')
@@ -15764,8 +15764,8 @@
       int replace = 1;
       int local   = 1;
 
-      char *message;
-      char *type;
+      const char *message;
+      const char *type;
 
       switch (lastAlert.code)
       {
@@ -16218,7 +16218,7 @@
   {
     T_channel_type type = channel_none;
 
-    char *label = NULL;
+    const char *label = NULL;
     int domain  = -1;
     int fd      = -1;

Places

File x2goagent.diff of Package x2goagent

Places