summaryrefslogtreecommitdiff
path: root/deps/hiredis/hiredis.c
diff options
context:
space:
mode:
Diffstat (limited to 'deps/hiredis/hiredis.c')
-rw-r--r--deps/hiredis/hiredis.c92
1 files changed, 46 insertions, 46 deletions
diff --git a/deps/hiredis/hiredis.c b/deps/hiredis/hiredis.c
index a7fbf486f..38e7e950a 100644
--- a/deps/hiredis/hiredis.c
+++ b/deps/hiredis/hiredis.c
@@ -305,7 +305,7 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
const char *c = format;
char *cmd = NULL; /* 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? */
char **curargv = NULL, **newargv = NULL;
int argc = 0;
@@ -318,7 +318,7 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
return -1;
/* Build the command string accordingly to protocol */
- curarg = sdsempty();
+ curarg = hi_sdsempty();
if (curarg == NULL)
return -1;
@@ -330,15 +330,15 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
if (newargv == NULL) goto memory_err;
curargv = newargv;
curargv[argc++] = curarg;
- totlen += bulklen(sdslen(curarg));
+ totlen += bulklen(hi_sdslen(curarg));
/* curarg is put in argv so it can be overwritten. */
- curarg = sdsempty();
+ curarg = hi_sdsempty();
if (curarg == NULL) goto memory_err;
touched = 0;
}
} else {
- newarg = sdscatlen(curarg,c,1);
+ newarg = hi_sdscatlen(curarg,c,1);
if (newarg == NULL) goto memory_err;
curarg = newarg;
touched = 1;
@@ -355,16 +355,16 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
arg = va_arg(ap,char*);
size = strlen(arg);
if (size > 0)
- newarg = sdscatlen(curarg,arg,size);
+ newarg = hi_sdscatlen(curarg,arg,size);
break;
case 'b':
arg = va_arg(ap,char*);
size = va_arg(ap,size_t);
if (size > 0)
- newarg = sdscatlen(curarg,arg,size);
+ newarg = hi_sdscatlen(curarg,arg,size);
break;
case '%':
- newarg = sdscat(curarg,"%");
+ newarg = hi_sdscat(curarg,"%");
break;
default:
/* Try to detect printf format */
@@ -452,7 +452,7 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
if (_l < sizeof(_format)-2) {
memcpy(_format,c,_l);
_format[_l] = '\0';
- newarg = sdscatvprintf(curarg,_format,_cpy);
+ newarg = hi_sdscatvprintf(curarg,_format,_cpy);
/* Update current position (note: outer blocks
* increment c twice so compensate here) */
@@ -479,9 +479,9 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
if (newargv == NULL) goto memory_err;
curargv = newargv;
curargv[argc++] = curarg;
- totlen += bulklen(sdslen(curarg));
+ totlen += bulklen(hi_sdslen(curarg));
} else {
- sdsfree(curarg);
+ hi_sdsfree(curarg);
}
/* 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) {
pos = sprintf(cmd,"*%d\r\n",argc);
for (j = 0; j < argc; j++) {
- pos += sprintf(cmd+pos,"$%zu\r\n",sdslen(curargv[j]));
- memcpy(cmd+pos,curargv[j],sdslen(curargv[j]));
- pos += sdslen(curargv[j]);
- sdsfree(curargv[j]);
+ pos += sprintf(cmd+pos,"$%zu\r\n",hi_sdslen(curargv[j]));
+ memcpy(cmd+pos,curargv[j],hi_sdslen(curargv[j]));
+ pos += hi_sdslen(curargv[j]);
+ hi_sdsfree(curargv[j]);
cmd[pos++] = '\r';
cmd[pos++] = '\n';
}
@@ -521,11 +521,11 @@ memory_err:
cleanup:
if (curargv) {
while(argc--)
- sdsfree(curargv[argc]);
+ hi_sdsfree(curargv[argc]);
hi_free(curargv);
}
- sdsfree(curarg);
+ hi_sdsfree(curarg);
hi_free(cmd);
return error_type;
@@ -558,16 +558,16 @@ int redisFormatCommand(char **target, const char *format, ...) {
return len;
}
-/* Format a command according to the Redis protocol using an sds string and
- * sdscatfmt for the processing of arguments. This function takes the
+/* Format a command according to the Redis protocol using an hisds string and
+ * hi_sdscatfmt for the processing of arguments. This function takes the
* 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
* argument lengths.
*/
-int redisFormatSdsCommandArgv(sds *target, int argc, const char **argv,
+int redisFormatSdsCommandArgv(hisds *target, int argc, const char **argv,
const size_t *argvlen)
{
- sds cmd, aux;
+ hisds cmd, aux;
unsigned long long totlen;
int j;
size_t len;
@@ -584,36 +584,36 @@ int redisFormatSdsCommandArgv(sds *target, int argc, const char **argv,
}
/* Use an SDS string for command construction */
- cmd = sdsempty();
+ cmd = hi_sdsempty();
if (cmd == NULL)
return -1;
/* We already know how much storage we need */
- aux = sdsMakeRoomFor(cmd, totlen);
+ aux = hi_sdsMakeRoomFor(cmd, totlen);
if (aux == NULL) {
- sdsfree(cmd);
+ hi_sdsfree(cmd);
return -1;
}
cmd = aux;
/* Construct command */
- cmd = sdscatfmt(cmd, "*%i\r\n", argc);
+ cmd = hi_sdscatfmt(cmd, "*%i\r\n", argc);
for (j=0; j < argc; j++) {
len = argvlen ? argvlen[j] : strlen(argv[j]);
- cmd = sdscatfmt(cmd, "$%u\r\n", len);
- cmd = sdscatlen(cmd, argv[j], len);
- cmd = sdscatlen(cmd, "\r\n", sizeof("\r\n")-1);
+ cmd = hi_sdscatfmt(cmd, "$%u\r\n", len);
+ cmd = hi_sdscatlen(cmd, argv[j], len);
+ cmd = hi_sdscatlen(cmd, "\r\n", sizeof("\r\n")-1);
}
- assert(sdslen(cmd)==totlen);
+ assert(hi_sdslen(cmd)==totlen);
*target = cmd;
return totlen;
}
-void redisFreeSdsCommand(sds cmd) {
- sdsfree(cmd);
+void redisFreeSdsCommand(hisds cmd) {
+ hi_sdsfree(cmd);
}
/* Format a command according to the Redis protocol. This function takes the
@@ -697,7 +697,7 @@ static redisContext *redisContextInit(void) {
c->funcs = &redisContextDefaultFuncs;
- c->obuf = sdsempty();
+ c->obuf = hi_sdsempty();
c->reader = redisReaderCreate();
c->fd = REDIS_INVALID_FD;
@@ -714,7 +714,7 @@ void redisFree(redisContext *c) {
return;
redisNetClose(c);
- sdsfree(c->obuf);
+ hi_sdsfree(c->obuf);
redisReaderFree(c->reader);
hi_free(c->tcp.host);
hi_free(c->tcp.source_addr);
@@ -751,10 +751,10 @@ int redisReconnect(redisContext *c) {
redisNetClose(c);
- sdsfree(c->obuf);
+ hi_sdsfree(c->obuf);
redisReaderFree(c->reader);
- c->obuf = sdsempty();
+ c->obuf = hi_sdsempty();
c->reader = redisReaderCreate();
if (c->obuf == NULL || c->reader == NULL) {
@@ -965,22 +965,22 @@ int redisBufferWrite(redisContext *c, int *done) {
if (c->err)
return REDIS_ERR;
- if (sdslen(c->obuf) > 0) {
+ if (hi_sdslen(c->obuf) > 0) {
ssize_t nwritten = c->funcs->write(c);
if (nwritten < 0) {
return REDIS_ERR;
} else if (nwritten > 0) {
- if (nwritten == (ssize_t)sdslen(c->obuf)) {
- sdsfree(c->obuf);
- c->obuf = sdsempty();
+ if (nwritten == (ssize_t)hi_sdslen(c->obuf)) {
+ hi_sdsfree(c->obuf);
+ c->obuf = hi_sdsempty();
if (c->obuf == NULL)
goto oom;
} 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;
oom:
@@ -1058,9 +1058,9 @@ int redisGetReply(redisContext *c, void **reply) {
* the reply (or replies in pub/sub).
*/
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) {
__redisSetError(c,REDIS_ERR_OOM,"Out of memory");
return REDIS_ERR;
@@ -1112,7 +1112,7 @@ int redisAppendCommand(redisContext *c, const char *format, ...) {
}
int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen) {
- sds cmd;
+ hisds cmd;
int len;
len = redisFormatSdsCommandArgv(&cmd,argc,argv,argvlen);
@@ -1122,11 +1122,11 @@ int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const s
}
if (__redisAppendCommand(c,cmd,len) != REDIS_OK) {
- sdsfree(cmd);
+ hi_sdsfree(cmd);
return REDIS_ERR;
}
- sdsfree(cmd);
+ hi_sdsfree(cmd);
return REDIS_OK;
}
View Lorry Controller Status