X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=util.c;h=3275ad82520367f00a2106af828baefb6b2d78fd;hb=75812d486ae21270e573300c3a5f6a0458bf0104;hp=942f6617dd35a0964352504d2d2429dbb49ae3ca;hpb=858d9734a2b41a5c08b709daae30fc4664b45480;p=xonotic%2Fgmqcc.git

diff --git a/util.c b/util.c
index 942f661..3275ad8 100644
--- 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;
@@ -102,9 +104,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 == '\\') {
@@ -124,46 +126,15 @@ char *util_strrq(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;
-}
 
-/*
- * Remove newline from a string (if it exists).  This is
- * done pointer wise instead of strlen(), and an array
- * access.
- */
-char *util_strrnl(char *src) {
-    if (!src) return NULL;
-    char   *cpy = src;
-    while (*cpy && *cpy != '\n')
-        cpy++;
-
-    *cpy = '\0';
-    return src;
-}
+    c = s;
+    while (c != e)
+        c++;
 
-/*
- * Removes any whitespace prefixed on a string by moving
- * skipping past it, and stroing the skip distance, so
- * the string can later be freed (if it was allocated)
- */
-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);
+    return util_strdup(s);
 }
 
 /*
@@ -192,11 +163,15 @@ bool util_strdigit(const char *str) {
     return true;
 }
 
+bool util_strncmpexact(const char *src, const char *ned, size_t len) {
+    return (!strncmp(src, ned, len) && !src[len]);
+}
+
 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 +301,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.
@@ -395,3 +370,11 @@ int util_getline(char **lineptr, size_t *n, FILE *stream) {
     *pos = '\0';
     return (ret = pos - *lineptr);
 }
+
+/* TODO: opts.c? when it gets large enugh */
+/* global options */
+bool opts_debug                     = false;
+bool opts_memchk                    = false;
+bool opts_darkplaces_stringtablebug = false;
+bool opts_omit_nullcode             = false;
+int  opts_compiler                  = COMPILER_GMQCC;