Changeset 15398

Timestamp:

04/28/12 17:27:01 (11 years ago)

Author:

obi

Message:

[titan] update string_resub

File:

• titan/titan/global.h (modified) (3 diffs)

titan/titan/global.h

@@ -4723 +4723 @@
 }
 
-char* string_resub(char* str, char* str2, char* filename)
-{
-        debug(1000, "in");
-        int i, len_str, len_filename;
-
-        if(str == NULL || str2 == NULL || filename == NULL) return 0;
+char* string_resub(char* str, char* str2, char* data)
+{
+        debug(1000, "in");
+
+        char* tmpstr = NULL;
+        tmpstr = ostrcat(tmpstr, data, 1, 0);
+                
+        int i, len_str, len_data;
+
+        if(str == NULL || str2 == NULL || tmpstr == NULL) return 0;
 
         len_str = strlen(str);
-        len_filename = strlen(filename);
+        len_data = strlen(tmpstr);
 
         int count = 0;
-        for(i = 0; (i + len_str) < len_filename; i++)
-        {
-                if(strncmp(filename + i, str, len_str) == 0 && count == 0)
+        for(i = 0; (i + len_str) < len_data; i++)
+        {
+                if(strncmp(tmpstr + i, str, len_str) == 0 && count == 0)
                 {
                         count = i + len_str;
-                        filename[i] = ' ';
+                        tmpstr[i] = ' ';
                 }
                 else if(count == i && count != 0)
@@ -4747 +4751 @@
                 }
                 else
-                        filename[i] = ' ';
+                        tmpstr[i] = ' ';
         }
         len_str = strlen(str2);
 
-        for(i = 0; (i + len_str) < len_filename; i++)
-        {
-                if(strncmp(filename + i, str2, len_str) == 0 && i >= count)
-                {
-                        filename[i] = '\0';
+        for(i = 0; (i + len_str) < len_data; i++)
+        {
+                if(strncmp(tmpstr + i, str2, len_str) == 0 && i >= count)
+                {
+                        tmpstr[i] = '\0';
                         break;
                 }
@@ -4761 +4765 @@
 
         debug(1000, "out");
-        return strstrip(filename);
+        return strstrip(tmpstr);
 }