Remove trailing whitespace

[xonotic/gmqcc.git] / util.c

diff --git a/util.c b/util.c
index 95736e133f9221b42868d6860144b94c05fa6248..9a23aed96400f62270240cc7d3d3d5421858e9da 100644 (file)
--- a/util.c
+++ b/util.c
@@ -24,16 +24,16 @@
 #include <errno.h>
 #include "gmqcc.h"
 
-unsigned long long mem_ab = 0;
-unsigned long long mem_db = 0;
-unsigned long long mem_at = 0;
-unsigned long long mem_dt = 0;
+uint64_t mem_ab = 0;
+uint64_t mem_db = 0;
+uint64_t mem_at = 0;
+uint64_t mem_dt = 0;
 
 struct memblock_t {
     const char  *file;
     unsigned int line;
     unsigned int byte;
-}; 
+};
 
 void *util_memory_a(unsigned int byte, unsigned int line, const char *file) {
     struct memblock_t *info = malloc(sizeof(struct memblock_t) + byte);
@@ -51,9 +51,11 @@ void *util_memory_a(unsigned int byte, unsigned int line, const char *file) {
 }
 
 void util_memory_d(void *ptrn, unsigned int line, const char *file) {
+    void              *data = NULL;
+    struct memblock_t *info = NULL;
     if (!ptrn) return;
-    void              *data = (void*)((uintptr_t)ptrn-sizeof(struct memblock_t));
-    struct memblock_t *info = (struct memblock_t*)data;
+    data = (void*)((uintptr_t)ptrn-sizeof(struct memblock_t));
+    info = (struct memblock_t*)data;
 
     util_debug("MEM", "released:   % 8u (bytes) address 0x%08X @ %s:%u\n", info->byte, data, file, line);
     mem_db += info->byte;
@@ -124,16 +126,15 @@ char *util_strrq(const char *s) {
  * copy of it and null terminating it at the required position.
  */
 char *util_strchp(const char *s, const char *e) {
+    const char *c = NULL;
     if (!s || !e)
         return NULL;
-        
-    size_t m  = 0;
-    char  *c  = util_strdup(s);
-    while (s != e)
-        s++,c++,m++;
-         
-    *c = '\0';
-    return c-m;
+
+    c = s;
+    while (c != e)
+        c++;
+
+    return util_strdup(s);
 }
 
 /*
@@ -142,12 +143,15 @@ char *util_strchp(const char *s, const char *e) {
  * access.
  */
 char *util_strrnl(const char *src) {
-    if (!src) return NULL;
-    char   *cpy = (char*)src;
-    while (*cpy && *cpy != '\n')
-        cpy++;
+    char   *cpy = NULL;
 
-    *cpy = '\0';
+    if (src) {
+        cpy = (char*)src;
+        while (*cpy && *cpy != '\n')
+            cpy++;
+
+        *cpy = '\0';
+    }
     return (char*)src;
 }
 
@@ -160,7 +164,7 @@ char *util_strsws(const char *skip) {
     size_t size = 0;
     if (!skip)
         return NULL;
-    
+
     while (*skip == ' ' || *skip == '\t')
         skip++,size++;
     return util_strdup(skip-size);
@@ -193,10 +197,10 @@ bool util_strdigit(const char *str) {
 }
 
 void util_debug(const char *area, const char *ms, ...) {
+    va_list  va;
     if (!opts_debug)
         return;
 
-    va_list  va;
     va_start(va, ms);
     fprintf (stdout, "DEBUG: ");
     fputc   ('[',  stdout);
@@ -326,7 +330,7 @@ static const uint16_t util_crc16_table[] = {
     0x8FD9,     0x9FF8,     0x6E17,     0x7E36,     0x4E55,     0x5E74,
     0x2E93,     0x3EB2,     0x0ED1,     0x1EF0
 };
-    
+
 /*
  * Implements a CRC function for X worth bits using (uint[X]_t)
  * as type. and util_crc[X]_table.