Fix gcc warnings

Author: sfeifer

src/async.c

@@ -520,9 +520,9 @@ static int valkeyGetSubscribeCallback(valkeyAsyncContext *ac, valkeyReply *reply
                 c->flags &= ~VALKEY_SUBSCRIBED;
 
                 /* Move ongoing regular command callbacks. */
-                valkeyCallback cb;
-                while (valkeyShiftCallback(&ac->sub.replies, &cb) == VALKEY_OK) {
-                    valkeyPushCallback(&ac->replies, &cb);
+                valkeyCallback reply_cb;
+                while (valkeyShiftCallback(&ac->sub.replies, &reply_cb) == VALKEY_OK) {
+                    valkeyPushCallback(&ac->replies, &reply_cb);
                 }
             }
         }
@@ -941,9 +941,9 @@ void valkeySsubscribeCallback(struct valkeyAsyncContext *ac, void *reply, void *
             }
         }
 
-        valkeyCallback cb = {0};
-        valkeyGetSubscribeCallback(ac, reply, &cb);
-        valkeyRunCallback(ac, &cb, reply);
+        valkeyCallback sub_cb = {0};
+        valkeyGetSubscribeCallback(ac, reply, &sub_cb);
+        valkeyRunCallback(ac, &sub_cb, reply);
         vk_free(data->command);
         vk_free(privdata);
         return;

src/sds.c

@@ -84,7 +84,7 @@ static inline char sdsReqType(size_t string_size) {
  * end of the string. However the string is binary safe and can contain
  * \0 characters in the middle, as the length is stored in the sds header. */
 sds sdsnewlen(const void *init, size_t initlen) {
-    void *sh;
+    void *s_hdr;
     sds s;
     char type = sdsReqType(initlen);
     /* Empty strings are usually created in order to append. Use type 8
@@ -96,12 +96,12 @@ sds sdsnewlen(const void *init, size_t initlen) {
 
     if (hdrlen + initlen + 1 <= initlen)
         return NULL; /* Catch size_t overflow */
-    sh = s_malloc(hdrlen + initlen + 1);
-    if (sh == NULL)
+    s_hdr = s_malloc(hdrlen + initlen + 1);
+    if (s_hdr == NULL)
         return NULL;
     if (!init)
-        memset(sh, 0, hdrlen + initlen + 1);
-    s = (char *)sh + hdrlen;
+        memset(s_hdr, 0, hdrlen + initlen + 1);
+    s = (char *)s_hdr + hdrlen;
     fp = ((unsigned char *)s) - 1;
     switch (type) {
     case SDS_TYPE_5: {