Fix (cosmetic) typos in dict.h

[redis.git] / src / cluster.c

diff --git a/src/cluster.c b/src/cluster.c
index 07552c18ae05e72671152c3719e90bba5e056af0..57243132d0da6656655d59c63b7bd0614b89f852 100644 (file)
--- a/src/cluster.c
+++ b/src/cluster.c
@@ -210,7 +210,7 @@ void clusterInit(void) {
         exit(1);
     }
     if (aeCreateFileEvent(server.el, server.cfd, AE_READABLE,
         exit(1);
     }
     if (aeCreateFileEvent(server.el, server.cfd, AE_READABLE,

-        clusterAcceptHandler, NULL) == AE_ERR) oom("creating file event");
+        clusterAcceptHandler, NULL) == AE_ERR) redisPanic("Unrecoverable error creating Redis Cluster file event.");

     server.cluster.slots_to_keys = zslCreate();
 }
 
     server.cluster.slots_to_keys = zslCreate();
 }
 


@@ -902,7 +902,7 @@ void clusterSendPublish(clusterLink *link, robj *channel, robj *message) {
     } else {
         payload = zmalloc(totlen);
         hdr = (clusterMsg*) payload;
     } else {
         payload = zmalloc(totlen);
         hdr = (clusterMsg*) payload;

-        memcpy(payload,hdr,sizeof(hdr));
+        memcpy(payload,hdr,sizeof(*hdr));

     }
     memcpy(hdr->data.publish.msg.bulk_data,channel->ptr,sdslen(channel->ptr));
     memcpy(hdr->data.publish.msg.bulk_data+sdslen(channel->ptr),
     }
     memcpy(hdr->data.publish.msg.bulk_data,channel->ptr,sdslen(channel->ptr));
     memcpy(hdr->data.publish.msg.bulk_data+sdslen(channel->ptr),