Change function name to match what it does

diff --git a/src/sds.c b/src/sds.c
index de620191012d6f412441a48811a8b6d317fb2600..da049f6cecce85e2622392213a6999862a24e48b 100644 (file)
--- a/src/sds.c
+++ b/src/sds.c
@@ -117,8 +117,8 @@ static sds sdsMakeRoomFor(sds s, size_t addlen) {
 }
 
 /* Grow the sds to have the specified length. Bytes that were not part of
 }
 
 /* Grow the sds to have the specified length. Bytes that were not part of

- * the original length of the sds will be set to NULL. */
-sds sdsgrowsafe(sds s, size_t len) {
+ * the original length of the sds will be set to zero. */
+sds sdsgrowzero(sds s, size_t len) {

     struct sdshdr *sh = (void*)(s-(sizeof(struct sdshdr)));
     size_t totlen, curlen = sh->len;
 
     struct sdshdr *sh = (void*)(s-(sizeof(struct sdshdr)));
     size_t totlen, curlen = sh->len;
 


@@ -128,7 +128,7 @@ sds sdsgrowsafe(sds s, size_t len) {
 
     /* Make sure added region doesn't contain garbage */
     sh = (void*)(s-(sizeof(struct sdshdr)));
 
     /* Make sure added region doesn't contain garbage */
     sh = (void*)(s-(sizeof(struct sdshdr)));

-    memset(s+curlen,0,(len-curlen+1)); /* also set trailing NULL byte */
+    memset(s+curlen,0,(len-curlen+1)); /* also set trailing \0 byte */

     totlen = sh->len+sh->free;
     sh->len = len;
     sh->free = totlen-sh->len;
     totlen = sh->len+sh->free;
     sh->len = len;
     sh->free = totlen-sh->len;

diff --git a/src/sds.h b/src/sds.h
index 44880183fbf38a9e2e83988a12e612b8a7044dc9..91a387821bb267b1084f09b340bd7aaef6f5e5d5 100644 (file)
--- a/src/sds.h
+++ b/src/sds.h
@@ -49,7 +49,7 @@ size_t sdslen(const sds s);
 sds sdsdup(const sds s);
 void sdsfree(sds s);
 size_t sdsavail(sds s);
 sds sdsdup(const sds s);
 void sdsfree(sds s);
 size_t sdsavail(sds s);

-sds sdsgrowsafe(sds s, size_t len);
+sds sdsgrowzero(sds s, size_t len);

 sds sdscatlen(sds s, void *t, size_t len);
 sds sdscat(sds s, char *t);
 sds sdscpylen(sds s, char *t, size_t len);
 sds sdscatlen(sds s, void *t, size_t len);
 sds sdscat(sds s, char *t);
 sds sdscpylen(sds s, char *t, size_t len);

diff --git a/src/t_string.c b/src/t_string.c
index dcb37e553c9ed056b3d281847f28be4d9cfaf505..3b91f5e6d3392b2078c600b5c0f3c5d4debd79f5 100644 (file)
--- a/src/t_string.c
+++ b/src/t_string.c
@@ -139,7 +139,7 @@ void setbitCommand(redisClient *c) {
     byte = bitoffset >> 3;
     bit = 7 - (bitoffset & 0x7);
     on = bitvalue & 0x1;
     byte = bitoffset >> 3;
     bit = 7 - (bitoffset & 0x7);
     on = bitvalue & 0x1;

-    o->ptr = sdsgrowsafe(o->ptr,byte+1);
+    o->ptr = sdsgrowzero(o->ptr,byte+1);

     ((char*)o->ptr)[byte] |= on << bit;
     ((char*)o->ptr)[byte] &= ~((!on) << bit);
 
     ((char*)o->ptr)[byte] |= on << bit;
     ((char*)o->ptr)[byte] &= ~((!on) << bit);