Rename

[xonotic/gmqcc.git] / util.c

diff --git a/util.c b/util.c
index 92a99f76e463fb1e1d6289d53c629aa04cabfb21..1810adfce16c94d710e063db835d5d15e21cd911 100644 (file)
--- a/util.c
+++ b/util.c
@@ -132,7 +132,7 @@ void *util_memory_r(void *ptrn, size_t byte, unsigned int line, const char *file
 void util_meminfo() {
     struct memblock_t *info;
 
-    if (!opts.memchk)
+    if (!OPTS_OPTION_BOOL(OPTION_MEMCHK))
         return;
 
     for (info = mem_start; info; info = info->next) {
@@ -175,10 +175,10 @@ char *util_strdup(const char *s) {
 
 void util_debug(const char *area, const char *ms, ...) {
     va_list  va;
-    if (!opts.debug)
+    if (!OPTS_OPTION_BOOL(OPTION_DEBUG))
         return;
 
-    if (!strcmp(area, "MEM") && !opts.memchk)
+    if (!strcmp(area, "MEM") && !OPTS_OPTION_BOOL(OPTION_MEMCHK))
         return;
 
     va_start(va, ms);
@@ -770,8 +770,6 @@ int util_vasprintf(char **dat, const char *fmt, va_list args) {
         *dat = tmp;
         return len;
     #endif
-    /* never reached ... */
-    return -1;
 }
 int util_asprintf(char **ret, const char *fmt, ...) {
     va_list  args;