X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/b3db2950b11fc5f3abd9ecdae855746e2d19c836..b95b3724f522c3d7ab2ede752e2913287b172b8e:/src/util.c

diff --git a/src/util.c b/src/util.c
index de1d008..0b26fa1 100644
--- a/src/util.c
+++ b/src/util.c
@@ -81,13 +81,17 @@ remove_sep(const char *base)
 {
 	char *p;
 	char *s = g_strdup(base);
+	char *q=s;
 
 	/* don't eat C++ :: thingies */
 	if (for_cpp && strstr (s, "::") != NULL)
 		return s;
 
-	while((p = strchr(s, ':')))
-		strcpy(p, p+1);
+	for(p=(char *)base;*p;p++){
+		if (*p!=':')
+			*q++=*p;
+	}
+	*q='\0';
 	return s;
 }
 
@@ -101,8 +105,18 @@ replace_sep(const char *base, char r)
 	if (for_cpp && strstr (s, "::") != NULL)
 		return s;
 
-	while((p=strchr(s,':')))
-		*p = r;
+	if (r == '\0') {
+		while ((p=strchr(s,':')) != NULL) {
+			char *t = p;
+			while (*t != '\0') {
+				*t = *(t+1);
+				t++;
+			}
+		}
+	} else {
+		while ((p=strchr(s,':')) != NULL)
+			*p = r;
+	}
 	if(*s == r) {
 		p = g_strdup(s+1);
 		g_free(s);
@@ -258,7 +272,10 @@ get_cast (const char *type, gboolean simple_only)
 
 	init_type_hash ();
 
-	gtype = g_hash_table_lookup (type_hash, type);
+	if(strncmp(type, "BOXED_", 6) == 0)	 
+	  gtype = g_hash_table_lookup (type_hash, "BOXED");
+	else
+	  gtype = g_hash_table_lookup (type_hash, type);
 
 	if (gtype == NULL ||
 	    (simple_only &&
@@ -390,6 +407,31 @@ gob_strdown (char *str)
 	return str;
 }
 
+int
+gob_strcasecmp(const char *s1, const char *s2)
+{
+	return g_ascii_strcasecmp(s1, s2);
+}
+
+char *
+gob_str_delete_quotes(char *str)
+{
+	char *p, *i;
+	p=i=str;
+	while(*p!='\0')
+	{
+		if(*p=='\"')
+		{
+			p++;
+			continue;
+		}
+		*i=*p;
+		p++; i++;
+	}
+	*i=*p;
+	return str;
+}
+
 char *
 make_me_type (const char *type, const char *alt)
 {