From b8b296654d9ecf29ee24d97a2d8f8fa246afa629 Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Tue, 2 Nov 2010 17:09:26 +0100 Subject: Strip net.c down to the bare minimum --- hiredis.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'hiredis.c') diff --git a/hiredis.c b/hiredis.c index 0aabd25..3f08129 100644 --- a/hiredis.c +++ b/hiredis.c @@ -34,7 +34,7 @@ #include #include "hiredis.h" -#include "anet.h" +#include "net.h" #include "sds.h" #include "util.h" @@ -614,7 +614,7 @@ int redisFormatCommandArgv(char **target, int argc, const char **argv, const siz return totlen; } -static void __redisSetError(redisContext *c, int type, const char *str) { +void __redisSetError(redisContext *c, int type, const char *str) { c->err = type; if (str) { c->errstr = sdsnew(str); @@ -625,25 +625,6 @@ static void __redisSetError(redisContext *c, int type, const char *str) { } } -static int redisContextConnect(redisContext *c, const char *ip, int port) { - char err[ANET_ERR_LEN]; - if (c->flags & REDIS_BLOCK) { - c->fd = anetTcpConnect(err,(char*)ip,port); - } else { - c->fd = anetTcpNonBlockConnect(err,(char*)ip,port); - } - - if (c->fd == ANET_ERR) { - __redisSetError(c,REDIS_ERR_CONN,err); - return REDIS_ERR; - } - if (anetTcpNoDelay(err,c->fd) == ANET_ERR) { - __redisSetError(c,REDIS_ERR_CONN,err); - return REDIS_ERR; - } - return REDIS_OK; -} - static redisContext *redisContextInit() { redisContext *c = calloc(sizeof(redisContext),1); c->err = 0; -- cgit v1.2.3