Fixed some issues with strings

1 files changed, 14 insertions, 14 deletions

diff --git a/Linux_C_12/util_121.c b/Linux_C_12/util_121.c
index 544cff6..89d5b4f 100644
--- a/Linux_C_12/util_121.c
+++ b/Linux_C_12/util_121.c
@@ -137,18 +137,18 @@ int rabs (int i)
 

 char * cstring (CLEAN_STRING s)

 {

-    static char *cstr = (char *) NULL;

+    char* chars = rmalloc(CleanStringLength(s) + 1);

 

-    rprintf("{cstring");

-	if (cstr)

-	{

-		rfree (cstr);

-	}

+	static char *cstr = (char*) NULL;

+	cstr = rmalloc(CleanStringLength(s) + 1 + sizeof(int));

+

+	int i;

+	for (i=0;i < CleanStringLength(s); i++)

+		chars[i] = CleanStringCharacters(s)[i];

+	chars[i] = 0;

+

+	rsncopy(cstr, chars, CleanStringLength(s) + 1);

 

-	cstr = (char *) rmalloc ((s->length) + 1);

-	rsncopy (cstr, s->characters, s->length);

-	cstr[s->length] = 0;

-/* rprintf("}\n"); */

 	return cstr;

 }	/* cstring */

 

@@ -1580,10 +1580,10 @@ void printMessage (char *fname, HWND hWin, UINT uMess, WPARAM wPara, LPARAM lPar
 }	/* printMessage */

 #endif

 

-gchar *createMnemonicString(gchar *source)

+gchar* createMnemonicString(gchar* source)

 {

-	gchar *dest;

-	gchar *s;

+	gchar* dest;

+	static gchar* s;

     printf("createMnemonicString\n");

 

     if (source == NULL)

@@ -1616,7 +1616,7 @@ gchar *createMnemonicString(gchar *source)
 	}

 

 	*dest = 0;

-    printf("Generated Mnemonic: %s\n", s);

+    printf("Generated Mnemonic: %p, %s\n", s, s);

 	return s;

 }