log file parsing code improved a bit

diff --git a/TODO b/TODO
index 89b67c5700fb9380f32c25d4f5343b4fabeea021..9c9225161736037efc8381ad31e23afeb0a5dad0 100644 (file)
--- a/TODO
+++ b/TODO
@@ -2,7 +2,6 @@ BEFORE REDIS 1.0.0-rc1
 
 - What happens if the saving child gets killed instead to end normally? Handle this.
 - Make sinterstore / unionstore / sdiffstore returning the cardinality of the resulting set.
-- Add a new field as INFO output: bgsaveinprogress
 - Remove max number of args limit
 - GETSET
 - network layer stresser in test in demo, make sure to set/get random streams of data and check that what we read back is byte-by-byte the same.

diff --git a/redis.c b/redis.c
index 86ca36d9669e9beb3ceb8e41fdc961910d1b1da3..ae0e869e71547e5b1868b39a7ada58a3ecade08e 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -887,6 +887,12 @@ static long long emptyDb() {
     return removed;
 }
 
+static int yesnotoi(char *s) {
+    if (!strcasecmp(s,"yes")) return 1;
+    else if (!strcasecmp(s,"no")) return 0;
+    else return -1;
+}
+
 /* I agree, this is a very rudimental way to load a configuration...
    will improve later if the config gets more complex */
 static void loadServerConfig(char *filename) {
@@ -980,24 +986,15 @@ static void loadServerConfig(char *filename) {
             server.masterport = atoi(argv[2]);
             server.replstate = REDIS_REPL_CONNECT;
         } else if (!strcmp(argv[0],"glueoutputbuf") && argc == 2) {
-            sdstolower(argv[1]);
-            if (!strcmp(argv[1],"yes")) server.glueoutputbuf = 1;
-            else if (!strcmp(argv[1],"no")) server.glueoutputbuf = 0;
-            else {
+            if ((server.glueoutputbuf = yesnotoi(argv[1])) == -1) {
                 err = "argument must be 'yes' or 'no'"; goto loaderr;
             }
         } else if (!strcmp(argv[0],"shareobjects") && argc == 2) {
-            sdstolower(argv[1]);
-            if (!strcmp(argv[1],"yes")) server.shareobjects = 1;
-            else if (!strcmp(argv[1],"no")) server.shareobjects = 0;
-            else {
+            if ((server.shareobjects = yesnotoi(argv[1])) == -1) {
                 err = "argument must be 'yes' or 'no'"; goto loaderr;
             }
         } else if (!strcmp(argv[0],"daemonize") && argc == 2) {
-            sdstolower(argv[1]);
-            if (!strcmp(argv[1],"yes")) server.daemonize = 1;
-            else if (!strcmp(argv[1],"no")) server.daemonize = 0;
-            else {
+            if ((server.daemonize = yesnotoi(argv[1])) == -1) {
                 err = "argument must be 'yes' or 'no'"; goto loaderr;
             }
         } else if (!strcmp(argv[0],"requirepass") && argc == 2) {