From 00c8076e994d3a498e378f45a91a8b8cb5dcc854 Mon Sep 17 00:00:00 2001
From: Ciaran Anscomb <www@6809.org.uk>
Date: Wed, 3 Jun 2020 08:23:22 +0100
Subject: [PATCH] Avoid warnings with -Wshadow

Simply renaming 'sh' to 'newsh' in sdsnewlen() avoids a shadowed
variable warning when invoking SDS_HDR_VAR().
---
 sds.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sds.c b/sds.c
index 1189716..1bdf7fd 100644
--- a/sds.c
+++ b/sds.c
@@ -87,7 +87,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 *newsh;
     sds s;
     char type = sdsReqType(initlen);
     /* Empty strings are usually created in order to append. Use type 8
@@ -96,13 +96,13 @@ sds sdsnewlen(const void *init, size_t initlen) {
     int hdrlen = sdsHdrSize(type);
     unsigned char *fp; /* flags pointer. */
 
-    sh = s_malloc(hdrlen+initlen+1);
-    if (sh == NULL) return NULL;
+    newsh = s_malloc(hdrlen+initlen+1);
+    if (newsh == NULL) return NULL;
     if (init==SDS_NOINIT)
         init = NULL;
     else if (!init)
-        memset(sh, 0, hdrlen+initlen+1);
-    s = (char*)sh+hdrlen;
+        memset(newsh, 0, hdrlen+initlen+1);
+    s = (char*)newsh+hdrlen;
     fp = ((unsigned char*)s)-1;
     switch(type) {
         case SDS_TYPE_5: {