From 12d090d2d0a9ff8d2c082b97cf405a30c7126752 Mon Sep 17 00:00:00 2001 From: antirez Date: Fri, 19 Feb 2010 11:23:57 +0100 Subject: [PATCH] A problem with replication with multiple slaves connectiong to a single master fixed. It was due to a typo, and reported on github by the user micmac. Also the copyright year fixed from many files. --- adlist.c | 2 +- adlist.h | 2 +- ae.c | 2 +- ae.h | 2 +- ae_epoll.c | 2 +- ae_select.c | 2 +- anet.c | 2 +- anet.h | 2 +- dict.c | 2 +- dict.h | 2 +- pqsort.c | 2 +- pqsort.h | 2 +- redis-benchmark.c | 2 +- redis-cli.c | 2 +- redis.c | 4 ++-- redis.h | 2 +- sds.c | 2 +- sds.h | 2 +- zmalloc.c | 2 +- zmalloc.h | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/adlist.c b/adlist.c index 15b2617c..fd2d6fd1 100644 --- a/adlist.c +++ b/adlist.c @@ -1,6 +1,6 @@ /* adlist.c - A generic doubly linked list implementation * - * Copyright (c) 2006-2009, Salvatore Sanfilippo + * Copyright (c) 2006-2010, Salvatore Sanfilippo * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/adlist.h b/adlist.h index 9b5d5593..41ca13f1 100644 --- a/adlist.h +++ b/adlist.h @@ -1,6 +1,6 @@ /* adlist.h - A generic doubly linked list implementation * - * Copyright (c) 2006-2009, Salvatore Sanfilippo + * Copyright (c) 2006-2010, Salvatore Sanfilippo * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/ae.c b/ae.c index 8373a011..c7918ee1 100644 --- a/ae.c +++ b/ae.c @@ -2,7 +2,7 @@ * for the Jim's event-loop (Jim is a Tcl interpreter) but later translated * it in form of a library for easy reuse. * - * Copyright (c) 2006-2009, Salvatore Sanfilippo + * Copyright (c) 2006-2010, Salvatore Sanfilippo * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/ae.h b/ae.h index d9b2cc25..a9db18ed 100644 --- a/ae.h +++ b/ae.h @@ -2,7 +2,7 @@ * for the Jim's event-loop (Jim is a Tcl interpreter) but later translated * it in form of a library for easy reuse. * - * Copyright (c) 2006-2009, Salvatore Sanfilippo + * Copyright (c) 2006-2010, Salvatore Sanfilippo * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/ae_epoll.c b/ae_epoll.c index a8cd3adc..d48977b6 100644 --- a/ae_epoll.c +++ b/ae_epoll.c @@ -1,5 +1,5 @@ /* Linux epoll(2) based ae.c module - * Copyright (C) 2009 Salvatore Sanfilippo - antirez@gmail.com + * Copyright (C) 2009-2010 Salvatore Sanfilippo - antirez@gmail.com * Released under the BSD license. See the COPYING file for more info. */ #include diff --git a/ae_select.c b/ae_select.c index 6dc82515..43f5867f 100644 --- a/ae_select.c +++ b/ae_select.c @@ -1,5 +1,5 @@ /* Select()-based ae.c module - * Copyright (C) 2009 Salvatore Sanfilippo - antirez@gmail.com + * Copyright (C) 2009-2010 Salvatore Sanfilippo - antirez@gmail.com * Released under the BSD license. See the COPYING file for more info. */ #include diff --git a/anet.c b/anet.c index 058fdd61..4fe811a1 100644 --- a/anet.c +++ b/anet.c @@ -1,6 +1,6 @@ /* anet.c -- Basic TCP socket stuff made a bit less boring * - * Copyright (c) 2006-2009, Salvatore Sanfilippo + * Copyright (c) 2006-2010, Salvatore Sanfilippo * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/anet.h b/anet.h index b1e9a567..ce0f4778 100644 --- a/anet.h +++ b/anet.h @@ -1,6 +1,6 @@ /* anet.c -- Basic TCP socket stuff made a bit less boring * - * Copyright (c) 2006-2009, Salvatore Sanfilippo + * Copyright (c) 2006-2010, Salvatore Sanfilippo * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/dict.c b/dict.c index 6e410b75..725c9a51 100644 --- a/dict.c +++ b/dict.c @@ -5,7 +5,7 @@ * tables of power of two in size are used, collisions are handled by * chaining. See the source code for more information... :) * - * Copyright (c) 2006-2009, Salvatore Sanfilippo + * Copyright (c) 2006-2010, Salvatore Sanfilippo * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/dict.h b/dict.h index bd935d5f..6f9eaa57 100644 --- a/dict.h +++ b/dict.h @@ -5,7 +5,7 @@ * tables of power of two in size are used, collisions are handled by * chaining. See the source code for more information... :) * - * Copyright (c) 2006-2009, Salvatore Sanfilippo + * Copyright (c) 2006-2010, Salvatore Sanfilippo * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/pqsort.c b/pqsort.c index da60fd1f..25775637 100644 --- a/pqsort.c +++ b/pqsort.c @@ -1,7 +1,7 @@ /* The following is the NetBSD libc qsort implementation modified in order to * support partial sorting of ranges for Redis. * - * Copyright(C) 2009 Salvatore Sanfilippo. All rights reserved. + * Copyright(C) 2009-2010 Salvatore Sanfilippo. All rights reserved. * * The original copyright notice follows. */ diff --git a/pqsort.h b/pqsort.h index af14e31a..5054d520 100644 --- a/pqsort.h +++ b/pqsort.h @@ -1,7 +1,7 @@ /* The following is the NetBSD libc qsort implementation modified in order to * support partial sorting of ranges for Redis. * - * Copyright(C) 2009 Salvatore Sanfilippo. All rights reserved. + * Copyright(C) 2009-2010 Salvatore Sanfilippo. All rights reserved. * * See the pqsort.c file for the original copyright notice. */ diff --git a/redis-benchmark.c b/redis-benchmark.c index 5bde1c35..06057b0d 100644 --- a/redis-benchmark.c +++ b/redis-benchmark.c @@ -1,6 +1,6 @@ /* Redis benchmark utility. * - * Copyright (c) 2006-2009, Salvatore Sanfilippo + * Copyright (c) 2009-2010, Salvatore Sanfilippo * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/redis-cli.c b/redis-cli.c index 524b74ab..58c17613 100644 --- a/redis-cli.c +++ b/redis-cli.c @@ -1,6 +1,6 @@ /* Redis CLI (command line interface) * - * Copyright (c) 2006-2009, Salvatore Sanfilippo + * Copyright (c) 2009-2010, Salvatore Sanfilippo * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/redis.c b/redis.c index a961c247..972ebf06 100644 --- a/redis.c +++ b/redis.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2009, Salvatore Sanfilippo + * Copyright (c) 2009-2010, Salvatore Sanfilippo * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -2346,7 +2346,7 @@ static int selectDb(redisClient *c, int id) { static void *dupClientReplyValue(void *o) { incrRefCount((robj*)o); - return 0; + return o; } static redisClient *createClient(int fd) { diff --git a/redis.h b/redis.h index f2524c1c..18816844 100644 --- a/redis.h +++ b/redis.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2009, Salvatore Sanfilippo + * Copyright (c) 2009-2010, Salvatore Sanfilippo * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sds.c b/sds.c index 247b7c30..8d1edcb7 100644 --- a/sds.c +++ b/sds.c @@ -1,6 +1,6 @@ /* SDSLib, A C dynamic strings library * - * Copyright (c) 2006-2009, Salvatore Sanfilippo + * Copyright (c) 2006-2010, Salvatore Sanfilippo * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sds.h b/sds.h index d3a7a3a9..c8b42f77 100644 --- a/sds.h +++ b/sds.h @@ -1,6 +1,6 @@ /* SDSLib, A C dynamic strings library * - * Copyright (c) 2006-2009, Salvatore Sanfilippo + * Copyright (c) 2006-2010, Salvatore Sanfilippo * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/zmalloc.c b/zmalloc.c index 8bf73b26..b1e96fc3 100644 --- a/zmalloc.c +++ b/zmalloc.c @@ -1,6 +1,6 @@ /* zmalloc - total amount of allocated memory aware version of malloc() * - * Copyright (c) 2006-2009, Salvatore Sanfilippo + * Copyright (c) 2009-2010, Salvatore Sanfilippo * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/zmalloc.h b/zmalloc.h index fbe79030..193e7eda 100644 --- a/zmalloc.h +++ b/zmalloc.h @@ -1,6 +1,6 @@ /* zmalloc - total amount of allocated memory aware version of malloc() * - * Copyright (c) 2006-2009, Salvatore Sanfilippo + * Copyright (c) 2009-2010, Salvatore Sanfilippo * All rights reserved. * * Redistribution and use in source and binary forms, with or without -- 2.45.2