From: Salvatore Sanfilippo Date: Thu, 1 Nov 2012 21:26:01 +0000 (-0700) Subject: Merge pull request #743 from Cofyc/fixtypo X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/cc017c58398480b0b1976a58463954b4bfc084a4?ds=inline;hp=--cc Merge pull request #743 from Cofyc/fixtypo fix typo in comments (redis.c, networking.c) --- cc017c58398480b0b1976a58463954b4bfc084a4 diff --cc src/networking.c index 84413463,9a7b6a72..22392f06 --- a/src/networking.c +++ b/src/networking.c @@@ -486,11 -486,11 +486,11 @@@ void copyClientOutputBuffer(redisClien dst->reply_bytes = src->reply_bytes; } -static void acceptCommonHandler(int fd) { +static void acceptCommonHandler(int fd, int flags) { redisClient *c; if ((c = createClient(fd)) == NULL) { - redisLog(REDIS_WARNING,"Error allocating resoures for the client"); - close(fd); /* May be already closed, just ingore errors */ + redisLog(REDIS_WARNING,"Error allocating resources for the client"); + close(fd); /* May be already closed, just ignore errors */ return; } /* If maxclient directive is set and this is one client more... close the