gitattributes for whitespace

[xonotic/gmqcc.git] / util.c

diff --git a/util.c b/util.c
index 942f6617dd35a0964352504d2d2429dbb49ae3ca..7cf781212d9a822241b1348c645a54d489a44643 100644 (file)
--- a/util.c
+++ b/util.c
@@ -102,9 +102,9 @@ char *util_strdup(const char *s) {
  * as well.  This function shouldn't be used to create a
  * char array that is later freed (it uses pointer arith)
  */
-char *util_strrq(char *s) {
-    char *dst = s;
-    char *src = s;
+char *util_strrq(const char *s) {
+    char *dst = (char*)s;
+    char *src = (char*)s;
     char  chr;
     while ((chr = *src++) != '\0') {
         if (chr == '\\') {
@@ -126,14 +126,12 @@ char *util_strrq(char *s) {
 char *util_strchp(const char *s, const char *e) {
     if (!s || !e)
         return NULL;
+
+    const char *c = s;    
+    while (c != e)
+        c++;
         
-    size_t m  = 0;
-    char  *c  = util_strdup(s);
-    while (s != e)
-        s++,c++,m++;
-         
-    *c = '\0';
-    return c-m;
+    return util_strdup(s);
 }
 
 /*
@@ -141,14 +139,14 @@ char *util_strchp(const char *s, const char *e) {
  * done pointer wise instead of strlen(), and an array
  * access.
  */
-char *util_strrnl(char *src) {
+char *util_strrnl(const char *src) {
     if (!src) return NULL;
-    char   *cpy = src;
+    char   *cpy = (char*)src;
     while (*cpy && *cpy != '\n')
         cpy++;
 
     *cpy = '\0';
-    return src;
+    return (char*)src;
 }
 
 /*