summaryrefslogtreecommitdiff
path: root/graphics/libv3d/files/patch-libv3d_string.cpp
blob: 3e26dff883c98b35bea7c4bfd5457666a29a5a33 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
--- libv3d/string.cpp.orig	2007-11-16 12:31:03.000000000 +0100
+++ libv3d/string.cpp	2007-11-16 12:39:14.000000000 +0100
@@ -1012,20 +1012,20 @@
 
         /* Is string empty? */
         if(string == NULL)
-            return("");
+            return((char *)"");
 	if((string[0] == '\0') ||
            (string[0] == '\r') ||
            (string[0] == '\n')
         )
-            return("");
+            return((char *)"");
 
         /* Is string a comment? */
         if(StringIsComment(string, UNIXCFG_COMMENT_CHAR))
-            return("");
+            return((char *)"");
 
         /* Does string have a delimiter? */
         if(strchr(string, CFG_PARAMETER_DELIMITER) == NULL)
-            return("");
+            return((char *)"");
 
 
         /* Begin fetching value from string. */
@@ -1295,7 +1295,7 @@
 	static char arg[CS_DATA_MAX_LEN];
 
         if(str == NULL)
-            return("");
+            return((char *)"");
 
         strncpy(arg, str, CS_DATA_MAX_LEN);
         arg[CS_DATA_MAX_LEN - 1] = '\0';
@@ -1309,7 +1309,7 @@
             return(strptr);
         }
 
-        return("");
+        return((char *)"");
 }
 
 
@@ -1337,15 +1337,15 @@
 
 
         if(format == NULL)
-            return("");
+            return((char *)"");
         if((*format) == '\0')
-            return("");
+            return((char *)"");
 
 	/* Get current time. */
         time(&current);
         tm_ptr = localtime(&current);
 	if(tm_ptr == NULL)
-	    return("");
+	    return((char *)"");
 
         /* Format time string. */
 	len = strftime(
@@ -1377,13 +1377,13 @@
 
 
         if(format == NULL)
-            return("");
+            return((char *)"");
         if((*format) == '\0')
-            return("");
+            return((char *)"");
 
         tm_ptr = localtime(&seconds);
 	if(tm_ptr == NULL)
-	    return("");
+	    return((char *)"");
 
         /* Format time string. */
         len = strftime(