Changeset 174 for trunk/src/helpers/stringh.c

Timestamp:

Jun 14, 2002, 2:20:11 PM (23 years ago)

Author:

umoeller

Message:

Misc updates.

File:

• trunk/src/helpers/stringh.c (modified) (33 diffs)

trunk/src/helpers/stringh.c

@@ -104 +104 @@
                 memcpy(*ppszTarget, pcszSource, ulLength + 1);
             else
-                return (ERROR_NOT_ENOUGH_MEMORY);
+                return ERROR_NOT_ENOUGH_MEMORY;
         }
         else
@@ -149 +149 @@
                 memcpy(*ppszTarget, pcszSource, ulLength + 1);
             else
-                return (ERROR_NOT_ENOUGH_MEMORY);
+                return ERROR_NOT_ENOUGH_MEMORY;
         }
         else
@@ -155 +155 @@
     }
     else
-        return (ERROR_INVALID_PARAMETER);
+        return ERROR_INVALID_PARAMETER;
 
     if (pulLength)
@@ -174 +174 @@
 {
     if (string2)
-        return (strcpy(string1, string2));
+        return strcpy(string1, string2);
 
     *string1 = '\0';
-    return (string1);
+    return string1;
 }
 
@@ -212 +212 @@
         *pulLength = ulLength;
 
-    return (pszReturn);
+    return pszReturn;
 }
 
@@ -244 +244 @@
         *pulLength = ulLength;
 
-    return (pszReturn);
+    return pszReturn;
 }
 
@@ -266 +266 @@
     {
         int i = strcmp(p1, p2);
-        if (i < 0) return (-1);
-        if (i > 0) return (+1);
+        if (i < 0) return -1;
+        if (i > 0) return +1;
     }
     else if (p1)
         // but p2 is NULL: p1 greater than p2 then
-        return (+1);
+        return +1;
     else if (p2)
         // but p1 is NULL: p1 less than p2 then
-        return (-1);
+        return -1;
 
     // return 0 if strcmp returned 0 above or both strings are NULL
-    return (0);
+    return 0;
 }
 
@@ -293 +293 @@
     {
         int i = stricmp(p1, p2);
-        if (i < 0) return (-1);
-        if (i > 0) return (+1);
+        if (i < 0) return -1;
+        if (i > 0) return +1;
     }
     else if (p1)
         // but p2 is NULL: p1 greater than p2 then
-        return (+1);
+        return +1;
     else if (p2)
         // but p1 is NULL: p1 less than p2 then
-        return (-1);
+        return -1;
 
     // return 0 if strcmp returned 0 above or both strings are NULL
-    return (0);
+    return 0;
 }
 
@@ -342 +342 @@
             free(pszSrchIn);
     }
-    return (prc);
+
+    return prc;
 }
 
@@ -371 +372 @@
     *pTarget = 0;
 
-    return (ul);
+    return ul;
 }
 
@@ -385 +386 @@
 {
     if (pcsz)
-        return (strlen(pcsz));
+        return strlen(pcsz);
 
     return 0;
@@ -408 +409 @@
         return (strlen(pcsz) + 1);
 
-    return (0);
+    return 0;
 }
 
@@ -432 +433 @@
             break;
     }
-    return (ulCount);
+    return ulCount;
 }
 
@@ -446 +447 @@
     {
         if (isdigit(*p) == 0)
-            return (FALSE);
+            return FALSE;
         p++;
     }
 
-    return (TRUE);
+    return TRUE;
 }
 
@@ -484 +485 @@
     }
 
-    return (pszSubstr);
+    return pszSubstr;
 }
 
@@ -522 +523 @@
     }
 
-    return (pszSubstr);
+    return pszSubstr;
 }
 
@@ -619 +620 @@
     }
 
-    return (pszReturn);
+    return pszReturn;
 }
 
@@ -651 +652 @@
     }
 
-    return (pszReturn);
+    return pszReturn;
 }
 
@@ -690 +691 @@
         }
     }
-    return (ulrc);
+    return ulrc;
 }
 
@@ -742 +743 @@
     }
 
-    return (pszNew);
+    return pszNew;
 }
 
@@ -785 +786 @@
         *ppszBuf = xstrBuf.psz;
 
-    return (ulrc);
+    return ulrc;
 }
 
@@ -809 +810 @@
                 ulWords++;
     }
-    return (ulWords);
+    return ulWords;
 }
 
@@ -874 +875 @@
             *ppszStart = pStart;
             *ppszEnd = pEndOfWord;
-            return (TRUE);
-        }
-    }
-
-    return (FALSE);
+            return TRUE;
+        }
+    }
+
+    return FALSE;
 }
 
@@ -995 +996 @@
 
     }
-    return (pszReturn);
+    return pszReturn;
 }
 
@@ -1049 +1050 @@
     if (pulOffset)
         *pulOffset = pNextLine - pszSearchIn;
-    return (pNextLine);
+    return pNextLine;
 }
 
@@ -1080 +1081 @@
             p++;
 
-    return (rc);
+    return rc;
 }
 
@@ -1143 +1144 @@
    }
 
-   return (prc);
+   return prc;
 }
 
@@ -1196 +1197 @@
         pszSearchIn2++;
     }
-    return (prc);
+    return prc;
 } */
 
@@ -1231 +1232 @@
     }
 
-    return (pParam);
+    return pParam;
 }
 
@@ -1314 +1315 @@
         }
     }
-    return (prc);
+    return prc;
 }
 
@@ -1362 +1363 @@
     }
 
-    return (prc);
+    return prc;
 }
 
@@ -1548 +1549 @@
     }
 
-    return (ulrc);
+    return ulrc;
 }
 
@@ -1705 +1706 @@
         pszReturn = strReturn.psz;
 
-    return (pszReturn);
+    return pszReturn;
 }