Merge remote-tracking branch 'origin/unstable' into unstable

[redis.git] / deps / hiredis / sds.h

diff --git a/deps/hiredis/sds.h b/deps/hiredis/sds.h
index 2c3fb52b5079b5581838f74c5e83fecc259c9f50..94f5871f54fc08cba723aee70af7c3f747bd66cf 100644 (file)
--- a/deps/hiredis/sds.h
+++ b/deps/hiredis/sds.h
@@ -42,13 +42,24 @@ struct sdshdr {
     char buf[];
 };
 
     char buf[];
 };
 

+static inline size_t sdslen(const sds s) {
+    struct sdshdr *sh = (void*)(s-(sizeof(struct sdshdr)));
+    return sh->len;
+}
+
+static inline size_t sdsavail(const sds s) {
+    struct sdshdr *sh = (void*)(s-(sizeof(struct sdshdr)));
+    return sh->free;
+}
+

 sds sdsnewlen(const void *init, size_t initlen);
 sds sdsnew(const char *init);
 sds sdsnewlen(const void *init, size_t initlen);
 sds sdsnew(const char *init);

-sds sdsempty();
+sds sdsempty(void);

 size_t sdslen(const sds s);
 sds sdsdup(const sds s);
 void sdsfree(sds s);
 size_t sdsavail(sds s);
 size_t sdslen(const sds s);
 sds sdsdup(const sds s);
 void sdsfree(sds s);
 size_t sdsavail(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 sdscpylen(sds s, char *t, size_t len);
 sds sdscatlen(sds s, const void *t, size_t len);
 sds sdscat(sds s, const char *t);
 sds sdscpylen(sds s, char *t, size_t len);