1 files changed, 131 insertions, 131 deletions

diff --git a/deps/hiredis/sds.h b/deps/hiredis/sds.h
index eda8833b5..573d6dd19 100644
--- a/deps/hiredis/sds.h
+++ b/deps/hiredis/sds.h
@@ -30,10 +30,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __SDS_H
-#define __SDS_H
+#ifndef HIREDIS_SDS_H
+#define HIREDIS_SDS_H
 
-#define SDS_MAX_PREALLOC (1024*1024)
+#define HI_SDS_MAX_PREALLOC (1024*1024)
 #ifdef _MSC_VER
 #define __attribute__(x)
 typedef long long ssize_t;
@@ -44,235 +44,235 @@ typedef long long ssize_t;
 #include <stdarg.h>
 #include <stdint.h>
 
-typedef char *sds;
+typedef char *hisds;
 
 /* Note: sdshdr5 is never used, we just access the flags byte directly.
  * However is here to document the layout of type 5 SDS strings. */
-struct __attribute__ ((__packed__)) sdshdr5 {
+struct __attribute__ ((__packed__)) hisdshdr5 {
     unsigned char flags; /* 3 lsb of type, and 5 msb of string length */
     char buf[];
 };
-struct __attribute__ ((__packed__)) sdshdr8 {
+struct __attribute__ ((__packed__)) hisdshdr8 {
     uint8_t len; /* used */
     uint8_t alloc; /* excluding the header and null terminator */
     unsigned char flags; /* 3 lsb of type, 5 unused bits */
     char buf[];
 };
-struct __attribute__ ((__packed__)) sdshdr16 {
+struct __attribute__ ((__packed__)) hisdshdr16 {
     uint16_t len; /* used */
     uint16_t alloc; /* excluding the header and null terminator */
     unsigned char flags; /* 3 lsb of type, 5 unused bits */
     char buf[];
 };
-struct __attribute__ ((__packed__)) sdshdr32 {
+struct __attribute__ ((__packed__)) hisdshdr32 {
     uint32_t len; /* used */
     uint32_t alloc; /* excluding the header and null terminator */
     unsigned char flags; /* 3 lsb of type, 5 unused bits */
     char buf[];
 };
-struct __attribute__ ((__packed__)) sdshdr64 {
+struct __attribute__ ((__packed__)) hisdshdr64 {
     uint64_t len; /* used */
     uint64_t alloc; /* excluding the header and null terminator */
     unsigned char flags; /* 3 lsb of type, 5 unused bits */
     char buf[];
 };
 
-#define SDS_TYPE_5  0
-#define SDS_TYPE_8  1
-#define SDS_TYPE_16 2
-#define SDS_TYPE_32 3
-#define SDS_TYPE_64 4
-#define SDS_TYPE_MASK 7
-#define SDS_TYPE_BITS 3
-#define SDS_HDR_VAR(T,s) struct sdshdr##T *sh = (struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T)));
-#define SDS_HDR(T,s) ((struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T))))
-#define SDS_TYPE_5_LEN(f) ((f)>>SDS_TYPE_BITS)
+#define HI_SDS_TYPE_5  0
+#define HI_SDS_TYPE_8  1
+#define HI_SDS_TYPE_16 2
+#define HI_SDS_TYPE_32 3
+#define HI_SDS_TYPE_64 4
+#define HI_SDS_TYPE_MASK 7
+#define HI_SDS_TYPE_BITS 3
+#define HI_SDS_HDR_VAR(T,s) struct hisdshdr##T *sh = (struct hisdshdr##T *)((s)-(sizeof(struct hisdshdr##T)));
+#define HI_SDS_HDR(T,s) ((struct hisdshdr##T *)((s)-(sizeof(struct hisdshdr##T))))
+#define HI_SDS_TYPE_5_LEN(f) ((f)>>HI_SDS_TYPE_BITS)
 
-static inline size_t sdslen(const sds s) {
+static inline size_t hi_sdslen(const hisds s) {
     unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            return SDS_TYPE_5_LEN(flags);
-        case SDS_TYPE_8:
-            return SDS_HDR(8,s)->len;
-        case SDS_TYPE_16:
-            return SDS_HDR(16,s)->len;
-        case SDS_TYPE_32:
-            return SDS_HDR(32,s)->len;
-        case SDS_TYPE_64:
-            return SDS_HDR(64,s)->len;
+    switch(flags & HI_SDS_TYPE_MASK) {
+        case HI_SDS_TYPE_5:
+            return HI_SDS_TYPE_5_LEN(flags);
+        case HI_SDS_TYPE_8:
+            return HI_SDS_HDR(8,s)->len;
+        case HI_SDS_TYPE_16:
+            return HI_SDS_HDR(16,s)->len;
+        case HI_SDS_TYPE_32:
+            return HI_SDS_HDR(32,s)->len;
+        case HI_SDS_TYPE_64:
+            return HI_SDS_HDR(64,s)->len;
     }
     return 0;
 }
 
-static inline size_t sdsavail(const sds s) {
+static inline size_t hi_sdsavail(const hisds s) {
     unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5: {
+    switch(flags&HI_SDS_TYPE_MASK) {
+        case HI_SDS_TYPE_5: {
             return 0;
         }
-        case SDS_TYPE_8: {
-            SDS_HDR_VAR(8,s);
+        case HI_SDS_TYPE_8: {
+            HI_SDS_HDR_VAR(8,s);
             return sh->alloc - sh->len;
         }
-        case SDS_TYPE_16: {
-            SDS_HDR_VAR(16,s);
+        case HI_SDS_TYPE_16: {
+            HI_SDS_HDR_VAR(16,s);
             return sh->alloc - sh->len;
         }
-        case SDS_TYPE_32: {
-            SDS_HDR_VAR(32,s);
+        case HI_SDS_TYPE_32: {
+            HI_SDS_HDR_VAR(32,s);
             return sh->alloc - sh->len;
         }
-        case SDS_TYPE_64: {
-            SDS_HDR_VAR(64,s);
+        case HI_SDS_TYPE_64: {
+            HI_SDS_HDR_VAR(64,s);
             return sh->alloc - sh->len;
         }
     }
     return 0;
 }
 
-static inline void sdssetlen(sds s, size_t newlen) {
+static inline void hi_sdssetlen(hisds s, size_t newlen) {
     unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
+    switch(flags&HI_SDS_TYPE_MASK) {
+        case HI_SDS_TYPE_5:
             {
                 unsigned char *fp = ((unsigned char*)s)-1;
-                *fp = (unsigned char)(SDS_TYPE_5 | (newlen << SDS_TYPE_BITS));
+                *fp = (unsigned char)(HI_SDS_TYPE_5 | (newlen << HI_SDS_TYPE_BITS));
             }
             break;
-        case SDS_TYPE_8:
-            SDS_HDR(8,s)->len = (uint8_t)newlen;
+        case HI_SDS_TYPE_8:
+            HI_SDS_HDR(8,s)->len = (uint8_t)newlen;
             break;
-        case SDS_TYPE_16:
-            SDS_HDR(16,s)->len = (uint16_t)newlen;
+        case HI_SDS_TYPE_16:
+            HI_SDS_HDR(16,s)->len = (uint16_t)newlen;
             break;
-        case SDS_TYPE_32:
-            SDS_HDR(32,s)->len = (uint32_t)newlen;
+        case HI_SDS_TYPE_32:
+            HI_SDS_HDR(32,s)->len = (uint32_t)newlen;
             break;
-        case SDS_TYPE_64:
-            SDS_HDR(64,s)->len = (uint64_t)newlen;
+        case HI_SDS_TYPE_64:
+            HI_SDS_HDR(64,s)->len = (uint64_t)newlen;
             break;
     }
 }
 
-static inline void sdsinclen(sds s, size_t inc) {
+static inline void hi_sdsinclen(hisds s, size_t inc) {
     unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
+    switch(flags&HI_SDS_TYPE_MASK) {
+        case HI_SDS_TYPE_5:
             {
                 unsigned char *fp = ((unsigned char*)s)-1;
-                unsigned char newlen = SDS_TYPE_5_LEN(flags)+(unsigned char)inc;
-                *fp = SDS_TYPE_5 | (newlen << SDS_TYPE_BITS);
+                unsigned char newlen = HI_SDS_TYPE_5_LEN(flags)+(unsigned char)inc;
+                *fp = HI_SDS_TYPE_5 | (newlen << HI_SDS_TYPE_BITS);
             }
             break;
-        case SDS_TYPE_8:
-            SDS_HDR(8,s)->len += (uint8_t)inc;
+        case HI_SDS_TYPE_8:
+            HI_SDS_HDR(8,s)->len += (uint8_t)inc;
             break;
-        case SDS_TYPE_16:
-            SDS_HDR(16,s)->len += (uint16_t)inc;
+        case HI_SDS_TYPE_16:
+            HI_SDS_HDR(16,s)->len += (uint16_t)inc;
             break;
-        case SDS_TYPE_32:
-            SDS_HDR(32,s)->len += (uint32_t)inc;
+        case HI_SDS_TYPE_32:
+            HI_SDS_HDR(32,s)->len += (uint32_t)inc;
             break;
-        case SDS_TYPE_64:
-            SDS_HDR(64,s)->len += (uint64_t)inc;
+        case HI_SDS_TYPE_64:
+            HI_SDS_HDR(64,s)->len += (uint64_t)inc;
             break;
     }
 }
 
-/* sdsalloc() = sdsavail() + sdslen() */
-static inline size_t sdsalloc(const sds s) {
+/* hi_sdsalloc() = hi_sdsavail() + hi_sdslen() */
+static inline size_t hi_sdsalloc(const hisds s) {
     unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            return SDS_TYPE_5_LEN(flags);
-        case SDS_TYPE_8:
-            return SDS_HDR(8,s)->alloc;
-        case SDS_TYPE_16:
-            return SDS_HDR(16,s)->alloc;
-        case SDS_TYPE_32:
-            return SDS_HDR(32,s)->alloc;
-        case SDS_TYPE_64:
-            return SDS_HDR(64,s)->alloc;
+    switch(flags & HI_SDS_TYPE_MASK) {
+        case HI_SDS_TYPE_5:
+            return HI_SDS_TYPE_5_LEN(flags);
+        case HI_SDS_TYPE_8:
+            return HI_SDS_HDR(8,s)->alloc;
+        case HI_SDS_TYPE_16:
+            return HI_SDS_HDR(16,s)->alloc;
+        case HI_SDS_TYPE_32:
+            return HI_SDS_HDR(32,s)->alloc;
+        case HI_SDS_TYPE_64:
+            return HI_SDS_HDR(64,s)->alloc;
     }
     return 0;
 }
 
-static inline void sdssetalloc(sds s, size_t newlen) {
+static inline void hi_sdssetalloc(hisds s, size_t newlen) {
     unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
+    switch(flags&HI_SDS_TYPE_MASK) {
+        case HI_SDS_TYPE_5:
             /* Nothing to do, this type has no total allocation info. */
             break;
-        case SDS_TYPE_8:
-            SDS_HDR(8,s)->alloc = (uint8_t)newlen;
+        case HI_SDS_TYPE_8:
+            HI_SDS_HDR(8,s)->alloc = (uint8_t)newlen;
             break;
-        case SDS_TYPE_16:
-            SDS_HDR(16,s)->alloc = (uint16_t)newlen;
+        case HI_SDS_TYPE_16:
+            HI_SDS_HDR(16,s)->alloc = (uint16_t)newlen;
             break;
-        case SDS_TYPE_32:
-            SDS_HDR(32,s)->alloc = (uint32_t)newlen;
+        case HI_SDS_TYPE_32:
+            HI_SDS_HDR(32,s)->alloc = (uint32_t)newlen;
             break;
-        case SDS_TYPE_64:
-            SDS_HDR(64,s)->alloc = (uint64_t)newlen;
+        case HI_SDS_TYPE_64:
+            HI_SDS_HDR(64,s)->alloc = (uint64_t)newlen;
             break;
     }
 }
 
-sds sdsnewlen(const void *init, size_t initlen);
-sds sdsnew(const char *init);
-sds sdsempty(void);
-sds sdsdup(const sds s);
-void sdsfree(sds s);
-sds sdsgrowzero(sds s, size_t len);
-sds sdscatlen(sds s, const void *t, size_t len);
-sds sdscat(sds s, const char *t);
-sds sdscatsds(sds s, const sds t);
-sds sdscpylen(sds s, const char *t, size_t len);
-sds sdscpy(sds s, const char *t);
+hisds hi_sdsnewlen(const void *init, size_t initlen);
+hisds hi_sdsnew(const char *init);
+hisds hi_sdsempty(void);
+hisds hi_sdsdup(const hisds s);
+void  hi_sdsfree(hisds s);
+hisds hi_sdsgrowzero(hisds s, size_t len);
+hisds hi_sdscatlen(hisds s, const void *t, size_t len);
+hisds hi_sdscat(hisds s, const char *t);
+hisds hi_sdscatsds(hisds s, const hisds t);
+hisds hi_sdscpylen(hisds s, const char *t, size_t len);
+hisds hi_sdscpy(hisds s, const char *t);
 
-sds sdscatvprintf(sds s, const char *fmt, va_list ap);
+hisds hi_sdscatvprintf(hisds s, const char *fmt, va_list ap);
 #ifdef __GNUC__
-sds sdscatprintf(sds s, const char *fmt, ...)
+hisds hi_sdscatprintf(hisds s, const char *fmt, ...)
     __attribute__((format(printf, 2, 3)));
 #else
-sds sdscatprintf(sds s, const char *fmt, ...);
+hisds hi_sdscatprintf(hisds s, const char *fmt, ...);
 #endif
 
-sds sdscatfmt(sds s, char const *fmt, ...);
-sds sdstrim(sds s, const char *cset);
-int sdsrange(sds s, ssize_t start, ssize_t end);
-void sdsupdatelen(sds s);
-void sdsclear(sds s);
-int sdscmp(const sds s1, const sds s2);
-sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count);
-void sdsfreesplitres(sds *tokens, int count);
-void sdstolower(sds s);
-void sdstoupper(sds s);
-sds sdsfromlonglong(long long value);
-sds sdscatrepr(sds s, const char *p, size_t len);
-sds *sdssplitargs(const char *line, int *argc);
-sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen);
-sds sdsjoin(char **argv, int argc, char *sep);
-sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen);
+hisds hi_sdscatfmt(hisds s, char const *fmt, ...);
+hisds hi_sdstrim(hisds s, const char *cset);
+int hi_sdsrange(hisds s, ssize_t start, ssize_t end);
+void hi_sdsupdatelen(hisds s);
+void hi_sdsclear(hisds s);
+int hi_sdscmp(const hisds s1, const hisds s2);
+hisds *hi_sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count);
+void hi_sdsfreesplitres(hisds *tokens, int count);
+void hi_sdstolower(hisds s);
+void hi_sdstoupper(hisds s);
+hisds hi_sdsfromlonglong(long long value);
+hisds hi_sdscatrepr(hisds s, const char *p, size_t len);
+hisds *hi_sdssplitargs(const char *line, int *argc);
+hisds hi_sdsmapchars(hisds s, const char *from, const char *to, size_t setlen);
+hisds hi_sdsjoin(char **argv, int argc, char *sep);
+hisds hi_sdsjoinsds(hisds *argv, int argc, const char *sep, size_t seplen);
 
 /* Low level functions exposed to the user API */
-sds sdsMakeRoomFor(sds s, size_t addlen);
-void sdsIncrLen(sds s, int incr);
-sds sdsRemoveFreeSpace(sds s);
-size_t sdsAllocSize(sds s);
-void *sdsAllocPtr(sds s);
+hisds hi_sdsMakeRoomFor(hisds s, size_t addlen);
+void hi_sdsIncrLen(hisds s, int incr);
+hisds hi_sdsRemoveFreeSpace(hisds s);
+size_t hi_sdsAllocSize(hisds s);
+void *hi_sdsAllocPtr(hisds s);
 
 /* Export the allocator used by SDS to the program using SDS.
  * Sometimes the program SDS is linked to, may use a different set of
  * allocators, but may want to allocate or free things that SDS will
  * respectively free or allocate. */
-void *sds_malloc(size_t size);
-void *sds_realloc(void *ptr, size_t size);
-void sds_free(void *ptr);
+void *hi_sds_malloc(size_t size);
+void *hi_sds_realloc(void *ptr, size_t size);
+void hi_sds_free(void *ptr);
 
 #ifdef REDIS_TEST
-int sdsTest(int argc, char *argv[]);
+int hi_sdsTest(int argc, char *argv[]);
 #endif
 
-#endif
+#endif /* HIREDIS_SDS_H */