From: Salvatore Sanfilippo <antirez@gmail.com>
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=-c

Merge pull request #743 from Cofyc/fixtypo

fix typo in comments (redis.c, networking.c)
---

cc017c58398480b0b1976a58463954b4bfc084a4
diff --combined 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
@@@ -509,7 -509,6 +509,7 @@@
          return;
      }
      server.stat_numconnections++;
 +    c->flags |= flags;
  }
  
  void acceptTcpHandler(aeEventLoop *el, int fd, void *privdata, int mask) {
@@@ -525,7 -524,7 +525,7 @@@
          return;
      }
      redisLog(REDIS_VERBOSE,"Accepted %s:%d", cip, cport);
 -    acceptCommonHandler(cfd);
 +    acceptCommonHandler(cfd,0);
  }
  
  void acceptUnixHandler(aeEventLoop *el, int fd, void *privdata, int mask) {
@@@ -540,7 -539,7 +540,7 @@@
          return;
      }
      redisLog(REDIS_VERBOSE,"Accepted connection to %s", server.unixsocket);
 -    acceptCommonHandler(cfd);
 +    acceptCommonHandler(cfd,REDIS_UNIX_SOCKET);
  }
  
  
@@@ -991,9 -990,9 +991,9 @@@ void readQueryFromClient(aeEventLoop *e
      server.current_client = c;
      readlen = REDIS_IOBUF_LEN;
      /* If this is a multi bulk request, and we are processing a bulk reply
-      * that is large enough, try to maximize the probabilty that the query
-      * buffer contains excatly the SDS string representing the object, even
-      * at the risk of requring more read(2) calls. This way the function
+      * that is large enough, try to maximize the probability that the query
+      * buffer contains exactly the SDS string representing the object, even
+      * at the risk of requiring more read(2) calls. This way the function
       * processMultiBulkBuffer() can avoid copying buffers to create the
       * Redis Object representing the argument. */
      if (c->reqtype == REDIS_REQ_MULTIBULK && c->multibulklen && c->bulklen != -1
@@@ -1063,11 -1062,10 +1063,11 @@@ void getClientsMaxBuffers(unsigned lon
  /* Turn a Redis client into an sds string representing its state. */
  sds getClientInfoString(redisClient *client) {
      char ip[32], flags[16], events[3], *p;
 -    int port;
 +    int port = 0; /* initialized to zero for the unix socket case. */
      int emask;
  
 -    anetPeerToString(client->fd,ip,&port);
 +    if (!(client->flags & REDIS_UNIX_SOCKET))
 +        anetPeerToString(client->fd,ip,&port);
      p = flags;
      if (client->flags & REDIS_SLAVE) {
          if (client->flags & REDIS_MONITOR)
@@@ -1082,7 -1080,6 +1082,7 @@@
      if (client->flags & REDIS_CLOSE_AFTER_REPLY) *p++ = 'c';
      if (client->flags & REDIS_UNBLOCKED) *p++ = 'u';
      if (client->flags & REDIS_CLOSE_ASAP) *p++ = 'A';
 +    if (client->flags & REDIS_UNIX_SOCKET) *p++ = 'U';
      if (p == flags) *p++ = 'N';
      *p++ = '\0';
  
@@@ -1093,8 -1090,7 +1093,8 @@@
      *p = '\0';
      return sdscatprintf(sdsempty(),
          "addr=%s:%d fd=%d age=%ld idle=%ld flags=%s db=%d sub=%d psub=%d multi=%d qbuf=%lu qbuf-free=%lu obl=%lu oll=%lu omem=%lu events=%s cmd=%s",
 -        ip,port,client->fd,
 +        (client->flags & REDIS_UNIX_SOCKET) ? server.unixsocket : ip,
 +        port,client->fd,
          (long)(server.unixtime - client->ctime),
          (long)(server.unixtime - client->lastinteraction),
          flags,
@@@ -1231,7 -1227,7 +1231,7 @@@ unsigned long getClientOutputBufferMemo
      return c->reply_bytes + (list_item_size*listLength(c->reply));
  }
  
- /* Get the class of a client, used in order to envorce limits to different
+ /* Get the class of a client, used in order to enforce limits to different
   * classes of clients.
   *
   * The function will return one of the following: