From b12dd08cdf9c0ba3d7ff4c62a14658e059348197 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Fri, 21 Aug 2015 15:34:02 +0200
Subject: Cleaning up

---
 Linux_C_12/cCrossCallClipboard_121.c | 4 ++--
 Linux_C_12/cCrossCallWindows_121.c   | 5 +----
 Linux_C_12/cCrossCall_121.c          | 9 ++-------
 Linux_C_12/cCrossCallxDI_121.c       | 2 --
 4 files changed, 5 insertions(+), 15 deletions(-)

(limited to 'Linux_C_12')

diff --git a/Linux_C_12/cCrossCallClipboard_121.c b/Linux_C_12/cCrossCallClipboard_121.c
index 0c092b7..525483f 100644
--- a/Linux_C_12/cCrossCallClipboard_121.c
+++ b/Linux_C_12/cCrossCallClipboard_121.c
@@ -8,7 +8,7 @@
     About this module:
     Routines related to clipboard handling.
 ********************************************************************************************/
-#include <string.h>
+
 #include "cCrossCallClipboard_121.h"
 #include "cCrossCall_121.h"
 
@@ -29,7 +29,7 @@ void EvalCcRqSETCLIPBOARDTEXT (CrossCallInfo *pcci)		/* textptr; no result. */
 
     printf("EvalCcRqSETCLIPBOARDTEXT\n");
     gtk_clipboard_set_text (gtk_clipboard_get(GDK_NONE),
-                            text, strlen(text));
+                            text, rstrlen(text));
 
     MakeReturn0Cci (pcci);
 }
diff --git a/Linux_C_12/cCrossCallWindows_121.c b/Linux_C_12/cCrossCallWindows_121.c
index 38ba9ca..30fa5b0 100644
--- a/Linux_C_12/cCrossCallWindows_121.c
+++ b/Linux_C_12/cCrossCallWindows_121.c
@@ -10,12 +10,9 @@
 ********************************************************************************************/
 
 #include "cCrossCallWindows_121.h"
-#include "cCCallWindows_121.h"
-#include "cCCallSystem_121.h"
 #include "cCrossCall_121.h"
 #include "cCrossCallxDI_121.h"
 #include <gdk/gdkkeysyms.h>
-#include <string.h>
 
 /*	Global data:
 */
@@ -834,7 +831,7 @@ void EvalCcRqSETWINDOWTITLE (CrossCallInfo *pcci)		/* hwnd, textptr		no result.
     {
         printf("Setting for text view.\n");
         GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(window));
-        gtk_text_buffer_set_text (buffer, title, strlen(title));
+        gtk_text_buffer_set_text (buffer, title, rstrlen(title));
     }
     else
     {
diff --git a/Linux_C_12/cCrossCall_121.c b/Linux_C_12/cCrossCall_121.c
index 7028348..37bc4e0 100644
--- a/Linux_C_12/cCrossCall_121.c
+++ b/Linux_C_12/cCrossCall_121.c
@@ -26,13 +26,8 @@
 #include "cCrossCall_121.h"
 #include "cCrossCallWindows_121.h"		/* Contains the implementation of cursors. */
 #include <gdk/gdkkeysyms.h>
-#include <pthread.h>
-#include <unistd.h>
 #include <errno.h>
-#include <sys/types.h>
 #include <stdlib.h>
-#include <string.h>
-#include <inttypes.h>
 
 char** global_argv;
 int global_argc = 0;
@@ -622,8 +617,8 @@ void WinLaunchApp2 (CLEAN_STRING commandline, CLEAN_STRING pathname,
 
     exname = cstring(pathname);
     cl = cstring (commandline);
-    strcpy (path, cl);
-    for (i = strlen (path); path[i] != '\\' && i >= 0; i--)
+    rscopy (path, cl);
+    for (i = rstrlen (path); path[i] != '\\' && i >= 0; i--)
     {
         path[i] = 0;
     }
diff --git a/Linux_C_12/cCrossCallxDI_121.c b/Linux_C_12/cCrossCallxDI_121.c
index aa509f7..42225ff 100644
--- a/Linux_C_12/cCrossCallxDI_121.c
+++ b/Linux_C_12/cCrossCallxDI_121.c
@@ -604,8 +604,6 @@ OS InstallCrossCallxDI (OS ios)
     AddCrossCallEntry (newTable, CcRqCREATETOOLBARSEPARATOR, EvalCcRqCREATETOOLBARSEPARATOR);
     AddCrossCallEntries (gCrossCallProcedureTable, newTable);
 
-    printf("Done\n");
-
     return ios;
 }
 
-- 
cgit v1.2.3