Commit 6866158f authored by michael-grunder's avatar michael-grunder
Browse files

Merge commit 'bffbbeaa' into hiredis-unique-sds-symbols

parents 11cd983d bffbbeaa
...@@ -54,7 +54,7 @@ void __redisSetError(redisContext *c, int type, const char *str); ...@@ -54,7 +54,7 @@ void __redisSetError(redisContext *c, int type, const char *str);
/* Functions managing dictionary of callbacks for pub/sub. */ /* Functions managing dictionary of callbacks for pub/sub. */
static unsigned int callbackHash(const void *key) { static unsigned int callbackHash(const void *key) {
return dictGenHashFunction((const unsigned char *)key, return dictGenHashFunction((const unsigned char *)key,
sdslen((const sds)key)); hi_sdslen((const hisds)key));
} }
static void *callbackValDup(void *privdata, const void *src) { static void *callbackValDup(void *privdata, const void *src) {
...@@ -73,15 +73,15 @@ static int callbackKeyCompare(void *privdata, const void *key1, const void *key2 ...@@ -73,15 +73,15 @@ static int callbackKeyCompare(void *privdata, const void *key1, const void *key2
int l1, l2; int l1, l2;
((void) privdata); ((void) privdata);
l1 = sdslen((const sds)key1); l1 = hi_sdslen((const hisds)key1);
l2 = sdslen((const sds)key2); l2 = hi_sdslen((const hisds)key2);
if (l1 != l2) return 0; if (l1 != l2) return 0;
return memcmp(key1,key2,l1) == 0; return memcmp(key1,key2,l1) == 0;
} }
static void callbackKeyDestructor(void *privdata, void *key) { static void callbackKeyDestructor(void *privdata, void *key) {
((void) privdata); ((void) privdata);
sdsfree((sds)key); hi_sdsfree((hisds)key);
} }
static void callbackValDestructor(void *privdata, void *val) { static void callbackValDestructor(void *privdata, void *val) {
...@@ -418,7 +418,7 @@ static int __redisGetSubscribeCallback(redisAsyncContext *ac, redisReply *reply, ...@@ -418,7 +418,7 @@ static int __redisGetSubscribeCallback(redisAsyncContext *ac, redisReply *reply,
dictEntry *de; dictEntry *de;
int pvariant; int pvariant;
char *stype; char *stype;
sds sname; hisds sname;
/* Custom reply functions are not supported for pub/sub. This will fail /* Custom reply functions are not supported for pub/sub. This will fail
* very hard when they are used... */ * very hard when they are used... */
...@@ -435,7 +435,7 @@ static int __redisGetSubscribeCallback(redisAsyncContext *ac, redisReply *reply, ...@@ -435,7 +435,7 @@ static int __redisGetSubscribeCallback(redisAsyncContext *ac, redisReply *reply,
/* Locate the right callback */ /* Locate the right callback */
assert(reply->element[1]->type == REDIS_REPLY_STRING); assert(reply->element[1]->type == REDIS_REPLY_STRING);
sname = sdsnewlen(reply->element[1]->str,reply->element[1]->len); sname = hi_sdsnewlen(reply->element[1]->str,reply->element[1]->len);
if (sname == NULL) if (sname == NULL)
goto oom; goto oom;
...@@ -466,7 +466,7 @@ static int __redisGetSubscribeCallback(redisAsyncContext *ac, redisReply *reply, ...@@ -466,7 +466,7 @@ static int __redisGetSubscribeCallback(redisAsyncContext *ac, redisReply *reply,
c->flags &= ~REDIS_SUBSCRIBED; c->flags &= ~REDIS_SUBSCRIBED;
} }
} }
sdsfree(sname); hi_sdsfree(sname);
} else { } else {
/* Shift callback for invalid commands. */ /* Shift callback for invalid commands. */
__redisShiftCallback(&ac->sub.invalid,dstcb); __redisShiftCallback(&ac->sub.invalid,dstcb);
...@@ -511,7 +511,7 @@ void redisProcessCallbacks(redisAsyncContext *ac) { ...@@ -511,7 +511,7 @@ void redisProcessCallbacks(redisAsyncContext *ac) {
if (reply == NULL) { if (reply == NULL) {
/* When the connection is being disconnected and there are /* When the connection is being disconnected and there are
* no more replies, this is the cue to really disconnect. */ * no more replies, this is the cue to really disconnect. */
if (c->flags & REDIS_DISCONNECTING && sdslen(c->obuf) == 0 if (c->flags & REDIS_DISCONNECTING && hi_sdslen(c->obuf) == 0
&& ac->replies.head == NULL) { && ac->replies.head == NULL) {
__redisAsyncDisconnect(ac); __redisAsyncDisconnect(ac);
return; return;
...@@ -744,7 +744,7 @@ static int __redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void ...@@ -744,7 +744,7 @@ static int __redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void
const char *cstr, *astr; const char *cstr, *astr;
size_t clen, alen; size_t clen, alen;
const char *p; const char *p;
sds sname; hisds sname;
int ret; int ret;
/* Don't accept new commands when the connection is about to be closed. */ /* Don't accept new commands when the connection is about to be closed. */
...@@ -768,7 +768,7 @@ static int __redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void ...@@ -768,7 +768,7 @@ static int __redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void
/* Add every channel/pattern to the list of subscription callbacks. */ /* Add every channel/pattern to the list of subscription callbacks. */
while ((p = nextArgument(p,&astr,&alen)) != NULL) { while ((p = nextArgument(p,&astr,&alen)) != NULL) {
sname = sdsnewlen(astr,alen); sname = hi_sdsnewlen(astr,alen);
if (sname == NULL) if (sname == NULL)
goto oom; goto oom;
...@@ -786,7 +786,7 @@ static int __redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void ...@@ -786,7 +786,7 @@ static int __redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void
ret = dictReplace(cbdict,sname,&cb); ret = dictReplace(cbdict,sname,&cb);
if (ret == 0) sdsfree(sname); if (ret == 0) hi_sdsfree(sname);
} }
} else if (strncasecmp(cstr,"unsubscribe\r\n",13) == 0) { } else if (strncasecmp(cstr,"unsubscribe\r\n",13) == 0) {
/* It is only useful to call (P)UNSUBSCRIBE when the context is /* It is only useful to call (P)UNSUBSCRIBE when the context is
...@@ -845,14 +845,14 @@ int redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata ...@@ -845,14 +845,14 @@ int redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata
} }
int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, int argc, const char **argv, const size_t *argvlen) { int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, int argc, const char **argv, const size_t *argvlen) {
sds cmd; hisds cmd;
int len; int len;
int status; int status;
len = redisFormatSdsCommandArgv(&cmd,argc,argv,argvlen); len = redisFormatSdsCommandArgv(&cmd,argc,argv,argvlen);
if (len < 0) if (len < 0)
return REDIS_ERR; return REDIS_ERR;
status = __redisAsyncCommand(ac,fn,privdata,cmd,len); status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
sdsfree(cmd); hi_sdsfree(cmd);
return status; return status;
} }
......
...@@ -305,7 +305,7 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) { ...@@ -305,7 +305,7 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
const char *c = format; const char *c = format;
char *cmd = NULL; /* final command */ char *cmd = NULL; /* final command */
int pos; /* position in final command */ int pos; /* position in final command */
sds curarg, newarg; /* current argument */ hisds curarg, newarg; /* current argument */
int touched = 0; /* was the current argument touched? */ int touched = 0; /* was the current argument touched? */
char **curargv = NULL, **newargv = NULL; char **curargv = NULL, **newargv = NULL;
int argc = 0; int argc = 0;
...@@ -318,7 +318,7 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) { ...@@ -318,7 +318,7 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
return -1; return -1;
/* Build the command string accordingly to protocol */ /* Build the command string accordingly to protocol */
curarg = sdsempty(); curarg = hi_sdsempty();
if (curarg == NULL) if (curarg == NULL)
return -1; return -1;
...@@ -330,15 +330,15 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) { ...@@ -330,15 +330,15 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
if (newargv == NULL) goto memory_err; if (newargv == NULL) goto memory_err;
curargv = newargv; curargv = newargv;
curargv[argc++] = curarg; curargv[argc++] = curarg;
totlen += bulklen(sdslen(curarg)); totlen += bulklen(hi_sdslen(curarg));
/* curarg is put in argv so it can be overwritten. */ /* curarg is put in argv so it can be overwritten. */
curarg = sdsempty(); curarg = hi_sdsempty();
if (curarg == NULL) goto memory_err; if (curarg == NULL) goto memory_err;
touched = 0; touched = 0;
} }
} else { } else {
newarg = sdscatlen(curarg,c,1); newarg = hi_sdscatlen(curarg,c,1);
if (newarg == NULL) goto memory_err; if (newarg == NULL) goto memory_err;
curarg = newarg; curarg = newarg;
touched = 1; touched = 1;
...@@ -355,16 +355,16 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) { ...@@ -355,16 +355,16 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
arg = va_arg(ap,char*); arg = va_arg(ap,char*);
size = strlen(arg); size = strlen(arg);
if (size > 0) if (size > 0)
newarg = sdscatlen(curarg,arg,size); newarg = hi_sdscatlen(curarg,arg,size);
break; break;
case 'b': case 'b':
arg = va_arg(ap,char*); arg = va_arg(ap,char*);
size = va_arg(ap,size_t); size = va_arg(ap,size_t);
if (size > 0) if (size > 0)
newarg = sdscatlen(curarg,arg,size); newarg = hi_sdscatlen(curarg,arg,size);
break; break;
case '%': case '%':
newarg = sdscat(curarg,"%"); newarg = hi_sdscat(curarg,"%");
break; break;
default: default:
/* Try to detect printf format */ /* Try to detect printf format */
...@@ -452,7 +452,7 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) { ...@@ -452,7 +452,7 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
if (_l < sizeof(_format)-2) { if (_l < sizeof(_format)-2) {
memcpy(_format,c,_l); memcpy(_format,c,_l);
_format[_l] = '\0'; _format[_l] = '\0';
newarg = sdscatvprintf(curarg,_format,_cpy); newarg = hi_sdscatvprintf(curarg,_format,_cpy);
/* Update current position (note: outer blocks /* Update current position (note: outer blocks
* increment c twice so compensate here) */ * increment c twice so compensate here) */
...@@ -479,9 +479,9 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) { ...@@ -479,9 +479,9 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
if (newargv == NULL) goto memory_err; if (newargv == NULL) goto memory_err;
curargv = newargv; curargv = newargv;
curargv[argc++] = curarg; curargv[argc++] = curarg;
totlen += bulklen(sdslen(curarg)); totlen += bulklen(hi_sdslen(curarg));
} else { } else {
sdsfree(curarg); hi_sdsfree(curarg);
} }
/* Clear curarg because it was put in curargv or was free'd. */ /* Clear curarg because it was put in curargv or was free'd. */
...@@ -496,10 +496,10 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) { ...@@ -496,10 +496,10 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
pos = sprintf(cmd,"*%d\r\n",argc); pos = sprintf(cmd,"*%d\r\n",argc);
for (j = 0; j < argc; j++) { for (j = 0; j < argc; j++) {
pos += sprintf(cmd+pos,"$%zu\r\n",sdslen(curargv[j])); pos += sprintf(cmd+pos,"$%zu\r\n",hi_sdslen(curargv[j]));
memcpy(cmd+pos,curargv[j],sdslen(curargv[j])); memcpy(cmd+pos,curargv[j],hi_sdslen(curargv[j]));
pos += sdslen(curargv[j]); pos += hi_sdslen(curargv[j]);
sdsfree(curargv[j]); hi_sdsfree(curargv[j]);
cmd[pos++] = '\r'; cmd[pos++] = '\r';
cmd[pos++] = '\n'; cmd[pos++] = '\n';
} }
...@@ -521,11 +521,11 @@ memory_err: ...@@ -521,11 +521,11 @@ memory_err:
cleanup: cleanup:
if (curargv) { if (curargv) {
while(argc--) while(argc--)
sdsfree(curargv[argc]); hi_sdsfree(curargv[argc]);
hi_free(curargv); hi_free(curargv);
} }
sdsfree(curarg); hi_sdsfree(curarg);
hi_free(cmd); hi_free(cmd);
return error_type; return error_type;
...@@ -558,16 +558,16 @@ int redisFormatCommand(char **target, const char *format, ...) { ...@@ -558,16 +558,16 @@ int redisFormatCommand(char **target, const char *format, ...) {
return len; return len;
} }
/* Format a command according to the Redis protocol using an sds string and /* Format a command according to the Redis protocol using an hisds string and
* sdscatfmt for the processing of arguments. This function takes the * hi_sdscatfmt for the processing of arguments. This function takes the
* number of arguments, an array with arguments and an array with their * number of arguments, an array with arguments and an array with their
* lengths. If the latter is set to NULL, strlen will be used to compute the * lengths. If the latter is set to NULL, strlen will be used to compute the
* argument lengths. * argument lengths.
*/ */
int redisFormatSdsCommandArgv(sds *target, int argc, const char **argv, int redisFormatSdsCommandArgv(hisds *target, int argc, const char **argv,
const size_t *argvlen) const size_t *argvlen)
{ {
sds cmd, aux; hisds cmd, aux;
unsigned long long totlen; unsigned long long totlen;
int j; int j;
size_t len; size_t len;
...@@ -584,36 +584,36 @@ int redisFormatSdsCommandArgv(sds *target, int argc, const char **argv, ...@@ -584,36 +584,36 @@ int redisFormatSdsCommandArgv(sds *target, int argc, const char **argv,
} }
/* Use an SDS string for command construction */ /* Use an SDS string for command construction */
cmd = sdsempty(); cmd = hi_sdsempty();
if (cmd == NULL) if (cmd == NULL)
return -1; return -1;
/* We already know how much storage we need */ /* We already know how much storage we need */
aux = sdsMakeRoomFor(cmd, totlen); aux = hi_sdsMakeRoomFor(cmd, totlen);
if (aux == NULL) { if (aux == NULL) {
sdsfree(cmd); hi_sdsfree(cmd);
return -1; return -1;
} }
cmd = aux; cmd = aux;
/* Construct command */ /* Construct command */
cmd = sdscatfmt(cmd, "*%i\r\n", argc); cmd = hi_sdscatfmt(cmd, "*%i\r\n", argc);
for (j=0; j < argc; j++) { for (j=0; j < argc; j++) {
len = argvlen ? argvlen[j] : strlen(argv[j]); len = argvlen ? argvlen[j] : strlen(argv[j]);
cmd = sdscatfmt(cmd, "$%u\r\n", len); cmd = hi_sdscatfmt(cmd, "$%u\r\n", len);
cmd = sdscatlen(cmd, argv[j], len); cmd = hi_sdscatlen(cmd, argv[j], len);
cmd = sdscatlen(cmd, "\r\n", sizeof("\r\n")-1); cmd = hi_sdscatlen(cmd, "\r\n", sizeof("\r\n")-1);
} }
assert(sdslen(cmd)==totlen); assert(hi_sdslen(cmd)==totlen);
*target = cmd; *target = cmd;
return totlen; return totlen;
} }
void redisFreeSdsCommand(sds cmd) { void redisFreeSdsCommand(hisds cmd) {
sdsfree(cmd); hi_sdsfree(cmd);
} }
/* Format a command according to the Redis protocol. This function takes the /* Format a command according to the Redis protocol. This function takes the
...@@ -697,7 +697,7 @@ static redisContext *redisContextInit(void) { ...@@ -697,7 +697,7 @@ static redisContext *redisContextInit(void) {
c->funcs = &redisContextDefaultFuncs; c->funcs = &redisContextDefaultFuncs;
c->obuf = sdsempty(); c->obuf = hi_sdsempty();
c->reader = redisReaderCreate(); c->reader = redisReaderCreate();
c->fd = REDIS_INVALID_FD; c->fd = REDIS_INVALID_FD;
...@@ -714,7 +714,7 @@ void redisFree(redisContext *c) { ...@@ -714,7 +714,7 @@ void redisFree(redisContext *c) {
return; return;
redisNetClose(c); redisNetClose(c);
sdsfree(c->obuf); hi_sdsfree(c->obuf);
redisReaderFree(c->reader); redisReaderFree(c->reader);
hi_free(c->tcp.host); hi_free(c->tcp.host);
hi_free(c->tcp.source_addr); hi_free(c->tcp.source_addr);
...@@ -751,10 +751,10 @@ int redisReconnect(redisContext *c) { ...@@ -751,10 +751,10 @@ int redisReconnect(redisContext *c) {
redisNetClose(c); redisNetClose(c);
sdsfree(c->obuf); hi_sdsfree(c->obuf);
redisReaderFree(c->reader); redisReaderFree(c->reader);
c->obuf = sdsempty(); c->obuf = hi_sdsempty();
c->reader = redisReaderCreate(); c->reader = redisReaderCreate();
if (c->obuf == NULL || c->reader == NULL) { if (c->obuf == NULL || c->reader == NULL) {
...@@ -965,22 +965,22 @@ int redisBufferWrite(redisContext *c, int *done) { ...@@ -965,22 +965,22 @@ int redisBufferWrite(redisContext *c, int *done) {
if (c->err) if (c->err)
return REDIS_ERR; return REDIS_ERR;
if (sdslen(c->obuf) > 0) { if (hi_sdslen(c->obuf) > 0) {
ssize_t nwritten = c->funcs->write(c); ssize_t nwritten = c->funcs->write(c);
if (nwritten < 0) { if (nwritten < 0) {
return REDIS_ERR; return REDIS_ERR;
} else if (nwritten > 0) { } else if (nwritten > 0) {
if (nwritten == (ssize_t)sdslen(c->obuf)) { if (nwritten == (ssize_t)hi_sdslen(c->obuf)) {
sdsfree(c->obuf); hi_sdsfree(c->obuf);
c->obuf = sdsempty(); c->obuf = hi_sdsempty();
if (c->obuf == NULL) if (c->obuf == NULL)
goto oom; goto oom;
} else { } else {
if (sdsrange(c->obuf,nwritten,-1) < 0) goto oom; if (hi_sdsrange(c->obuf,nwritten,-1) < 0) goto oom;
} }
} }
} }
if (done != NULL) *done = (sdslen(c->obuf) == 0); if (done != NULL) *done = (hi_sdslen(c->obuf) == 0);
return REDIS_OK; return REDIS_OK;
oom: oom:
...@@ -1058,9 +1058,9 @@ int redisGetReply(redisContext *c, void **reply) { ...@@ -1058,9 +1058,9 @@ int redisGetReply(redisContext *c, void **reply) {
* the reply (or replies in pub/sub). * the reply (or replies in pub/sub).
*/ */
int __redisAppendCommand(redisContext *c, const char *cmd, size_t len) { int __redisAppendCommand(redisContext *c, const char *cmd, size_t len) {
sds newbuf; hisds newbuf;
newbuf = sdscatlen(c->obuf,cmd,len); newbuf = hi_sdscatlen(c->obuf,cmd,len);
if (newbuf == NULL) { if (newbuf == NULL) {
__redisSetError(c,REDIS_ERR_OOM,"Out of memory"); __redisSetError(c,REDIS_ERR_OOM,"Out of memory");
return REDIS_ERR; return REDIS_ERR;
...@@ -1112,7 +1112,7 @@ int redisAppendCommand(redisContext *c, const char *format, ...) { ...@@ -1112,7 +1112,7 @@ int redisAppendCommand(redisContext *c, const char *format, ...) {
} }
int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen) { int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen) {
sds cmd; hisds cmd;
int len; int len;
len = redisFormatSdsCommandArgv(&cmd,argc,argv,argvlen); len = redisFormatSdsCommandArgv(&cmd,argc,argv,argvlen);
...@@ -1122,11 +1122,11 @@ int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const s ...@@ -1122,11 +1122,11 @@ int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const s
} }
if (__redisAppendCommand(c,cmd,len) != REDIS_OK) { if (__redisAppendCommand(c,cmd,len) != REDIS_OK) {
sdsfree(cmd); hi_sdsfree(cmd);
return REDIS_ERR; return REDIS_ERR;
} }
sdsfree(cmd); hi_sdsfree(cmd);
return REDIS_OK; return REDIS_OK;
} }
......
...@@ -42,7 +42,7 @@ struct timeval; /* forward declaration */ ...@@ -42,7 +42,7 @@ struct timeval; /* forward declaration */
typedef long long ssize_t; typedef long long ssize_t;
#endif #endif
#include <stdint.h> /* uintXX_t, etc */ #include <stdint.h> /* uintXX_t, etc */
#include "sds.h" /* for sds */ #include "sds.h" /* for hisds */
#include "alloc.h" /* for allocation wrappers */ #include "alloc.h" /* for allocation wrappers */
#define HIREDIS_MAJOR 1 #define HIREDIS_MAJOR 1
...@@ -128,9 +128,9 @@ void freeReplyObject(void *reply); ...@@ -128,9 +128,9 @@ void freeReplyObject(void *reply);
int redisvFormatCommand(char **target, const char *format, va_list ap); int redisvFormatCommand(char **target, const char *format, va_list ap);
int redisFormatCommand(char **target, const char *format, ...); int redisFormatCommand(char **target, const char *format, ...);
int redisFormatCommandArgv(char **target, int argc, const char **argv, const size_t *argvlen); int redisFormatCommandArgv(char **target, int argc, const char **argv, const size_t *argvlen);
int redisFormatSdsCommandArgv(sds *target, int argc, const char ** argv, const size_t *argvlen); int redisFormatSdsCommandArgv(hisds *target, int argc, const char ** argv, const size_t *argvlen);
void redisFreeCommand(char *cmd); void redisFreeCommand(char *cmd);
void redisFreeSdsCommand(sds cmd); void redisFreeSdsCommand(hisds cmd);
enum redisConnectionType { enum redisConnectionType {
REDIS_CONN_TCP, REDIS_CONN_TCP,
......
...@@ -80,7 +80,7 @@ ssize_t redisNetRead(redisContext *c, char *buf, size_t bufcap) { ...@@ -80,7 +80,7 @@ ssize_t redisNetRead(redisContext *c, char *buf, size_t bufcap) {
} }
ssize_t redisNetWrite(redisContext *c) { ssize_t redisNetWrite(redisContext *c) {
ssize_t nwritten = send(c->fd, c->obuf, sdslen(c->obuf), 0); ssize_t nwritten = send(c->fd, c->obuf, hi_sdslen(c->obuf), 0);
if (nwritten < 0) { if (nwritten < 0) {
if ((errno == EWOULDBLOCK && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) { if ((errno == EWOULDBLOCK && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) {
/* Try again later */ /* Try again later */
......
...@@ -59,7 +59,7 @@ static void __redisReaderSetError(redisReader *r, int type, const char *str) { ...@@ -59,7 +59,7 @@ static void __redisReaderSetError(redisReader *r, int type, const char *str) {
} }
/* Clear input buffer on errors. */ /* Clear input buffer on errors. */
sdsfree(r->buf); hi_sdsfree(r->buf);
r->buf = NULL; r->buf = NULL;
r->pos = r->len = 0; r->pos = r->len = 0;
...@@ -609,7 +609,7 @@ redisReader *redisReaderCreateWithFunctions(redisReplyObjectFunctions *fn) { ...@@ -609,7 +609,7 @@ redisReader *redisReaderCreateWithFunctions(redisReplyObjectFunctions *fn) {
if (r == NULL) if (r == NULL)
return NULL; return NULL;
r->buf = sdsempty(); r->buf = hi_sdsempty();
if (r->buf == NULL) if (r->buf == NULL)
goto oom; goto oom;
...@@ -650,12 +650,12 @@ void redisReaderFree(redisReader *r) { ...@@ -650,12 +650,12 @@ void redisReaderFree(redisReader *r) {
hi_free(r->task); hi_free(r->task);
} }
sdsfree(r->buf); hi_sdsfree(r->buf);
hi_free(r); hi_free(r);
} }
int redisReaderFeed(redisReader *r, const char *buf, size_t len) { int redisReaderFeed(redisReader *r, const char *buf, size_t len) {
sds newbuf; hisds newbuf;
/* Return early when this reader is in an erroneous state. */ /* Return early when this reader is in an erroneous state. */
if (r->err) if (r->err)
...@@ -664,19 +664,19 @@ int redisReaderFeed(redisReader *r, const char *buf, size_t len) { ...@@ -664,19 +664,19 @@ int redisReaderFeed(redisReader *r, const char *buf, size_t len) {
/* Copy the provided buffer. */ /* Copy the provided buffer. */
if (buf != NULL && len >= 1) { if (buf != NULL && len >= 1) {
/* Destroy internal buffer when it is empty and is quite large. */ /* Destroy internal buffer when it is empty and is quite large. */
if (r->len == 0 && r->maxbuf != 0 && sdsavail(r->buf) > r->maxbuf) { if (r->len == 0 && r->maxbuf != 0 && hi_sdsavail(r->buf) > r->maxbuf) {
sdsfree(r->buf); hi_sdsfree(r->buf);
r->buf = sdsempty(); r->buf = hi_sdsempty();
if (r->buf == 0) goto oom; if (r->buf == 0) goto oom;
r->pos = 0; r->pos = 0;
} }
newbuf = sdscatlen(r->buf,buf,len); newbuf = hi_sdscatlen(r->buf,buf,len);
if (newbuf == NULL) goto oom; if (newbuf == NULL) goto oom;
r->buf = newbuf; r->buf = newbuf;
r->len = sdslen(r->buf); r->len = hi_sdslen(r->buf);
} }
return REDIS_OK; return REDIS_OK;
...@@ -721,9 +721,9 @@ int redisReaderGetReply(redisReader *r, void **reply) { ...@@ -721,9 +721,9 @@ int redisReaderGetReply(redisReader *r, void **reply) {
/* Discard part of the buffer when we've consumed at least 1k, to avoid /* Discard part of the buffer when we've consumed at least 1k, to avoid
* doing unnecessary calls to memmove() in sds.c. */ * doing unnecessary calls to memmove() in sds.c. */
if (r->pos >= 1024) { if (r->pos >= 1024) {
if (sdsrange(r->buf,r->pos,-1) < 0) return REDIS_ERR; if (hi_sdsrange(r->buf,r->pos,-1) < 0) return REDIS_ERR;
r->pos = 0; r->pos = 0;
r->len = sdslen(r->buf); r->len = hi_sdslen(r->buf);
} }
/* Emit a reply when there is one. */ /* Emit a reply when there is one. */
......
...@@ -40,90 +40,90 @@ ...@@ -40,90 +40,90 @@
#include "sds.h" #include "sds.h"
#include "sdsalloc.h" #include "sdsalloc.h"
static inline int sdsHdrSize(char type) { static inline int hi_sdsHdrSize(char type) {
switch(type&SDS_TYPE_MASK) { switch(type&HI_SDS_TYPE_MASK) {
case SDS_TYPE_5: case HI_SDS_TYPE_5:
return sizeof(struct sdshdr5); return sizeof(struct hisdshdr5);
case SDS_TYPE_8: case HI_SDS_TYPE_8:
return sizeof(struct sdshdr8); return sizeof(struct hisdshdr8);
case SDS_TYPE_16: case HI_SDS_TYPE_16:
return sizeof(struct sdshdr16); return sizeof(struct hisdshdr16);
case SDS_TYPE_32: case HI_SDS_TYPE_32:
return sizeof(struct sdshdr32); return sizeof(struct hisdshdr32);
case SDS_TYPE_64: case HI_SDS_TYPE_64:
return sizeof(struct sdshdr64); return sizeof(struct hisdshdr64);
} }
return 0; return 0;
} }
static inline char sdsReqType(size_t string_size) { static inline char hi_sdsReqType(size_t string_size) {
if (string_size < 32) if (string_size < 32)
return SDS_TYPE_5; return HI_SDS_TYPE_5;
if (string_size < 0xff) if (string_size < 0xff)
return SDS_TYPE_8; return HI_SDS_TYPE_8;
if (string_size < 0xffff) if (string_size < 0xffff)
return SDS_TYPE_16; return HI_SDS_TYPE_16;
if (string_size < 0xffffffff) if (string_size < 0xffffffff)
return SDS_TYPE_32; return HI_SDS_TYPE_32;
return SDS_TYPE_64; return HI_SDS_TYPE_64;
} }
/* Create a new sds string with the content specified by the 'init' pointer /* Create a new hisds string with the content specified by the 'init' pointer
* and 'initlen'. * and 'initlen'.
* If NULL is used for 'init' the string is initialized with zero bytes. * If NULL is used for 'init' the string is initialized with zero bytes.
* *
* The string is always null-termined (all the sds strings are, always) so * The string is always null-termined (all the hisds strings are, always) so
* even if you create an sds string with: * even if you create an hisds string with:
* *
* mystring = sdsnewlen("abc",3); * mystring = hi_sdsnewlen("abc",3);
* *
* You can print the string with printf() as there is an implicit \0 at the * You can print the string with printf() as there is an implicit \0 at the
* end of the string. However the string is binary safe and can contain * 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. */ * \0 characters in the middle, as the length is stored in the hisds header. */
sds sdsnewlen(const void *init, size_t initlen) { hisds hi_sdsnewlen(const void *init, size_t initlen) {
void *sh; void *sh;
sds s; hisds s;
char type = sdsReqType(initlen); char type = hi_sdsReqType(initlen);
/* Empty strings are usually created in order to append. Use type 8 /* Empty strings are usually created in order to append. Use type 8
* since type 5 is not good at this. */ * since type 5 is not good at this. */
if (type == SDS_TYPE_5 && initlen == 0) type = SDS_TYPE_8; if (type == HI_SDS_TYPE_5 && initlen == 0) type = HI_SDS_TYPE_8;
int hdrlen = sdsHdrSize(type); int hdrlen = hi_sdsHdrSize(type);
unsigned char *fp; /* flags pointer. */ unsigned char *fp; /* flags pointer. */
sh = s_malloc(hdrlen+initlen+1); sh = hi_s_malloc(hdrlen+initlen+1);
if (sh == NULL) return NULL; if (sh == NULL) return NULL;
if (!init) if (!init)
memset(sh, 0, hdrlen+initlen+1); memset(sh, 0, hdrlen+initlen+1);
s = (char*)sh+hdrlen; s = (char*)sh+hdrlen;
fp = ((unsigned char*)s)-1; fp = ((unsigned char*)s)-1;
switch(type) { switch(type) {
case SDS_TYPE_5: { case HI_SDS_TYPE_5: {
*fp = type | (initlen << SDS_TYPE_BITS); *fp = type | (initlen << HI_SDS_TYPE_BITS);
break; break;
} }
case SDS_TYPE_8: { case HI_SDS_TYPE_8: {
SDS_HDR_VAR(8,s); HI_SDS_HDR_VAR(8,s);
sh->len = initlen; sh->len = initlen;
sh->alloc = initlen; sh->alloc = initlen;
*fp = type; *fp = type;
break; break;
} }
case SDS_TYPE_16: { case HI_SDS_TYPE_16: {
SDS_HDR_VAR(16,s); HI_SDS_HDR_VAR(16,s);
sh->len = initlen; sh->len = initlen;
sh->alloc = initlen; sh->alloc = initlen;
*fp = type; *fp = type;
break; break;
} }
case SDS_TYPE_32: { case HI_SDS_TYPE_32: {
SDS_HDR_VAR(32,s); HI_SDS_HDR_VAR(32,s);
sh->len = initlen; sh->len = initlen;
sh->alloc = initlen; sh->alloc = initlen;
*fp = type; *fp = type;
break; break;
} }
case SDS_TYPE_64: { case HI_SDS_TYPE_64: {
SDS_HDR_VAR(64,s); HI_SDS_HDR_VAR(64,s);
sh->len = initlen; sh->len = initlen;
sh->alloc = initlen; sh->alloc = initlen;
*fp = type; *fp = type;
...@@ -136,164 +136,164 @@ sds sdsnewlen(const void *init, size_t initlen) { ...@@ -136,164 +136,164 @@ sds sdsnewlen(const void *init, size_t initlen) {
return s; return s;
} }
/* Create an empty (zero length) sds string. Even in this case the string /* Create an empty (zero length) hisds string. Even in this case the string
* always has an implicit null term. */ * always has an implicit null term. */
sds sdsempty(void) { hisds hi_sdsempty(void) {
return sdsnewlen("",0); return hi_sdsnewlen("",0);
} }
/* Create a new sds string starting from a null terminated C string. */ /* Create a new hisds string starting from a null terminated C string. */
sds sdsnew(const char *init) { hisds hi_sdsnew(const char *init) {
size_t initlen = (init == NULL) ? 0 : strlen(init); size_t initlen = (init == NULL) ? 0 : strlen(init);
return sdsnewlen(init, initlen); return hi_sdsnewlen(init, initlen);
} }
/* Duplicate an sds string. */ /* Duplicate an hisds string. */
sds sdsdup(const sds s) { hisds hi_sdsdup(const hisds s) {
return sdsnewlen(s, sdslen(s)); return hi_sdsnewlen(s, hi_sdslen(s));
} }
/* Free an sds string. No operation is performed if 's' is NULL. */ /* Free an hisds string. No operation is performed if 's' is NULL. */
void sdsfree(sds s) { void hi_sdsfree(hisds s) {
if (s == NULL) return; if (s == NULL) return;
s_free((char*)s-sdsHdrSize(s[-1])); hi_s_free((char*)s-hi_sdsHdrSize(s[-1]));
} }
/* Set the sds string length to the length as obtained with strlen(), so /* Set the hisds string length to the length as obtained with strlen(), so
* considering as content only up to the first null term character. * considering as content only up to the first null term character.
* *
* This function is useful when the sds string is hacked manually in some * This function is useful when the hisds string is hacked manually in some
* way, like in the following example: * way, like in the following example:
* *
* s = sdsnew("foobar"); * s = hi_sdsnew("foobar");
* s[2] = '\0'; * s[2] = '\0';
* sdsupdatelen(s); * hi_sdsupdatelen(s);
* printf("%d\n", sdslen(s)); * printf("%d\n", hi_sdslen(s));
* *
* The output will be "2", but if we comment out the call to sdsupdatelen() * The output will be "2", but if we comment out the call to hi_sdsupdatelen()
* the output will be "6" as the string was modified but the logical length * the output will be "6" as the string was modified but the logical length
* remains 6 bytes. */ * remains 6 bytes. */
void sdsupdatelen(sds s) { void hi_sdsupdatelen(hisds s) {
int reallen = strlen(s); int reallen = strlen(s);
sdssetlen(s, reallen); hi_sdssetlen(s, reallen);
} }
/* Modify an sds string in-place to make it empty (zero length). /* Modify an hisds string in-place to make it empty (zero length).
* However all the existing buffer is not discarded but set as free space * However all the existing buffer is not discarded but set as free space
* so that next append operations will not require allocations up to the * so that next append operations will not require allocations up to the
* number of bytes previously available. */ * number of bytes previously available. */
void sdsclear(sds s) { void hi_sdsclear(hisds s) {
sdssetlen(s, 0); hi_sdssetlen(s, 0);
s[0] = '\0'; s[0] = '\0';
} }
/* Enlarge the free space at the end of the sds string so that the caller /* Enlarge the free space at the end of the hisds string so that the caller
* is sure that after calling this function can overwrite up to addlen * is sure that after calling this function can overwrite up to addlen
* bytes after the end of the string, plus one more byte for nul term. * bytes after the end of the string, plus one more byte for nul term.
* *
* Note: this does not change the *length* of the sds string as returned * Note: this does not change the *length* of the hisds string as returned
* by sdslen(), but only the free buffer space we have. */ * by hi_sdslen(), but only the free buffer space we have. */
sds sdsMakeRoomFor(sds s, size_t addlen) { hisds hi_sdsMakeRoomFor(hisds s, size_t addlen) {
void *sh, *newsh; void *sh, *newsh;
size_t avail = sdsavail(s); size_t avail = hi_sdsavail(s);
size_t len, newlen; size_t len, newlen;
char type, oldtype = s[-1] & SDS_TYPE_MASK; char type, oldtype = s[-1] & HI_SDS_TYPE_MASK;
int hdrlen; int hdrlen;
/* Return ASAP if there is enough space left. */ /* Return ASAP if there is enough space left. */
if (avail >= addlen) return s; if (avail >= addlen) return s;
len = sdslen(s); len = hi_sdslen(s);
sh = (char*)s-sdsHdrSize(oldtype); sh = (char*)s-hi_sdsHdrSize(oldtype);
newlen = (len+addlen); newlen = (len+addlen);
if (newlen < SDS_MAX_PREALLOC) if (newlen < HI_SDS_MAX_PREALLOC)
newlen *= 2; newlen *= 2;
else else
newlen += SDS_MAX_PREALLOC; newlen += HI_SDS_MAX_PREALLOC;
type = sdsReqType(newlen); type = hi_sdsReqType(newlen);
/* Don't use type 5: the user is appending to the string and type 5 is /* Don't use type 5: the user is appending to the string and type 5 is
* not able to remember empty space, so sdsMakeRoomFor() must be called * not able to remember empty space, so hi_sdsMakeRoomFor() must be called
* at every appending operation. */ * at every appending operation. */
if (type == SDS_TYPE_5) type = SDS_TYPE_8; if (type == HI_SDS_TYPE_5) type = HI_SDS_TYPE_8;
hdrlen = sdsHdrSize(type); hdrlen = hi_sdsHdrSize(type);
if (oldtype==type) { if (oldtype==type) {
newsh = s_realloc(sh, hdrlen+newlen+1); newsh = hi_s_realloc(sh, hdrlen+newlen+1);
if (newsh == NULL) return NULL; if (newsh == NULL) return NULL;
s = (char*)newsh+hdrlen; s = (char*)newsh+hdrlen;
} else { } else {
/* Since the header size changes, need to move the string forward, /* Since the header size changes, need to move the string forward,
* and can't use realloc */ * and can't use realloc */
newsh = s_malloc(hdrlen+newlen+1); newsh = hi_s_malloc(hdrlen+newlen+1);
if (newsh == NULL) return NULL; if (newsh == NULL) return NULL;
memcpy((char*)newsh+hdrlen, s, len+1); memcpy((char*)newsh+hdrlen, s, len+1);
s_free(sh); hi_s_free(sh);
s = (char*)newsh+hdrlen; s = (char*)newsh+hdrlen;
s[-1] = type; s[-1] = type;
sdssetlen(s, len); hi_sdssetlen(s, len);
} }
sdssetalloc(s, newlen); hi_sdssetalloc(s, newlen);
return s; return s;
} }
/* Reallocate the sds string so that it has no free space at the end. The /* Reallocate the hisds string so that it has no free space at the end. The
* contained string remains not altered, but next concatenation operations * contained string remains not altered, but next concatenation operations
* will require a reallocation. * will require a reallocation.
* *
* After the call, the passed sds string is no longer valid and all the * After the call, the passed hisds string is no longer valid and all the
* references must be substituted with the new pointer returned by the call. */ * references must be substituted with the new pointer returned by the call. */
sds sdsRemoveFreeSpace(sds s) { hisds hi_sdsRemoveFreeSpace(hisds s) {
void *sh, *newsh; void *sh, *newsh;
char type, oldtype = s[-1] & SDS_TYPE_MASK; char type, oldtype = s[-1] & HI_SDS_TYPE_MASK;
int hdrlen; int hdrlen;
size_t len = sdslen(s); size_t len = hi_sdslen(s);
sh = (char*)s-sdsHdrSize(oldtype); sh = (char*)s-hi_sdsHdrSize(oldtype);
type = sdsReqType(len); type = hi_sdsReqType(len);
hdrlen = sdsHdrSize(type); hdrlen = hi_sdsHdrSize(type);
if (oldtype==type) { if (oldtype==type) {
newsh = s_realloc(sh, hdrlen+len+1); newsh = hi_s_realloc(sh, hdrlen+len+1);
if (newsh == NULL) return NULL; if (newsh == NULL) return NULL;
s = (char*)newsh+hdrlen; s = (char*)newsh+hdrlen;
} else { } else {
newsh = s_malloc(hdrlen+len+1); newsh = hi_s_malloc(hdrlen+len+1);
if (newsh == NULL) return NULL; if (newsh == NULL) return NULL;
memcpy((char*)newsh+hdrlen, s, len+1); memcpy((char*)newsh+hdrlen, s, len+1);
s_free(sh); hi_s_free(sh);
s = (char*)newsh+hdrlen; s = (char*)newsh+hdrlen;
s[-1] = type; s[-1] = type;
sdssetlen(s, len); hi_sdssetlen(s, len);
} }
sdssetalloc(s, len); hi_sdssetalloc(s, len);
return s; return s;
} }
/* Return the total size of the allocation of the specifed sds string, /* Return the total size of the allocation of the specifed hisds string,
* including: * including:
* 1) The sds header before the pointer. * 1) The hisds header before the pointer.
* 2) The string. * 2) The string.
* 3) The free buffer at the end if any. * 3) The free buffer at the end if any.
* 4) The implicit null term. * 4) The implicit null term.
*/ */
size_t sdsAllocSize(sds s) { size_t hi_sdsAllocSize(hisds s) {
size_t alloc = sdsalloc(s); size_t alloc = hi_sdsalloc(s);
return sdsHdrSize(s[-1])+alloc+1; return hi_sdsHdrSize(s[-1])+alloc+1;
} }
/* Return the pointer of the actual SDS allocation (normally SDS strings /* Return the pointer of the actual SDS allocation (normally SDS strings
* are referenced by the start of the string buffer). */ * are referenced by the start of the string buffer). */
void *sdsAllocPtr(sds s) { void *hi_sdsAllocPtr(hisds s) {
return (void*) (s-sdsHdrSize(s[-1])); return (void*) (s-hi_sdsHdrSize(s[-1]));
} }
/* Increment the sds length and decrements the left free space at the /* Increment the hisds length and decrements the left free space at the
* end of the string according to 'incr'. Also set the null term * end of the string according to 'incr'. Also set the null term
* in the new end of the string. * in the new end of the string.
* *
* This function is used in order to fix the string length after the * This function is used in order to fix the string length after the
* user calls sdsMakeRoomFor(), writes something after the end of * user calls hi_sdsMakeRoomFor(), writes something after the end of
* the current string, and finally needs to set the new length. * the current string, and finally needs to set the new length.
* *
* Note: it is possible to use a negative increment in order to * Note: it is possible to use a negative increment in order to
...@@ -301,48 +301,48 @@ void *sdsAllocPtr(sds s) { ...@@ -301,48 +301,48 @@ void *sdsAllocPtr(sds s) {
* *
* Usage example: * Usage example:
* *
* Using sdsIncrLen() and sdsMakeRoomFor() it is possible to mount the * Using hi_sdsIncrLen() and hi_sdsMakeRoomFor() it is possible to mount the
* following schema, to cat bytes coming from the kernel to the end of an * following schema, to cat bytes coming from the kernel to the end of an
* sds string without copying into an intermediate buffer: * hisds string without copying into an intermediate buffer:
* *
* oldlen = sdslen(s); * oldlen = hi_hi_sdslen(s);
* s = sdsMakeRoomFor(s, BUFFER_SIZE); * s = hi_sdsMakeRoomFor(s, BUFFER_SIZE);
* nread = read(fd, s+oldlen, BUFFER_SIZE); * nread = read(fd, s+oldlen, BUFFER_SIZE);
* ... check for nread <= 0 and handle it ... * ... check for nread <= 0 and handle it ...
* sdsIncrLen(s, nread); * hi_sdsIncrLen(s, nread);
*/ */
void sdsIncrLen(sds s, int incr) { void hi_sdsIncrLen(hisds s, int incr) {
unsigned char flags = s[-1]; unsigned char flags = s[-1];
size_t len; size_t len;
switch(flags&SDS_TYPE_MASK) { switch(flags&HI_SDS_TYPE_MASK) {
case SDS_TYPE_5: { case HI_SDS_TYPE_5: {
unsigned char *fp = ((unsigned char*)s)-1; unsigned char *fp = ((unsigned char*)s)-1;
unsigned char oldlen = SDS_TYPE_5_LEN(flags); unsigned char oldlen = HI_SDS_TYPE_5_LEN(flags);
assert((incr > 0 && oldlen+incr < 32) || (incr < 0 && oldlen >= (unsigned int)(-incr))); assert((incr > 0 && oldlen+incr < 32) || (incr < 0 && oldlen >= (unsigned int)(-incr)));
*fp = SDS_TYPE_5 | ((oldlen+incr) << SDS_TYPE_BITS); *fp = HI_SDS_TYPE_5 | ((oldlen+incr) << HI_SDS_TYPE_BITS);
len = oldlen+incr; len = oldlen+incr;
break; break;
} }
case SDS_TYPE_8: { case HI_SDS_TYPE_8: {
SDS_HDR_VAR(8,s); HI_SDS_HDR_VAR(8,s);
assert((incr >= 0 && sh->alloc-sh->len >= incr) || (incr < 0 && sh->len >= (unsigned int)(-incr))); assert((incr >= 0 && sh->alloc-sh->len >= incr) || (incr < 0 && sh->len >= (unsigned int)(-incr)));
len = (sh->len += incr); len = (sh->len += incr);
break; break;
} }
case SDS_TYPE_16: { case HI_SDS_TYPE_16: {
SDS_HDR_VAR(16,s); HI_SDS_HDR_VAR(16,s);
assert((incr >= 0 && sh->alloc-sh->len >= incr) || (incr < 0 && sh->len >= (unsigned int)(-incr))); assert((incr >= 0 && sh->alloc-sh->len >= incr) || (incr < 0 && sh->len >= (unsigned int)(-incr)));
len = (sh->len += incr); len = (sh->len += incr);
break; break;
} }
case SDS_TYPE_32: { case HI_SDS_TYPE_32: {
SDS_HDR_VAR(32,s); HI_SDS_HDR_VAR(32,s);
assert((incr >= 0 && sh->alloc-sh->len >= (unsigned int)incr) || (incr < 0 && sh->len >= (unsigned int)(-incr))); assert((incr >= 0 && sh->alloc-sh->len >= (unsigned int)incr) || (incr < 0 && sh->len >= (unsigned int)(-incr)));
len = (sh->len += incr); len = (sh->len += incr);
break; break;
} }
case SDS_TYPE_64: { case HI_SDS_TYPE_64: {
SDS_HDR_VAR(64,s); HI_SDS_HDR_VAR(64,s);
assert((incr >= 0 && sh->alloc-sh->len >= (uint64_t)incr) || (incr < 0 && sh->len >= (uint64_t)(-incr))); assert((incr >= 0 && sh->alloc-sh->len >= (uint64_t)incr) || (incr < 0 && sh->len >= (uint64_t)(-incr)));
len = (sh->len += incr); len = (sh->len += incr);
break; break;
...@@ -352,83 +352,83 @@ void sdsIncrLen(sds s, int incr) { ...@@ -352,83 +352,83 @@ void sdsIncrLen(sds s, int incr) {
s[len] = '\0'; s[len] = '\0';
} }
/* Grow the sds to have the specified length. Bytes that were not part of /* Grow the hisds to have the specified length. Bytes that were not part of
* the original length of the sds will be set to zero. * the original length of the hisds will be set to zero.
* *
* if the specified length is smaller than the current length, no operation * if the specified length is smaller than the current length, no operation
* is performed. */ * is performed. */
sds sdsgrowzero(sds s, size_t len) { hisds hi_sdsgrowzero(hisds s, size_t len) {
size_t curlen = sdslen(s); size_t curlen = hi_sdslen(s);
if (len <= curlen) return s; if (len <= curlen) return s;
s = sdsMakeRoomFor(s,len-curlen); s = hi_sdsMakeRoomFor(s,len-curlen);
if (s == NULL) return NULL; if (s == NULL) return NULL;
/* Make sure added region doesn't contain garbage */ /* Make sure added region doesn't contain garbage */
memset(s+curlen,0,(len-curlen+1)); /* also set trailing \0 byte */ memset(s+curlen,0,(len-curlen+1)); /* also set trailing \0 byte */
sdssetlen(s, len); hi_sdssetlen(s, len);
return s; return s;
} }
/* Append the specified binary-safe string pointed by 't' of 'len' bytes to the /* Append the specified binary-safe string pointed by 't' of 'len' bytes to the
* end of the specified sds string 's'. * end of the specified hisds string 's'.
* *
* After the call, the passed sds string is no longer valid and all the * After the call, the passed hisds string is no longer valid and all the
* references must be substituted with the new pointer returned by the call. */ * references must be substituted with the new pointer returned by the call. */
sds sdscatlen(sds s, const void *t, size_t len) { hisds hi_sdscatlen(hisds s, const void *t, size_t len) {
size_t curlen = sdslen(s); size_t curlen = hi_sdslen(s);
s = sdsMakeRoomFor(s,len); s = hi_sdsMakeRoomFor(s,len);
if (s == NULL) return NULL; if (s == NULL) return NULL;
memcpy(s+curlen, t, len); memcpy(s+curlen, t, len);
sdssetlen(s, curlen+len); hi_sdssetlen(s, curlen+len);
s[curlen+len] = '\0'; s[curlen+len] = '\0';
return s; return s;
} }
/* Append the specified null termianted C string to the sds string 's'. /* Append the specified null termianted C string to the hisds string 's'.
* *
* After the call, the passed sds string is no longer valid and all the * After the call, the passed hisds string is no longer valid and all the
* references must be substituted with the new pointer returned by the call. */ * references must be substituted with the new pointer returned by the call. */
sds sdscat(sds s, const char *t) { hisds hi_sdscat(hisds s, const char *t) {
return sdscatlen(s, t, strlen(t)); return hi_sdscatlen(s, t, strlen(t));
} }
/* Append the specified sds 't' to the existing sds 's'. /* Append the specified hisds 't' to the existing hisds 's'.
* *
* After the call, the modified sds string is no longer valid and all the * After the call, the modified hisds string is no longer valid and all the
* references must be substituted with the new pointer returned by the call. */ * references must be substituted with the new pointer returned by the call. */
sds sdscatsds(sds s, const sds t) { hisds hi_sdscatsds(hisds s, const hisds t) {
return sdscatlen(s, t, sdslen(t)); return hi_sdscatlen(s, t, hi_sdslen(t));
} }
/* Destructively modify the sds string 's' to hold the specified binary /* Destructively modify the hisds string 's' to hold the specified binary
* safe string pointed by 't' of length 'len' bytes. */ * safe string pointed by 't' of length 'len' bytes. */
sds sdscpylen(sds s, const char *t, size_t len) { hisds hi_sdscpylen(hisds s, const char *t, size_t len) {
if (sdsalloc(s) < len) { if (hi_sdsalloc(s) < len) {
s = sdsMakeRoomFor(s,len-sdslen(s)); s = hi_sdsMakeRoomFor(s,len-hi_sdslen(s));
if (s == NULL) return NULL; if (s == NULL) return NULL;
} }
memcpy(s, t, len); memcpy(s, t, len);
s[len] = '\0'; s[len] = '\0';
sdssetlen(s, len); hi_sdssetlen(s, len);
return s; return s;
} }
/* Like sdscpylen() but 't' must be a null-termined string so that the length /* Like hi_sdscpylen() but 't' must be a null-termined string so that the length
* of the string is obtained with strlen(). */ * of the string is obtained with strlen(). */
sds sdscpy(sds s, const char *t) { hisds hi_sdscpy(hisds s, const char *t) {
return sdscpylen(s, t, strlen(t)); return hi_sdscpylen(s, t, strlen(t));
} }
/* Helper for sdscatlonglong() doing the actual number -> string /* Helper for hi_sdscatlonglong() doing the actual number -> string
* conversion. 's' must point to a string with room for at least * conversion. 's' must point to a string with room for at least
* SDS_LLSTR_SIZE bytes. * HI_SDS_LLSTR_SIZE bytes.
* *
* The function returns the length of the null-terminated string * The function returns the length of the null-terminated string
* representation stored at 's'. */ * representation stored at 's'. */
#define SDS_LLSTR_SIZE 21 #define HI_SDS_LLSTR_SIZE 21
int sdsll2str(char *s, long long value) { int hi_sdsll2str(char *s, long long value) {
char *p, aux; char *p, aux;
unsigned long long v; unsigned long long v;
size_t l; size_t l;
...@@ -459,8 +459,8 @@ int sdsll2str(char *s, long long value) { ...@@ -459,8 +459,8 @@ int sdsll2str(char *s, long long value) {
return l; return l;
} }
/* Identical sdsll2str(), but for unsigned long long type. */ /* Identical hi_sdsll2str(), but for unsigned long long type. */
int sdsull2str(char *s, unsigned long long v) { int hi_sdsull2str(char *s, unsigned long long v) {
char *p, aux; char *p, aux;
size_t l; size_t l;
...@@ -488,19 +488,19 @@ int sdsull2str(char *s, unsigned long long v) { ...@@ -488,19 +488,19 @@ int sdsull2str(char *s, unsigned long long v) {
return l; return l;
} }
/* Create an sds string from a long long value. It is much faster than: /* Create an hisds string from a long long value. It is much faster than:
* *
* sdscatprintf(sdsempty(),"%lld\n", value); * hi_sdscatprintf(hi_sdsempty(),"%lld\n", value);
*/ */
sds sdsfromlonglong(long long value) { hisds hi_sdsfromlonglong(long long value) {
char buf[SDS_LLSTR_SIZE]; char buf[HI_SDS_LLSTR_SIZE];
int len = sdsll2str(buf,value); int len = hi_sdsll2str(buf,value);
return sdsnewlen(buf,len); return hi_sdsnewlen(buf,len);
} }
/* Like sdscatprintf() but gets va_list instead of being variadic. */ /* Like hi_sdscatprintf() but gets va_list instead of being variadic. */
sds sdscatvprintf(sds s, const char *fmt, va_list ap) { hisds hi_sdscatvprintf(hisds s, const char *fmt, va_list ap) {
va_list cpy; va_list cpy;
char staticbuf[1024], *buf = staticbuf, *t; char staticbuf[1024], *buf = staticbuf, *t;
size_t buflen = strlen(fmt)*2; size_t buflen = strlen(fmt)*2;
...@@ -508,7 +508,7 @@ sds sdscatvprintf(sds s, const char *fmt, va_list ap) { ...@@ -508,7 +508,7 @@ sds sdscatvprintf(sds s, const char *fmt, va_list ap) {
/* We try to start using a static buffer for speed. /* We try to start using a static buffer for speed.
* If not possible we revert to heap allocation. */ * If not possible we revert to heap allocation. */
if (buflen > sizeof(staticbuf)) { if (buflen > sizeof(staticbuf)) {
buf = s_malloc(buflen); buf = hi_s_malloc(buflen);
if (buf == NULL) return NULL; if (buf == NULL) return NULL;
} else { } else {
buflen = sizeof(staticbuf); buflen = sizeof(staticbuf);
...@@ -522,9 +522,9 @@ sds sdscatvprintf(sds s, const char *fmt, va_list ap) { ...@@ -522,9 +522,9 @@ sds sdscatvprintf(sds s, const char *fmt, va_list ap) {
vsnprintf(buf, buflen, fmt, cpy); vsnprintf(buf, buflen, fmt, cpy);
va_end(cpy); va_end(cpy);
if (buf[buflen-2] != '\0') { if (buf[buflen-2] != '\0') {
if (buf != staticbuf) s_free(buf); if (buf != staticbuf) hi_s_free(buf);
buflen *= 2; buflen *= 2;
buf = s_malloc(buflen); buf = hi_s_malloc(buflen);
if (buf == NULL) return NULL; if (buf == NULL) return NULL;
continue; continue;
} }
...@@ -532,39 +532,39 @@ sds sdscatvprintf(sds s, const char *fmt, va_list ap) { ...@@ -532,39 +532,39 @@ sds sdscatvprintf(sds s, const char *fmt, va_list ap) {
} }
/* Finally concat the obtained string to the SDS string and return it. */ /* Finally concat the obtained string to the SDS string and return it. */
t = sdscat(s, buf); t = hi_sdscat(s, buf);
if (buf != staticbuf) s_free(buf); if (buf != staticbuf) hi_s_free(buf);
return t; return t;
} }
/* Append to the sds string 's' a string obtained using printf-alike format /* Append to the hisds string 's' a string obtained using printf-alike format
* specifier. * specifier.
* *
* After the call, the modified sds string is no longer valid and all the * After the call, the modified hisds string is no longer valid and all the
* references must be substituted with the new pointer returned by the call. * references must be substituted with the new pointer returned by the call.
* *
* Example: * Example:
* *
* s = sdsnew("Sum is: "); * s = hi_sdsnew("Sum is: ");
* s = sdscatprintf(s,"%d+%d = %d",a,b,a+b). * s = hi_sdscatprintf(s,"%d+%d = %d",a,b,a+b).
* *
* Often you need to create a string from scratch with the printf-alike * Often you need to create a string from scratch with the printf-alike
* format. When this is the need, just use sdsempty() as the target string: * format. When this is the need, just use hi_sdsempty() as the target string:
* *
* s = sdscatprintf(sdsempty(), "... your format ...", args); * s = hi_sdscatprintf(hi_sdsempty(), "... your format ...", args);
*/ */
sds sdscatprintf(sds s, const char *fmt, ...) { hisds hi_sdscatprintf(hisds s, const char *fmt, ...) {
va_list ap; va_list ap;
char *t; char *t;
va_start(ap, fmt); va_start(ap, fmt);
t = sdscatvprintf(s,fmt,ap); t = hi_sdscatvprintf(s,fmt,ap);
va_end(ap); va_end(ap);
return t; return t;
} }
/* This function is similar to sdscatprintf, but much faster as it does /* This function is similar to hi_sdscatprintf, but much faster as it does
* not rely on sprintf() family functions implemented by the libc that * not rely on sprintf() family functions implemented by the libc that
* are often very slow. Moreover directly handling the sds string as * are often very slow. Moreover directly handling the hisds string as
* new data is concatenated provides a performance improvement. * new data is concatenated provides a performance improvement.
* *
* However this function only handles an incompatible subset of printf-alike * However this function only handles an incompatible subset of printf-alike
...@@ -578,13 +578,13 @@ sds sdscatprintf(sds s, const char *fmt, ...) { ...@@ -578,13 +578,13 @@ sds sdscatprintf(sds s, const char *fmt, ...) {
* %U - 64 bit unsigned integer (unsigned long long, uint64_t) * %U - 64 bit unsigned integer (unsigned long long, uint64_t)
* %% - Verbatim "%" character. * %% - Verbatim "%" character.
*/ */
sds sdscatfmt(sds s, char const *fmt, ...) { hisds hi_sdscatfmt(hisds s, char const *fmt, ...) {
const char *f = fmt; const char *f = fmt;
int i; int i;
va_list ap; va_list ap;
va_start(ap,fmt); va_start(ap,fmt);
i = sdslen(s); /* Position of the next byte to write to dest str. */ i = hi_sdslen(s); /* Position of the next byte to write to dest str. */
while(*f) { while(*f) {
char next, *str; char next, *str;
size_t l; size_t l;
...@@ -592,8 +592,8 @@ sds sdscatfmt(sds s, char const *fmt, ...) { ...@@ -592,8 +592,8 @@ sds sdscatfmt(sds s, char const *fmt, ...) {
unsigned long long unum; unsigned long long unum;
/* Make sure there is always space for at least 1 char. */ /* Make sure there is always space for at least 1 char. */
if (sdsavail(s)==0) { if (hi_sdsavail(s)==0) {
s = sdsMakeRoomFor(s,1); s = hi_sdsMakeRoomFor(s,1);
if (s == NULL) goto fmt_error; if (s == NULL) goto fmt_error;
} }
...@@ -605,13 +605,13 @@ sds sdscatfmt(sds s, char const *fmt, ...) { ...@@ -605,13 +605,13 @@ sds sdscatfmt(sds s, char const *fmt, ...) {
case 's': case 's':
case 'S': case 'S':
str = va_arg(ap,char*); str = va_arg(ap,char*);
l = (next == 's') ? strlen(str) : sdslen(str); l = (next == 's') ? strlen(str) : hi_sdslen(str);
if (sdsavail(s) < l) { if (hi_sdsavail(s) < l) {
s = sdsMakeRoomFor(s,l); s = hi_sdsMakeRoomFor(s,l);
if (s == NULL) goto fmt_error; if (s == NULL) goto fmt_error;
} }
memcpy(s+i,str,l); memcpy(s+i,str,l);
sdsinclen(s,l); hi_sdsinclen(s,l);
i += l; i += l;
break; break;
case 'i': case 'i':
...@@ -621,14 +621,14 @@ sds sdscatfmt(sds s, char const *fmt, ...) { ...@@ -621,14 +621,14 @@ sds sdscatfmt(sds s, char const *fmt, ...) {
else else
num = va_arg(ap,long long); num = va_arg(ap,long long);
{ {
char buf[SDS_LLSTR_SIZE]; char buf[HI_SDS_LLSTR_SIZE];
l = sdsll2str(buf,num); l = hi_sdsll2str(buf,num);
if (sdsavail(s) < l) { if (hi_sdsavail(s) < l) {
s = sdsMakeRoomFor(s,l); s = hi_sdsMakeRoomFor(s,l);
if (s == NULL) goto fmt_error; if (s == NULL) goto fmt_error;
} }
memcpy(s+i,buf,l); memcpy(s+i,buf,l);
sdsinclen(s,l); hi_sdsinclen(s,l);
i += l; i += l;
} }
break; break;
...@@ -639,26 +639,26 @@ sds sdscatfmt(sds s, char const *fmt, ...) { ...@@ -639,26 +639,26 @@ sds sdscatfmt(sds s, char const *fmt, ...) {
else else
unum = va_arg(ap,unsigned long long); unum = va_arg(ap,unsigned long long);
{ {
char buf[SDS_LLSTR_SIZE]; char buf[HI_SDS_LLSTR_SIZE];
l = sdsull2str(buf,unum); l = hi_sdsull2str(buf,unum);
if (sdsavail(s) < l) { if (hi_sdsavail(s) < l) {
s = sdsMakeRoomFor(s,l); s = hi_sdsMakeRoomFor(s,l);
if (s == NULL) goto fmt_error; if (s == NULL) goto fmt_error;
} }
memcpy(s+i,buf,l); memcpy(s+i,buf,l);
sdsinclen(s,l); hi_sdsinclen(s,l);
i += l; i += l;
} }
break; break;
default: /* Handle %% and generally %<unknown>. */ default: /* Handle %% and generally %<unknown>. */
s[i++] = next; s[i++] = next;
sdsinclen(s,1); hi_sdsinclen(s,1);
break; break;
} }
break; break;
default: default:
s[i++] = *f; s[i++] = *f;
sdsinclen(s,1); hi_sdsinclen(s,1);
break; break;
} }
f++; f++;
...@@ -677,29 +677,29 @@ fmt_error: ...@@ -677,29 +677,29 @@ fmt_error:
/* Remove the part of the string from left and from right composed just of /* Remove the part of the string from left and from right composed just of
* contiguous characters found in 'cset', that is a null terminted C string. * contiguous characters found in 'cset', that is a null terminted C string.
* *
* After the call, the modified sds string is no longer valid and all the * After the call, the modified hisds string is no longer valid and all the
* references must be substituted with the new pointer returned by the call. * references must be substituted with the new pointer returned by the call.
* *
* Example: * Example:
* *
* s = sdsnew("AA...AA.a.aa.aHelloWorld :::"); * s = hi_sdsnew("AA...AA.a.aa.aHelloWorld :::");
* s = sdstrim(s,"Aa. :"); * s = hi_sdstrim(s,"Aa. :");
* printf("%s\n", s); * printf("%s\n", s);
* *
* Output will be just "Hello World". * Output will be just "Hello World".
*/ */
sds sdstrim(sds s, const char *cset) { hisds hi_sdstrim(hisds s, const char *cset) {
char *start, *end, *sp, *ep; char *start, *end, *sp, *ep;
size_t len; size_t len;
sp = start = s; sp = start = s;
ep = end = s+sdslen(s)-1; ep = end = s+hi_sdslen(s)-1;
while(sp <= end && strchr(cset, *sp)) sp++; while(sp <= end && strchr(cset, *sp)) sp++;
while(ep > sp && strchr(cset, *ep)) ep--; while(ep > sp && strchr(cset, *ep)) ep--;
len = (sp > ep) ? 0 : ((ep-sp)+1); len = (sp > ep) ? 0 : ((ep-sp)+1);
if (s != sp) memmove(s, sp, len); if (s != sp) memmove(s, sp, len);
s[len] = '\0'; s[len] = '\0';
sdssetlen(s,len); hi_sdssetlen(s,len);
return s; return s;
} }
...@@ -715,16 +715,16 @@ sds sdstrim(sds s, const char *cset) { ...@@ -715,16 +715,16 @@ sds sdstrim(sds s, const char *cset) {
* The string is modified in-place. * The string is modified in-place.
* *
* Return value: * Return value:
* -1 (error) if sdslen(s) is larger than maximum positive ssize_t value. * -1 (error) if hi_sdslen(s) is larger than maximum positive ssize_t value.
* 0 on success. * 0 on success.
* *
* Example: * Example:
* *
* s = sdsnew("Hello World"); * s = hi_sdsnew("Hello World");
* sdsrange(s,1,-1); => "ello World" * hi_sdsrange(s,1,-1); => "ello World"
*/ */
int sdsrange(sds s, ssize_t start, ssize_t end) { int hi_sdsrange(hisds s, ssize_t start, ssize_t end) {
size_t newlen, len = sdslen(s); size_t newlen, len = hi_sdslen(s);
if (len > SSIZE_MAX) return -1; if (len > SSIZE_MAX) return -1;
if (len == 0) return 0; if (len == 0) return 0;
...@@ -749,25 +749,25 @@ int sdsrange(sds s, ssize_t start, ssize_t end) { ...@@ -749,25 +749,25 @@ int sdsrange(sds s, ssize_t start, ssize_t end) {
} }
if (start && newlen) memmove(s, s+start, newlen); if (start && newlen) memmove(s, s+start, newlen);
s[newlen] = 0; s[newlen] = 0;
sdssetlen(s,newlen); hi_sdssetlen(s,newlen);
return 0; return 0;
} }
/* Apply tolower() to every character of the sds string 's'. */ /* Apply tolower() to every character of the hisds string 's'. */
void sdstolower(sds s) { void hi_sdstolower(hisds s) {
int len = sdslen(s), j; int len = hi_sdslen(s), j;
for (j = 0; j < len; j++) s[j] = tolower(s[j]); for (j = 0; j < len; j++) s[j] = tolower(s[j]);
} }
/* Apply toupper() to every character of the sds string 's'. */ /* Apply toupper() to every character of the hisds string 's'. */
void sdstoupper(sds s) { void hi_sdstoupper(hisds s) {
int len = sdslen(s), j; int len = hi_sdslen(s), j;
for (j = 0; j < len; j++) s[j] = toupper(s[j]); for (j = 0; j < len; j++) s[j] = toupper(s[j]);
} }
/* Compare two sds strings s1 and s2 with memcmp(). /* Compare two hisds strings s1 and s2 with memcmp().
* *
* Return value: * Return value:
* *
...@@ -778,12 +778,12 @@ void sdstoupper(sds s) { ...@@ -778,12 +778,12 @@ void sdstoupper(sds s) {
* If two strings share exactly the same prefix, but one of the two has * If two strings share exactly the same prefix, but one of the two has
* additional characters, the longer string is considered to be greater than * additional characters, the longer string is considered to be greater than
* the smaller one. */ * the smaller one. */
int sdscmp(const sds s1, const sds s2) { int hi_sdscmp(const hisds s1, const hisds s2) {
size_t l1, l2, minlen; size_t l1, l2, minlen;
int cmp; int cmp;
l1 = sdslen(s1); l1 = hi_sdslen(s1);
l2 = sdslen(s2); l2 = hi_sdslen(s2);
minlen = (l1 < l2) ? l1 : l2; minlen = (l1 < l2) ? l1 : l2;
cmp = memcmp(s1,s2,minlen); cmp = memcmp(s1,s2,minlen);
if (cmp == 0) return l1-l2; if (cmp == 0) return l1-l2;
...@@ -791,7 +791,7 @@ int sdscmp(const sds s1, const sds s2) { ...@@ -791,7 +791,7 @@ int sdscmp(const sds s1, const sds s2) {
} }
/* Split 's' with separator in 'sep'. An array /* Split 's' with separator in 'sep'. An array
* of sds strings is returned. *count will be set * of hisds strings is returned. *count will be set
* by reference to the number of tokens returned. * by reference to the number of tokens returned.
* *
* On out of memory, zero length string, zero length * On out of memory, zero length string, zero length
...@@ -799,20 +799,20 @@ int sdscmp(const sds s1, const sds s2) { ...@@ -799,20 +799,20 @@ int sdscmp(const sds s1, const sds s2) {
* *
* Note that 'sep' is able to split a string using * Note that 'sep' is able to split a string using
* a multi-character separator. For example * a multi-character separator. For example
* sdssplit("foo_-_bar","_-_"); will return two * hi_sdssplit("foo_-_bar","_-_"); will return two
* elements "foo" and "bar". * elements "foo" and "bar".
* *
* This version of the function is binary-safe but * This version of the function is binary-safe but
* requires length arguments. sdssplit() is just the * requires length arguments. hi_sdssplit() is just the
* same function but for zero-terminated strings. * same function but for zero-terminated strings.
*/ */
sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count) { hisds *hi_sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count) {
int elements = 0, slots = 5, start = 0, j; int elements = 0, slots = 5, start = 0, j;
sds *tokens; hisds *tokens;
if (seplen < 1 || len < 0) return NULL; if (seplen < 1 || len < 0) return NULL;
tokens = s_malloc(sizeof(sds)*slots); tokens = hi_s_malloc(sizeof(hisds)*slots);
if (tokens == NULL) return NULL; if (tokens == NULL) return NULL;
if (len == 0) { if (len == 0) {
...@@ -822,16 +822,16 @@ sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count ...@@ -822,16 +822,16 @@ sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count
for (j = 0; j < (len-(seplen-1)); j++) { for (j = 0; j < (len-(seplen-1)); j++) {
/* make sure there is room for the next element and the final one */ /* make sure there is room for the next element and the final one */
if (slots < elements+2) { if (slots < elements+2) {
sds *newtokens; hisds *newtokens;
slots *= 2; slots *= 2;
newtokens = s_realloc(tokens,sizeof(sds)*slots); newtokens = hi_s_realloc(tokens,sizeof(hisds)*slots);
if (newtokens == NULL) goto cleanup; if (newtokens == NULL) goto cleanup;
tokens = newtokens; tokens = newtokens;
} }
/* search the separator */ /* search the separator */
if ((seplen == 1 && *(s+j) == sep[0]) || (memcmp(s+j,sep,seplen) == 0)) { if ((seplen == 1 && *(s+j) == sep[0]) || (memcmp(s+j,sep,seplen) == 0)) {
tokens[elements] = sdsnewlen(s+start,j-start); tokens[elements] = hi_sdsnewlen(s+start,j-start);
if (tokens[elements] == NULL) goto cleanup; if (tokens[elements] == NULL) goto cleanup;
elements++; elements++;
start = j+seplen; start = j+seplen;
...@@ -839,7 +839,7 @@ sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count ...@@ -839,7 +839,7 @@ sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count
} }
} }
/* Add the final element. We are sure there is room in the tokens array. */ /* Add the final element. We are sure there is room in the tokens array. */
tokens[elements] = sdsnewlen(s+start,len-start); tokens[elements] = hi_sdsnewlen(s+start,len-start);
if (tokens[elements] == NULL) goto cleanup; if (tokens[elements] == NULL) goto cleanup;
elements++; elements++;
*count = elements; *count = elements;
...@@ -848,55 +848,55 @@ sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count ...@@ -848,55 +848,55 @@ sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count
cleanup: cleanup:
{ {
int i; int i;
for (i = 0; i < elements; i++) sdsfree(tokens[i]); for (i = 0; i < elements; i++) hi_sdsfree(tokens[i]);
s_free(tokens); hi_s_free(tokens);
*count = 0; *count = 0;
return NULL; return NULL;
} }
} }
/* Free the result returned by sdssplitlen(), or do nothing if 'tokens' is NULL. */ /* Free the result returned by hi_sdssplitlen(), or do nothing if 'tokens' is NULL. */
void sdsfreesplitres(sds *tokens, int count) { void hi_sdsfreesplitres(hisds *tokens, int count) {
if (!tokens) return; if (!tokens) return;
while(count--) while(count--)
sdsfree(tokens[count]); hi_sdsfree(tokens[count]);
s_free(tokens); hi_s_free(tokens);
} }
/* Append to the sds string "s" an escaped string representation where /* Append to the hisds string "s" an escaped string representation where
* all the non-printable characters (tested with isprint()) are turned into * all the non-printable characters (tested with isprint()) are turned into
* escapes in the form "\n\r\a...." or "\x<hex-number>". * escapes in the form "\n\r\a...." or "\x<hex-number>".
* *
* After the call, the modified sds string is no longer valid and all the * After the call, the modified hisds string is no longer valid and all the
* references must be substituted with the new pointer returned by the call. */ * references must be substituted with the new pointer returned by the call. */
sds sdscatrepr(sds s, const char *p, size_t len) { hisds hi_sdscatrepr(hisds s, const char *p, size_t len) {
s = sdscatlen(s,"\"",1); s = hi_sdscatlen(s,"\"",1);
while(len--) { while(len--) {
switch(*p) { switch(*p) {
case '\\': case '\\':
case '"': case '"':
s = sdscatprintf(s,"\\%c",*p); s = hi_sdscatprintf(s,"\\%c",*p);
break; break;
case '\n': s = sdscatlen(s,"\\n",2); break; case '\n': s = hi_sdscatlen(s,"\\n",2); break;
case '\r': s = sdscatlen(s,"\\r",2); break; case '\r': s = hi_sdscatlen(s,"\\r",2); break;
case '\t': s = sdscatlen(s,"\\t",2); break; case '\t': s = hi_sdscatlen(s,"\\t",2); break;
case '\a': s = sdscatlen(s,"\\a",2); break; case '\a': s = hi_sdscatlen(s,"\\a",2); break;
case '\b': s = sdscatlen(s,"\\b",2); break; case '\b': s = hi_sdscatlen(s,"\\b",2); break;
default: default:
if (isprint(*p)) if (isprint(*p))
s = sdscatprintf(s,"%c",*p); s = hi_sdscatprintf(s,"%c",*p);
else else
s = sdscatprintf(s,"\\x%02x",(unsigned char)*p); s = hi_sdscatprintf(s,"\\x%02x",(unsigned char)*p);
break; break;
} }
p++; p++;
} }
return sdscatlen(s,"\"",1); return hi_sdscatlen(s,"\"",1);
} }
/* Helper function for sdssplitargs() that converts a hex digit into an /* Helper function for hi_sdssplitargs() that converts a hex digit into an
* integer from 0 to 15 */ * integer from 0 to 15 */
int hex_digit_to_int(char c) { static int hi_hex_digit_to_int(char c) {
switch(c) { switch(c) {
case '0': return 0; case '0': return 0;
case '1': return 1; case '1': return 1;
...@@ -924,20 +924,20 @@ int hex_digit_to_int(char c) { ...@@ -924,20 +924,20 @@ int hex_digit_to_int(char c) {
* foo bar "newline are supported\n" and "\xff\x00otherstuff" * foo bar "newline are supported\n" and "\xff\x00otherstuff"
* *
* The number of arguments is stored into *argc, and an array * The number of arguments is stored into *argc, and an array
* of sds is returned. * of hisds is returned.
* *
* The caller should free the resulting array of sds strings with * The caller should free the resulting array of hisds strings with
* sdsfreesplitres(). * hi_sdsfreesplitres().
* *
* Note that sdscatrepr() is able to convert back a string into * Note that hi_sdscatrepr() is able to convert back a string into
* a quoted string in the same format sdssplitargs() is able to parse. * a quoted string in the same format hi_sdssplitargs() is able to parse.
* *
* The function returns the allocated tokens on success, even when the * The function returns the allocated tokens on success, even when the
* input string is empty, or NULL if the input contains unbalanced * input string is empty, or NULL if the input contains unbalanced
* quotes or closed quotes followed by non space characters * quotes or closed quotes followed by non space characters
* as in: "foo"bar or "foo' * as in: "foo"bar or "foo'
*/ */
sds *sdssplitargs(const char *line, int *argc) { hisds *hi_sdssplitargs(const char *line, int *argc) {
const char *p = line; const char *p = line;
char *current = NULL; char *current = NULL;
char **vector = NULL; char **vector = NULL;
...@@ -952,7 +952,7 @@ sds *sdssplitargs(const char *line, int *argc) { ...@@ -952,7 +952,7 @@ sds *sdssplitargs(const char *line, int *argc) {
int insq=0; /* set to 1 if we are in 'single quotes' */ int insq=0; /* set to 1 if we are in 'single quotes' */
int done=0; int done=0;
if (current == NULL) current = sdsempty(); if (current == NULL) current = hi_sdsempty();
while(!done) { while(!done) {
if (inq) { if (inq) {
if (*p == '\\' && *(p+1) == 'x' && if (*p == '\\' && *(p+1) == 'x' &&
...@@ -961,9 +961,9 @@ sds *sdssplitargs(const char *line, int *argc) { ...@@ -961,9 +961,9 @@ sds *sdssplitargs(const char *line, int *argc) {
{ {
unsigned char byte; unsigned char byte;
byte = (hex_digit_to_int(*(p+2))*16)+ byte = (hi_hex_digit_to_int(*(p+2))*16)+
hex_digit_to_int(*(p+3)); hi_hex_digit_to_int(*(p+3));
current = sdscatlen(current,(char*)&byte,1); current = hi_sdscatlen(current,(char*)&byte,1);
p += 3; p += 3;
} else if (*p == '\\' && *(p+1)) { } else if (*p == '\\' && *(p+1)) {
char c; char c;
...@@ -977,7 +977,7 @@ sds *sdssplitargs(const char *line, int *argc) { ...@@ -977,7 +977,7 @@ sds *sdssplitargs(const char *line, int *argc) {
case 'a': c = '\a'; break; case 'a': c = '\a'; break;
default: c = *p; break; default: c = *p; break;
} }
current = sdscatlen(current,&c,1); current = hi_sdscatlen(current,&c,1);
} else if (*p == '"') { } else if (*p == '"') {
/* closing quote must be followed by a space or /* closing quote must be followed by a space or
* nothing at all. */ * nothing at all. */
...@@ -987,12 +987,12 @@ sds *sdssplitargs(const char *line, int *argc) { ...@@ -987,12 +987,12 @@ sds *sdssplitargs(const char *line, int *argc) {
/* unterminated quotes */ /* unterminated quotes */
goto err; goto err;
} else { } else {
current = sdscatlen(current,p,1); current = hi_sdscatlen(current,p,1);
} }
} else if (insq) { } else if (insq) {
if (*p == '\\' && *(p+1) == '\'') { if (*p == '\\' && *(p+1) == '\'') {
p++; p++;
current = sdscatlen(current,"'",1); current = hi_sdscatlen(current,"'",1);
} else if (*p == '\'') { } else if (*p == '\'') {
/* closing quote must be followed by a space or /* closing quote must be followed by a space or
* nothing at all. */ * nothing at all. */
...@@ -1002,7 +1002,7 @@ sds *sdssplitargs(const char *line, int *argc) { ...@@ -1002,7 +1002,7 @@ sds *sdssplitargs(const char *line, int *argc) {
/* unterminated quotes */ /* unterminated quotes */
goto err; goto err;
} else { } else {
current = sdscatlen(current,p,1); current = hi_sdscatlen(current,p,1);
} }
} else { } else {
switch(*p) { switch(*p) {
...@@ -1020,7 +1020,7 @@ sds *sdssplitargs(const char *line, int *argc) { ...@@ -1020,7 +1020,7 @@ sds *sdssplitargs(const char *line, int *argc) {
insq=1; insq=1;
break; break;
default: default:
current = sdscatlen(current,p,1); current = hi_sdscatlen(current,p,1);
break; break;
} }
} }
...@@ -1028,9 +1028,9 @@ sds *sdssplitargs(const char *line, int *argc) { ...@@ -1028,9 +1028,9 @@ sds *sdssplitargs(const char *line, int *argc) {
} }
/* add the token to the vector */ /* add the token to the vector */
{ {
char **new_vector = s_realloc(vector,((*argc)+1)*sizeof(char*)); char **new_vector = hi_s_realloc(vector,((*argc)+1)*sizeof(char*));
if (new_vector == NULL) { if (new_vector == NULL) {
s_free(vector); hi_s_free(vector);
return NULL; return NULL;
} }
...@@ -1041,16 +1041,16 @@ sds *sdssplitargs(const char *line, int *argc) { ...@@ -1041,16 +1041,16 @@ sds *sdssplitargs(const char *line, int *argc) {
} }
} else { } else {
/* Even on empty input string return something not NULL. */ /* Even on empty input string return something not NULL. */
if (vector == NULL) vector = s_malloc(sizeof(void*)); if (vector == NULL) vector = hi_s_malloc(sizeof(void*));
return vector; return vector;
} }
} }
err: err:
while((*argc)--) while((*argc)--)
sdsfree(vector[*argc]); hi_sdsfree(vector[*argc]);
s_free(vector); hi_s_free(vector);
if (current) sdsfree(current); if (current) hi_sdsfree(current);
*argc = 0; *argc = 0;
return NULL; return NULL;
} }
...@@ -1059,13 +1059,13 @@ err: ...@@ -1059,13 +1059,13 @@ err:
* characters specified in the 'from' string to the corresponding character * characters specified in the 'from' string to the corresponding character
* in the 'to' array. * in the 'to' array.
* *
* For instance: sdsmapchars(mystring, "ho", "01", 2) * For instance: hi_sdsmapchars(mystring, "ho", "01", 2)
* will have the effect of turning the string "hello" into "0ell1". * will have the effect of turning the string "hello" into "0ell1".
* *
* The function returns the sds string pointer, that is always the same * The function returns the hisds string pointer, that is always the same
* as the input pointer since no resize is needed. */ * as the input pointer since no resize is needed. */
sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen) { hisds hi_sdsmapchars(hisds s, const char *from, const char *to, size_t setlen) {
size_t j, i, l = sdslen(s); size_t j, i, l = hi_sdslen(s);
for (j = 0; j < l; j++) { for (j = 0; j < l; j++) {
for (i = 0; i < setlen; i++) { for (i = 0; i < setlen; i++) {
...@@ -1079,26 +1079,26 @@ sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen) { ...@@ -1079,26 +1079,26 @@ sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen) {
} }
/* Join an array of C strings using the specified separator (also a C string). /* Join an array of C strings using the specified separator (also a C string).
* Returns the result as an sds string. */ * Returns the result as an hisds string. */
sds sdsjoin(char **argv, int argc, char *sep) { hisds hi_sdsjoin(char **argv, int argc, char *sep) {
sds join = sdsempty(); hisds join = hi_sdsempty();
int j; int j;
for (j = 0; j < argc; j++) { for (j = 0; j < argc; j++) {
join = sdscat(join, argv[j]); join = hi_sdscat(join, argv[j]);
if (j != argc-1) join = sdscat(join,sep); if (j != argc-1) join = hi_sdscat(join,sep);
} }
return join; return join;
} }
/* Like sdsjoin, but joins an array of SDS strings. */ /* Like hi_sdsjoin, but joins an array of SDS strings. */
sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen) { hisds hi_sdsjoinsds(hisds *argv, int argc, const char *sep, size_t seplen) {
sds join = sdsempty(); hisds join = hi_sdsempty();
int j; int j;
for (j = 0; j < argc; j++) { for (j = 0; j < argc; j++) {
join = sdscatsds(join, argv[j]); join = hi_sdscatsds(join, argv[j]);
if (j != argc-1) join = sdscatlen(join,sep,seplen); if (j != argc-1) join = hi_sdscatlen(join,sep,seplen);
} }
return join; return join;
} }
...@@ -1108,138 +1108,138 @@ sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen) { ...@@ -1108,138 +1108,138 @@ sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen) {
* the overhead of function calls. Here we define these wrappers only for * the overhead of function calls. Here we define these wrappers only for
* the programs SDS is linked to, if they want to touch the SDS internals * the programs SDS is linked to, if they want to touch the SDS internals
* even if they use a different allocator. */ * even if they use a different allocator. */
void *sds_malloc(size_t size) { return s_malloc(size); } void *hi_sds_malloc(size_t size) { return hi_s_malloc(size); }
void *sds_realloc(void *ptr, size_t size) { return s_realloc(ptr,size); } void *hi_sds_realloc(void *ptr, size_t size) { return hi_s_realloc(ptr,size); }
void sds_free(void *ptr) { s_free(ptr); } void hi_sds_free(void *ptr) { hi_s_free(ptr); }
#if defined(SDS_TEST_MAIN) #if defined(HI_SDS_TEST_MAIN)
#include <stdio.h> #include <stdio.h>
#include "testhelp.h" #include "testhelp.h"
#include "limits.h" #include "limits.h"
#define UNUSED(x) (void)(x) #define UNUSED(x) (void)(x)
int sdsTest(void) { int hi_sdsTest(void) {
{ {
sds x = sdsnew("foo"), y; hisds x = hi_sdsnew("foo"), y;
test_cond("Create a string and obtain the length", test_cond("Create a string and obtain the length",
sdslen(x) == 3 && memcmp(x,"foo\0",4) == 0) hi_sdslen(x) == 3 && memcmp(x,"foo\0",4) == 0)
sdsfree(x); hi_sdsfree(x);
x = sdsnewlen("foo",2); x = hi_sdsnewlen("foo",2);
test_cond("Create a string with specified length", test_cond("Create a string with specified length",
sdslen(x) == 2 && memcmp(x,"fo\0",3) == 0) hi_sdslen(x) == 2 && memcmp(x,"fo\0",3) == 0)
x = sdscat(x,"bar"); x = hi_sdscat(x,"bar");
test_cond("Strings concatenation", test_cond("Strings concatenation",
sdslen(x) == 5 && memcmp(x,"fobar\0",6) == 0); hi_sdslen(x) == 5 && memcmp(x,"fobar\0",6) == 0);
x = sdscpy(x,"a"); x = hi_sdscpy(x,"a");
test_cond("sdscpy() against an originally longer string", test_cond("hi_sdscpy() against an originally longer string",
sdslen(x) == 1 && memcmp(x,"a\0",2) == 0) hi_sdslen(x) == 1 && memcmp(x,"a\0",2) == 0)
x = sdscpy(x,"xyzxxxxxxxxxxyyyyyyyyyykkkkkkkkkk"); x = hi_sdscpy(x,"xyzxxxxxxxxxxyyyyyyyyyykkkkkkkkkk");
test_cond("sdscpy() against an originally shorter string", test_cond("hi_sdscpy() against an originally shorter string",
sdslen(x) == 33 && hi_sdslen(x) == 33 &&
memcmp(x,"xyzxxxxxxxxxxyyyyyyyyyykkkkkkkkkk\0",33) == 0) memcmp(x,"xyzxxxxxxxxxxyyyyyyyyyykkkkkkkkkk\0",33) == 0)
sdsfree(x); hi_sdsfree(x);
x = sdscatprintf(sdsempty(),"%d",123); x = hi_sdscatprintf(hi_sdsempty(),"%d",123);
test_cond("sdscatprintf() seems working in the base case", test_cond("hi_sdscatprintf() seems working in the base case",
sdslen(x) == 3 && memcmp(x,"123\0",4) == 0) hi_sdslen(x) == 3 && memcmp(x,"123\0",4) == 0)
sdsfree(x); hi_sdsfree(x);
x = sdsnew("--"); x = hi_sdsnew("--");
x = sdscatfmt(x, "Hello %s World %I,%I--", "Hi!", LLONG_MIN,LLONG_MAX); x = hi_sdscatfmt(x, "Hello %s World %I,%I--", "Hi!", LLONG_MIN,LLONG_MAX);
test_cond("sdscatfmt() seems working in the base case", test_cond("hi_sdscatfmt() seems working in the base case",
sdslen(x) == 60 && hi_sdslen(x) == 60 &&
memcmp(x,"--Hello Hi! World -9223372036854775808," memcmp(x,"--Hello Hi! World -9223372036854775808,"
"9223372036854775807--",60) == 0) "9223372036854775807--",60) == 0)
printf("[%s]\n",x); printf("[%s]\n",x);
sdsfree(x); hi_sdsfree(x);
x = sdsnew("--"); x = hi_sdsnew("--");
x = sdscatfmt(x, "%u,%U--", UINT_MAX, ULLONG_MAX); x = hi_sdscatfmt(x, "%u,%U--", UINT_MAX, ULLONG_MAX);
test_cond("sdscatfmt() seems working with unsigned numbers", test_cond("hi_sdscatfmt() seems working with unsigned numbers",
sdslen(x) == 35 && hi_sdslen(x) == 35 &&
memcmp(x,"--4294967295,18446744073709551615--",35) == 0) memcmp(x,"--4294967295,18446744073709551615--",35) == 0)
sdsfree(x); hi_sdsfree(x);
x = sdsnew(" x "); x = hi_sdsnew(" x ");
sdstrim(x," x"); hi_sdstrim(x," x");
test_cond("sdstrim() works when all chars match", test_cond("hi_sdstrim() works when all chars match",
sdslen(x) == 0) hi_sdslen(x) == 0)
sdsfree(x); hi_sdsfree(x);
x = sdsnew(" x "); x = hi_sdsnew(" x ");
sdstrim(x," "); hi_sdstrim(x," ");
test_cond("sdstrim() works when a single char remains", test_cond("hi_sdstrim() works when a single char remains",
sdslen(x) == 1 && x[0] == 'x') hi_sdslen(x) == 1 && x[0] == 'x')
sdsfree(x); hi_sdsfree(x);
x = sdsnew("xxciaoyyy"); x = hi_sdsnew("xxciaoyyy");
sdstrim(x,"xy"); hi_sdstrim(x,"xy");
test_cond("sdstrim() correctly trims characters", test_cond("hi_sdstrim() correctly trims characters",
sdslen(x) == 4 && memcmp(x,"ciao\0",5) == 0) hi_sdslen(x) == 4 && memcmp(x,"ciao\0",5) == 0)
y = sdsdup(x); y = hi_sdsdup(x);
sdsrange(y,1,1); hi_sdsrange(y,1,1);
test_cond("sdsrange(...,1,1)", test_cond("hi_sdsrange(...,1,1)",
sdslen(y) == 1 && memcmp(y,"i\0",2) == 0) hi_sdslen(y) == 1 && memcmp(y,"i\0",2) == 0)
sdsfree(y); hi_sdsfree(y);
y = sdsdup(x); y = hi_sdsdup(x);
sdsrange(y,1,-1); hi_sdsrange(y,1,-1);
test_cond("sdsrange(...,1,-1)", test_cond("hi_sdsrange(...,1,-1)",
sdslen(y) == 3 && memcmp(y,"iao\0",4) == 0) hi_sdslen(y) == 3 && memcmp(y,"iao\0",4) == 0)
sdsfree(y); hi_sdsfree(y);
y = sdsdup(x); y = hi_sdsdup(x);
sdsrange(y,-2,-1); hi_sdsrange(y,-2,-1);
test_cond("sdsrange(...,-2,-1)", test_cond("hi_sdsrange(...,-2,-1)",
sdslen(y) == 2 && memcmp(y,"ao\0",3) == 0) hi_sdslen(y) == 2 && memcmp(y,"ao\0",3) == 0)
sdsfree(y); hi_sdsfree(y);
y = sdsdup(x); y = hi_sdsdup(x);
sdsrange(y,2,1); hi_sdsrange(y,2,1);
test_cond("sdsrange(...,2,1)", test_cond("hi_sdsrange(...,2,1)",
sdslen(y) == 0 && memcmp(y,"\0",1) == 0) hi_sdslen(y) == 0 && memcmp(y,"\0",1) == 0)
sdsfree(y); hi_sdsfree(y);
y = sdsdup(x); y = hi_sdsdup(x);
sdsrange(y,1,100); hi_sdsrange(y,1,100);
test_cond("sdsrange(...,1,100)", test_cond("hi_sdsrange(...,1,100)",
sdslen(y) == 3 && memcmp(y,"iao\0",4) == 0) hi_sdslen(y) == 3 && memcmp(y,"iao\0",4) == 0)
sdsfree(y); hi_sdsfree(y);
y = sdsdup(x); y = hi_sdsdup(x);
sdsrange(y,100,100); hi_sdsrange(y,100,100);
test_cond("sdsrange(...,100,100)", test_cond("hi_sdsrange(...,100,100)",
sdslen(y) == 0 && memcmp(y,"\0",1) == 0) hi_sdslen(y) == 0 && memcmp(y,"\0",1) == 0)
sdsfree(y); hi_sdsfree(y);
sdsfree(x); hi_sdsfree(x);
x = sdsnew("foo"); x = hi_sdsnew("foo");
y = sdsnew("foa"); y = hi_sdsnew("foa");
test_cond("sdscmp(foo,foa)", sdscmp(x,y) > 0) test_cond("hi_sdscmp(foo,foa)", hi_sdscmp(x,y) > 0)
sdsfree(y); hi_sdsfree(y);
sdsfree(x); hi_sdsfree(x);
x = sdsnew("bar"); x = hi_sdsnew("bar");
y = sdsnew("bar"); y = hi_sdsnew("bar");
test_cond("sdscmp(bar,bar)", sdscmp(x,y) == 0) test_cond("hi_sdscmp(bar,bar)", hi_sdscmp(x,y) == 0)
sdsfree(y); hi_sdsfree(y);
sdsfree(x); hi_sdsfree(x);
x = sdsnew("aar"); x = hi_sdsnew("aar");
y = sdsnew("bar"); y = hi_sdsnew("bar");
test_cond("sdscmp(bar,bar)", sdscmp(x,y) < 0) test_cond("hi_sdscmp(bar,bar)", hi_sdscmp(x,y) < 0)
sdsfree(y); hi_sdsfree(y);
sdsfree(x); hi_sdsfree(x);
x = sdsnewlen("\a\n\0foo\r",7); x = hi_sdsnewlen("\a\n\0foo\r",7);
y = sdscatrepr(sdsempty(),x,sdslen(x)); y = hi_sdscatrepr(hi_sdsempty(),x,hi_sdslen(x));
test_cond("sdscatrepr(...data...)", test_cond("hi_sdscatrepr(...data...)",
memcmp(y,"\"\\a\\n\\x00foo\\r\"",15) == 0) memcmp(y,"\"\\a\\n\\x00foo\\r\"",15) == 0)
{ {
...@@ -1247,43 +1247,43 @@ int sdsTest(void) { ...@@ -1247,43 +1247,43 @@ int sdsTest(void) {
char *p; char *p;
int step = 10, j, i; int step = 10, j, i;
sdsfree(x); hi_sdsfree(x);
sdsfree(y); hi_sdsfree(y);
x = sdsnew("0"); x = hi_sdsnew("0");
test_cond("sdsnew() free/len buffers", sdslen(x) == 1 && sdsavail(x) == 0); test_cond("hi_sdsnew() free/len buffers", hi_sdslen(x) == 1 && hi_sdsavail(x) == 0);
/* Run the test a few times in order to hit the first two /* Run the test a few times in order to hit the first two
* SDS header types. */ * SDS header types. */
for (i = 0; i < 10; i++) { for (i = 0; i < 10; i++) {
int oldlen = sdslen(x); int oldlen = hi_sdslen(x);
x = sdsMakeRoomFor(x,step); x = hi_sdsMakeRoomFor(x,step);
int type = x[-1]&SDS_TYPE_MASK; int type = x[-1]&HI_SDS_TYPE_MASK;
test_cond("sdsMakeRoomFor() len", sdslen(x) == oldlen); test_cond("sdsMakeRoomFor() len", hi_sdslen(x) == oldlen);
if (type != SDS_TYPE_5) { if (type != HI_SDS_TYPE_5) {
test_cond("sdsMakeRoomFor() free", sdsavail(x) >= step); test_cond("hi_sdsMakeRoomFor() free", hi_sdsavail(x) >= step);
oldfree = sdsavail(x); oldfree = hi_sdsavail(x);
} }
p = x+oldlen; p = x+oldlen;
for (j = 0; j < step; j++) { for (j = 0; j < step; j++) {
p[j] = 'A'+j; p[j] = 'A'+j;
} }
sdsIncrLen(x,step); hi_sdsIncrLen(x,step);
} }
test_cond("sdsMakeRoomFor() content", test_cond("hi_sdsMakeRoomFor() content",
memcmp("0ABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJ",x,101) == 0); memcmp("0ABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJ",x,101) == 0);
test_cond("sdsMakeRoomFor() final length",sdslen(x)==101); test_cond("sdsMakeRoomFor() final length",hi_sdslen(x)==101);
sdsfree(x); hi_sdsfree(x);
} }
} }
test_report() test_report();
return 0; return 0;
} }
#endif #endif
#ifdef SDS_TEST_MAIN #ifdef HI_SDS_TEST_MAIN
int main(void) { int main(void) {
return sdsTest(); return hi_sdsTest();
} }
#endif #endif
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __SDS_H #ifndef HIREDIS_SDS_H
#define __SDS_H #define HIREDIS_SDS_H
#define SDS_MAX_PREALLOC (1024*1024) #define HI_SDS_MAX_PREALLOC (1024*1024)
#ifdef _MSC_VER #ifdef _MSC_VER
#define __attribute__(x) #define __attribute__(x)
typedef long long ssize_t; typedef long long ssize_t;
...@@ -44,235 +44,235 @@ typedef long long ssize_t; ...@@ -44,235 +44,235 @@ typedef long long ssize_t;
#include <stdarg.h> #include <stdarg.h>
#include <stdint.h> #include <stdint.h>
typedef char *sds; typedef char *hisds;
/* Note: sdshdr5 is never used, we just access the flags byte directly. /* Note: sdshdr5 is never used, we just access the flags byte directly.
* However is here to document the layout of type 5 SDS strings. */ * 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 */ unsigned char flags; /* 3 lsb of type, and 5 msb of string length */
char buf[]; char buf[];
}; };
struct __attribute__ ((__packed__)) sdshdr8 { struct __attribute__ ((__packed__)) hisdshdr8 {
uint8_t len; /* used */ uint8_t len; /* used */
uint8_t alloc; /* excluding the header and null terminator */ uint8_t alloc; /* excluding the header and null terminator */
unsigned char flags; /* 3 lsb of type, 5 unused bits */ unsigned char flags; /* 3 lsb of type, 5 unused bits */
char buf[]; char buf[];
}; };
struct __attribute__ ((__packed__)) sdshdr16 { struct __attribute__ ((__packed__)) hisdshdr16 {
uint16_t len; /* used */ uint16_t len; /* used */
uint16_t alloc; /* excluding the header and null terminator */ uint16_t alloc; /* excluding the header and null terminator */
unsigned char flags; /* 3 lsb of type, 5 unused bits */ unsigned char flags; /* 3 lsb of type, 5 unused bits */
char buf[]; char buf[];
}; };
struct __attribute__ ((__packed__)) sdshdr32 { struct __attribute__ ((__packed__)) hisdshdr32 {
uint32_t len; /* used */ uint32_t len; /* used */
uint32_t alloc; /* excluding the header and null terminator */ uint32_t alloc; /* excluding the header and null terminator */
unsigned char flags; /* 3 lsb of type, 5 unused bits */ unsigned char flags; /* 3 lsb of type, 5 unused bits */
char buf[]; char buf[];
}; };
struct __attribute__ ((__packed__)) sdshdr64 { struct __attribute__ ((__packed__)) hisdshdr64 {
uint64_t len; /* used */ uint64_t len; /* used */
uint64_t alloc; /* excluding the header and null terminator */ uint64_t alloc; /* excluding the header and null terminator */
unsigned char flags; /* 3 lsb of type, 5 unused bits */ unsigned char flags; /* 3 lsb of type, 5 unused bits */
char buf[]; char buf[];
}; };
#define SDS_TYPE_5 0 #define HI_SDS_TYPE_5 0
#define SDS_TYPE_8 1 #define HI_SDS_TYPE_8 1
#define SDS_TYPE_16 2 #define HI_SDS_TYPE_16 2
#define SDS_TYPE_32 3 #define HI_SDS_TYPE_32 3
#define SDS_TYPE_64 4 #define HI_SDS_TYPE_64 4
#define SDS_TYPE_MASK 7 #define HI_SDS_TYPE_MASK 7
#define SDS_TYPE_BITS 3 #define HI_SDS_TYPE_BITS 3
#define SDS_HDR_VAR(T,s) struct sdshdr##T *sh = (struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T))); #define HI_SDS_HDR_VAR(T,s) struct hisdshdr##T *sh = (struct hisdshdr##T *)((s)-(sizeof(struct hisdshdr##T)));
#define SDS_HDR(T,s) ((struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T)))) #define HI_SDS_HDR(T,s) ((struct hisdshdr##T *)((s)-(sizeof(struct hisdshdr##T))))
#define SDS_TYPE_5_LEN(f) ((f)>>SDS_TYPE_BITS) #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]; unsigned char flags = s[-1];
switch(flags&SDS_TYPE_MASK) { switch(flags & HI_SDS_TYPE_MASK) {
case SDS_TYPE_5: case HI_SDS_TYPE_5:
return SDS_TYPE_5_LEN(flags); return HI_SDS_TYPE_5_LEN(flags);
case SDS_TYPE_8: case HI_SDS_TYPE_8:
return SDS_HDR(8,s)->len; return HI_SDS_HDR(8,s)->len;
case SDS_TYPE_16: case HI_SDS_TYPE_16:
return SDS_HDR(16,s)->len; return HI_SDS_HDR(16,s)->len;
case SDS_TYPE_32: case HI_SDS_TYPE_32:
return SDS_HDR(32,s)->len; return HI_SDS_HDR(32,s)->len;
case SDS_TYPE_64: case HI_SDS_TYPE_64:
return SDS_HDR(64,s)->len; return HI_SDS_HDR(64,s)->len;
} }
return 0; return 0;
} }
static inline size_t sdsavail(const sds s) { static inline size_t hi_sdsavail(const hisds s) {
unsigned char flags = s[-1]; unsigned char flags = s[-1];
switch(flags&SDS_TYPE_MASK) { switch(flags&HI_SDS_TYPE_MASK) {
case SDS_TYPE_5: { case HI_SDS_TYPE_5: {
return 0; return 0;
} }
case SDS_TYPE_8: { case HI_SDS_TYPE_8: {
SDS_HDR_VAR(8,s); HI_SDS_HDR_VAR(8,s);
return sh->alloc - sh->len; return sh->alloc - sh->len;
} }
case SDS_TYPE_16: { case HI_SDS_TYPE_16: {
SDS_HDR_VAR(16,s); HI_SDS_HDR_VAR(16,s);
return sh->alloc - sh->len; return sh->alloc - sh->len;
} }
case SDS_TYPE_32: { case HI_SDS_TYPE_32: {
SDS_HDR_VAR(32,s); HI_SDS_HDR_VAR(32,s);
return sh->alloc - sh->len; return sh->alloc - sh->len;
} }
case SDS_TYPE_64: { case HI_SDS_TYPE_64: {
SDS_HDR_VAR(64,s); HI_SDS_HDR_VAR(64,s);
return sh->alloc - sh->len; return sh->alloc - sh->len;
} }
} }
return 0; 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]; unsigned char flags = s[-1];
switch(flags&SDS_TYPE_MASK) { switch(flags&HI_SDS_TYPE_MASK) {
case SDS_TYPE_5: case HI_SDS_TYPE_5:
{ {
unsigned char *fp = ((unsigned char*)s)-1; 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; break;
case SDS_TYPE_8: case HI_SDS_TYPE_8:
SDS_HDR(8,s)->len = (uint8_t)newlen; HI_SDS_HDR(8,s)->len = (uint8_t)newlen;
break; break;
case SDS_TYPE_16: case HI_SDS_TYPE_16:
SDS_HDR(16,s)->len = (uint16_t)newlen; HI_SDS_HDR(16,s)->len = (uint16_t)newlen;
break; break;
case SDS_TYPE_32: case HI_SDS_TYPE_32:
SDS_HDR(32,s)->len = (uint32_t)newlen; HI_SDS_HDR(32,s)->len = (uint32_t)newlen;
break; break;
case SDS_TYPE_64: case HI_SDS_TYPE_64:
SDS_HDR(64,s)->len = (uint64_t)newlen; HI_SDS_HDR(64,s)->len = (uint64_t)newlen;
break; 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]; unsigned char flags = s[-1];
switch(flags&SDS_TYPE_MASK) { switch(flags&HI_SDS_TYPE_MASK) {
case SDS_TYPE_5: case HI_SDS_TYPE_5:
{ {
unsigned char *fp = ((unsigned char*)s)-1; unsigned char *fp = ((unsigned char*)s)-1;
unsigned char newlen = SDS_TYPE_5_LEN(flags)+(unsigned char)inc; unsigned char newlen = HI_SDS_TYPE_5_LEN(flags)+(unsigned char)inc;
*fp = SDS_TYPE_5 | (newlen << SDS_TYPE_BITS); *fp = HI_SDS_TYPE_5 | (newlen << HI_SDS_TYPE_BITS);
} }
break; break;
case SDS_TYPE_8: case HI_SDS_TYPE_8:
SDS_HDR(8,s)->len += (uint8_t)inc; HI_SDS_HDR(8,s)->len += (uint8_t)inc;
break; break;
case SDS_TYPE_16: case HI_SDS_TYPE_16:
SDS_HDR(16,s)->len += (uint16_t)inc; HI_SDS_HDR(16,s)->len += (uint16_t)inc;
break; break;
case SDS_TYPE_32: case HI_SDS_TYPE_32:
SDS_HDR(32,s)->len += (uint32_t)inc; HI_SDS_HDR(32,s)->len += (uint32_t)inc;
break; break;
case SDS_TYPE_64: case HI_SDS_TYPE_64:
SDS_HDR(64,s)->len += (uint64_t)inc; HI_SDS_HDR(64,s)->len += (uint64_t)inc;
break; break;
} }
} }
/* sdsalloc() = sdsavail() + sdslen() */ /* hi_sdsalloc() = hi_sdsavail() + hi_sdslen() */
static inline size_t sdsalloc(const sds s) { static inline size_t hi_sdsalloc(const hisds s) {
unsigned char flags = s[-1]; unsigned char flags = s[-1];
switch(flags&SDS_TYPE_MASK) { switch(flags & HI_SDS_TYPE_MASK) {
case SDS_TYPE_5: case HI_SDS_TYPE_5:
return SDS_TYPE_5_LEN(flags); return HI_SDS_TYPE_5_LEN(flags);
case SDS_TYPE_8: case HI_SDS_TYPE_8:
return SDS_HDR(8,s)->alloc; return HI_SDS_HDR(8,s)->alloc;
case SDS_TYPE_16: case HI_SDS_TYPE_16:
return SDS_HDR(16,s)->alloc; return HI_SDS_HDR(16,s)->alloc;
case SDS_TYPE_32: case HI_SDS_TYPE_32:
return SDS_HDR(32,s)->alloc; return HI_SDS_HDR(32,s)->alloc;
case SDS_TYPE_64: case HI_SDS_TYPE_64:
return SDS_HDR(64,s)->alloc; return HI_SDS_HDR(64,s)->alloc;
} }
return 0; 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]; unsigned char flags = s[-1];
switch(flags&SDS_TYPE_MASK) { switch(flags&HI_SDS_TYPE_MASK) {
case SDS_TYPE_5: case HI_SDS_TYPE_5:
/* Nothing to do, this type has no total allocation info. */ /* Nothing to do, this type has no total allocation info. */
break; break;
case SDS_TYPE_8: case HI_SDS_TYPE_8:
SDS_HDR(8,s)->alloc = (uint8_t)newlen; HI_SDS_HDR(8,s)->alloc = (uint8_t)newlen;
break; break;
case SDS_TYPE_16: case HI_SDS_TYPE_16:
SDS_HDR(16,s)->alloc = (uint16_t)newlen; HI_SDS_HDR(16,s)->alloc = (uint16_t)newlen;
break; break;
case SDS_TYPE_32: case HI_SDS_TYPE_32:
SDS_HDR(32,s)->alloc = (uint32_t)newlen; HI_SDS_HDR(32,s)->alloc = (uint32_t)newlen;
break; break;
case SDS_TYPE_64: case HI_SDS_TYPE_64:
SDS_HDR(64,s)->alloc = (uint64_t)newlen; HI_SDS_HDR(64,s)->alloc = (uint64_t)newlen;
break; break;
} }
} }
sds sdsnewlen(const void *init, size_t initlen); hisds hi_sdsnewlen(const void *init, size_t initlen);
sds sdsnew(const char *init); hisds hi_sdsnew(const char *init);
sds sdsempty(void); hisds hi_sdsempty(void);
sds sdsdup(const sds s); hisds hi_sdsdup(const hisds s);
void sdsfree(sds s); void hi_sdsfree(hisds s);
sds sdsgrowzero(sds s, size_t len); hisds hi_sdsgrowzero(hisds s, size_t len);
sds sdscatlen(sds s, const void *t, size_t len); hisds hi_sdscatlen(hisds s, const void *t, size_t len);
sds sdscat(sds s, const char *t); hisds hi_sdscat(hisds s, const char *t);
sds sdscatsds(sds s, const sds t); hisds hi_sdscatsds(hisds s, const hisds t);
sds sdscpylen(sds s, const char *t, size_t len); hisds hi_sdscpylen(hisds s, const char *t, size_t len);
sds sdscpy(sds s, const char *t); 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__ #ifdef __GNUC__
sds sdscatprintf(sds s, const char *fmt, ...) hisds hi_sdscatprintf(hisds s, const char *fmt, ...)
__attribute__((format(printf, 2, 3))); __attribute__((format(printf, 2, 3)));
#else #else
sds sdscatprintf(sds s, const char *fmt, ...); hisds hi_sdscatprintf(hisds s, const char *fmt, ...);
#endif #endif
sds sdscatfmt(sds s, char const *fmt, ...); hisds hi_sdscatfmt(hisds s, char const *fmt, ...);
sds sdstrim(sds s, const char *cset); hisds hi_sdstrim(hisds s, const char *cset);
int sdsrange(sds s, ssize_t start, ssize_t end); int hi_sdsrange(hisds s, ssize_t start, ssize_t end);
void sdsupdatelen(sds s); void hi_sdsupdatelen(hisds s);
void sdsclear(sds s); void hi_sdsclear(hisds s);
int sdscmp(const sds s1, const sds s2); int hi_sdscmp(const hisds s1, const hisds s2);
sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count); hisds *hi_sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count);
void sdsfreesplitres(sds *tokens, int count); void hi_sdsfreesplitres(hisds *tokens, int count);
void sdstolower(sds s); void hi_sdstolower(hisds s);
void sdstoupper(sds s); void hi_sdstoupper(hisds s);
sds sdsfromlonglong(long long value); hisds hi_sdsfromlonglong(long long value);
sds sdscatrepr(sds s, const char *p, size_t len); hisds hi_sdscatrepr(hisds s, const char *p, size_t len);
sds *sdssplitargs(const char *line, int *argc); hisds *hi_sdssplitargs(const char *line, int *argc);
sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen); hisds hi_sdsmapchars(hisds s, const char *from, const char *to, size_t setlen);
sds sdsjoin(char **argv, int argc, char *sep); hisds hi_sdsjoin(char **argv, int argc, char *sep);
sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen); hisds hi_sdsjoinsds(hisds *argv, int argc, const char *sep, size_t seplen);
/* Low level functions exposed to the user API */ /* Low level functions exposed to the user API */
sds sdsMakeRoomFor(sds s, size_t addlen); hisds hi_sdsMakeRoomFor(hisds s, size_t addlen);
void sdsIncrLen(sds s, int incr); void hi_sdsIncrLen(hisds s, int incr);
sds sdsRemoveFreeSpace(sds s); hisds hi_sdsRemoveFreeSpace(hisds s);
size_t sdsAllocSize(sds s); size_t hi_sdsAllocSize(hisds s);
void *sdsAllocPtr(sds s); void *hi_sdsAllocPtr(hisds s);
/* Export the allocator used by SDS to the program using SDS. /* Export the allocator used by SDS to the program using SDS.
* Sometimes the program SDS is linked to, may use a different set of * 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 * allocators, but may want to allocate or free things that SDS will
* respectively free or allocate. */ * respectively free or allocate. */
void *sds_malloc(size_t size); void *hi_sds_malloc(size_t size);
void *sds_realloc(void *ptr, size_t size); void *hi_sds_realloc(void *ptr, size_t size);
void sds_free(void *ptr); void hi_sds_free(void *ptr);
#ifdef REDIS_TEST #ifdef REDIS_TEST
int sdsTest(int argc, char *argv[]); int hi_sdsTest(int argc, char *argv[]);
#endif #endif
#endif #endif /* HIREDIS_SDS_H */
...@@ -39,6 +39,6 @@ ...@@ -39,6 +39,6 @@
#include "alloc.h" #include "alloc.h"
#define s_malloc hi_malloc #define hi_s_malloc hi_malloc
#define s_realloc hi_realloc #define hi_s_realloc hi_realloc
#define s_free hi_free #define hi_s_free hi_free
/*
* Copyright (c) 2020, Michael Grunder <michael dot grunder at gmail dot com>
*
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* * Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of Redis nor the names of its contributors may be used
* to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
/*
* SDS compatibility header.
*
* This simple file maps sds types and calls to their unique hiredis symbol names.
* It's useful when we build Hiredis as a dependency of Redis and want to call
* Hiredis' sds symbols rather than the ones built into Redis, as the libraries
* have slightly diverged and could cause hard to track down ABI incompatibility
* bugs.
*
*/
#ifndef HIREDIS_SDS_COMPAT
#define HIREDIS_SDS_COMPAT
#define sds hisds
#define sdslen hi_sdslen
#define sdsavail hi_sdsavail
#define sdssetlen hi_sdssetlen
#define sdsinclen hi_sdsinclen
#define sdsalloc hi_sdsalloc
#define sdssetalloc hi_sdssetalloc
#define sdsAllocPtr hi_sdsAllocPtr
#define sdsAllocSize hi_sdsAllocSize
#define sdscat hi_sdscat
#define sdscatfmt hi_sdscatfmt
#define sdscatlen hi_sdscatlen
#define sdscatprintf hi_sdscatprintf
#define sdscatrepr hi_sdscatrepr
#define sdscatsds hi_sdscatsds
#define sdscatvprintf hi_sdscatvprintf
#define sdsclear hi_sdsclear
#define sdscmp hi_sdscmp
#define sdscpy hi_sdscpy
#define sdscpylen hi_sdscpylen
#define sdsdup hi_sdsdup
#define sdsempty hi_sdsempty
#define sds_free hi_sds_free
#define sdsfree hi_sdsfree
#define sdsfreesplitres hi_sdsfreesplitres
#define sdsfromlonglong hi_sdsfromlonglong
#define sdsgrowzero hi_sdsgrowzero
#define sdsIncrLen hi_sdsIncrLen
#define sdsjoin hi_sdsjoin
#define sdsjoinsds hi_sdsjoinsds
#define sdsll2str hi_sdsll2str
#define sdsMakeRoomFor hi_sdsMakeRoomFor
#define sds_malloc hi_sds_malloc
#define sdsmapchars hi_sdsmapchars
#define sdsnew hi_sdsnew
#define sdsnewlen hi_sdsnewlen
#define sdsrange hi_sdsrange
#define sds_realloc hi_sds_realloc
#define sdsRemoveFreeSpace hi_sdsRemoveFreeSpace
#define sdssplitargs hi_sdssplitargs
#define sdssplitlen hi_sdssplitlen
#define sdstolower hi_sdstolower
#define sdstoupper hi_sdstoupper
#define sdstrim hi_sdstrim
#define sdsull2str hi_sdsull2str
#define sdsupdatelen hi_sdsupdatelen
#endif /* HIREDIS_SDS_COMPAT */
...@@ -437,7 +437,7 @@ static ssize_t redisSSLRead(redisContext *c, char *buf, size_t bufcap) { ...@@ -437,7 +437,7 @@ static ssize_t redisSSLRead(redisContext *c, char *buf, size_t bufcap) {
static ssize_t redisSSLWrite(redisContext *c) { static ssize_t redisSSLWrite(redisContext *c) {
redisSSL *rssl = c->privctx; redisSSL *rssl = c->privctx;
size_t len = rssl->lastLen ? rssl->lastLen : sdslen(c->obuf); size_t len = rssl->lastLen ? rssl->lastLen : hi_sdslen(c->obuf);
int rv = SSL_write(rssl->ssl, c->obuf, len); int rv = SSL_write(rssl->ssl, c->obuf, len);
if (rv > 0) { if (rv > 0) {
......
...@@ -340,21 +340,21 @@ static void test_format_commands(void) { ...@@ -340,21 +340,21 @@ static void test_format_commands(void) {
len == 4+4+(3+2)+4+(7+2)+4+(3+2)); len == 4+4+(3+2)+4+(7+2)+4+(3+2));
hi_free(cmd); hi_free(cmd);
sds sds_cmd; hisds sds_cmd;
sds_cmd = NULL; sds_cmd = NULL;
test("Format command into sds by passing argc/argv without lengths: "); test("Format command into hisds by passing argc/argv without lengths: ");
len = redisFormatSdsCommandArgv(&sds_cmd,argc,argv,NULL); len = redisFormatSdsCommandArgv(&sds_cmd,argc,argv,NULL);
test_cond(strncmp(sds_cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 && test_cond(strncmp(sds_cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
len == 4+4+(3+2)+4+(3+2)+4+(3+2)); len == 4+4+(3+2)+4+(3+2)+4+(3+2));
sdsfree(sds_cmd); hi_sdsfree(sds_cmd);
sds_cmd = NULL; sds_cmd = NULL;
test("Format command into sds by passing argc/argv with lengths: "); test("Format command into hisds by passing argc/argv with lengths: ");
len = redisFormatSdsCommandArgv(&sds_cmd,argc,argv,lens); len = redisFormatSdsCommandArgv(&sds_cmd,argc,argv,lens);
test_cond(strncmp(sds_cmd,"*3\r\n$3\r\nSET\r\n$7\r\nfoo\0xxx\r\n$3\r\nbar\r\n",len) == 0 && test_cond(strncmp(sds_cmd,"*3\r\n$3\r\nSET\r\n$7\r\nfoo\0xxx\r\n$3\r\nbar\r\n",len) == 0 &&
len == 4+4+(3+2)+4+(7+2)+4+(3+2)); len == 4+4+(3+2)+4+(7+2)+4+(3+2));
sdsfree(sds_cmd); hi_sdsfree(sds_cmd);
} }
static void test_append_formatted_commands(struct config config) { static void test_append_formatted_commands(struct config config) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment