X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=util.c;h=3275ad82520367f00a2106af828baefb6b2d78fd;hb=6b85f3d3702c3677bbb34b2af7d2b02a1201a1a1;hp=02e4e6c1986a89852c7ec6a19f7458a133a94d4e;hpb=6b5776776d8cbe84b5e4f53cf401e76a91be2eb3;p=xonotic%2Fgmqcc.git

diff --git a/util.c b/util.c
index 02e4e6c..3275ad8 100644
--- a/util.c
+++ b/util.c
@@ -24,10 +24,10 @@
 #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;
@@ -46,17 +46,21 @@ void *util_memory_a(unsigned int byte, unsigned int line, const char *file) {
     util_debug("MEM", "allocation: % 8u (bytes) address 0x%08X @ %s:%u\n", byte, data, file, line);
     mem_at++;
     mem_ab += info->byte;
+
     return data;
 }
 
 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;
     mem_dt++;
+
     free(data);
 }
 
@@ -100,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 == '\\') {
@@ -118,25 +122,56 @@ char *util_strrq(char *s) {
 }
 
 /*
- * Remove newline from a string (if it exists).  This is
- * done pointer wise instead of strlen(), and an array
- * access.
+ * Chops a substring from an existing string by creating a
+ * copy of it and null terminating it at the required position.
  */
-char *util_strrnl(char *src) {
-    if (!src) return NULL;
-    char   *cpy = src;
-    while (*cpy && *cpy != '\n')
-        cpy++;
-
-    *cpy = '\0';
-    return src;
+char *util_strchp(const char *s, const char *e) {
+    const char *c = NULL;
+    if (!s || !e)
+        return NULL;
+
+    c = s;
+    while (c != e)
+        c++;
+
+    return util_strdup(s);
+}
+
+/*
+ * Returns true if string is all uppercase, otherwise
+ * it returns false.
+ */
+bool util_strupper(const char *str) {
+    while (*str) {
+        if(!isupper(*str))
+            return false;
+        str++;
+    }
+    return true;
+}
+
+/*
+ * Returns true if string is all digits, otherwise
+ * it returns false.
+ */
+bool util_strdigit(const char *str) {
+    while (*str) {
+        if(!isdigit(*str))
+            return false;
+        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);
@@ -266,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.
@@ -335,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;