Enforce C99 standard

Smithsonian · Sep 17, 2024 · e1fca6e · e1fca6e
1 parent 1811b41
commit e1fca6e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/config.mk b/config.mk
@@ -27,7 +27,7 @@ CC ?= gcc
 CPPFLAGS += -I$(INC)
 
 # Base compiler options (if not defined externally...)
-CFLAGS ?= -Os -Wall 
+CFLAGS ?= -Os -Wall -std=c99
 
 # Extra warnings (not supported on all compilers)
 #CFLAGS += -Wextra
@@ -47,7 +47,7 @@ LDFLAGS += -lxchange
 
 # cppcheck options for 'check' target
 CHECKOPTS ?= --enable=performance,warning,portability,style --language=c \
-            --error-exitcode=1 $(CHECKEXTRA)
+            --error-exitcode=1 --std=c99 $(CHECKEXTRA)
 
 CHECKOPTS += --template='{file}({line}): {severity} ({id}): {message}' --inline-suppr
 

diff --git a/src/redisx-client.c b/src/redisx-client.c
@@ -775,7 +775,7 @@ RESP *redisxReadReplyAsync(RedisClient *cl) {
       // FIXME workaround for Redis 4.x improper OK reply to QUIT
       if(!strcmp(buf, "OK")) {
         resp->type = RESP_SIMPLE_STRING;
-        resp->value = strdup("OK");
+        resp->value = xStringCopyOf("OK");
       }
       else if(cp->isEnabled) {
         fprintf(stderr, "WARNING! Redis-X : invalid type '%c' in '%s'\n", buf[0], buf);

diff --git a/src/redisx-net.c b/src/redisx-net.c
@@ -520,6 +520,7 @@ int rConnectClient(Redis *redis, enum redisx_channel channel) {
   static const char *fn = "rConnectClient";
 
   struct sockaddr_in serverAddress;
+  struct utsname u;
   const RedisPrivate *p;
   RedisClient *cl;
   ClientPrivate *cp;
@@ -566,7 +567,8 @@ int rConnectClient(Redis *redis, enum redisx_channel channel) {
   }
 
   // Set the client name in Redis.
-  gethostname(host, sizeof(host));
+  uname(&u);
+  strncpy(host, u.nodename, sizeof(host) - 1);
 
   id = (char *) malloc(strlen(host) + 100);      // <host>:pid-<pid>:<channel> + termination;
   switch(cp->idx) {