Fixed possible bug in VM. Added coverity rules to makefiles.

[xonotic/gmqcc.git] / util.c

diff --git a/util.c b/util.c
index 5e234ae4c749d915742d8f7fe22db01765930f2b..b34460d97b63dd983d5e8e5b00161a31512583ec 100644 (file)
--- a/util.c
+++ b/util.c
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 #include <string.h>
-#include <ctype.h>
+#include <stdlib.h>
 
 #include "gmqcc.h"
 
@@ -200,7 +200,7 @@ uint16_t util_crc16(const char *k, int len, const short clamp) {
 size_t util_strtocmd(const char *in, char *out, size_t outsz) {
     size_t sz = 1;
     for (; *in && sz < outsz; ++in, ++out, ++sz)
-        *out = (*in == '-') ? '_' : (isalpha(*in) && !isupper(*in)) ? *in + 'A' - 'a': *in;
+        *out = (*in == '-') ? '_' : (util_isalpha(*in) && !util_isupper(*in)) ? *in + 'A' - 'a': *in;
     *out = 0;
     return sz-1;
 }
@@ -208,7 +208,7 @@ size_t util_strtocmd(const char *in, char *out, size_t outsz) {
 size_t util_strtononcmd(const char *in, char *out, size_t outsz) {
     size_t sz = 1;
     for (; *in && sz < outsz; ++in, ++out, ++sz)
-        *out = (*in == '_') ? '-' : (isalpha(*in) && isupper(*in)) ? *in + 'a' - 'A' : *in;
+        *out = (*in == '_') ? '-' : (util_isalpha(*in) && util_isupper(*in)) ? *in + 'a' - 'A' : *in;
     *out = 0;
     return sz-1;
 }
@@ -320,7 +320,7 @@ int util_asprintf(char **ret, const char *fmt, ...) {
 
         allocated = (char*)mem_a(4096); /* A page must be enough */
         strerror_s(allocated, 4096, num);
-    
+
         vec_push(vector, allocated);
         return (const char *)allocated;
     }
@@ -389,7 +389,7 @@ int util_asprintf(char **ret, const char *fmt, ...) {
 static uint32_t mt_state[MT_SIZE];
 static size_t   mt_index = 0;
 
-static GMQCC_INLINE void mt_generate() {
+static GMQCC_INLINE void mt_generate(void) {
     /*
      * The loop has been unrolled here: the original paper and implemenation
      * Called for the following code: