From 5c4469d56a68bb50ebdd86b63ab40470c361120b Mon Sep 17 00:00:00 2001
From: Sascha Kruse <knopwob@googlemail.com>
Date: Wed, 5 Dec 2012 20:11:49 +0100
Subject: [PATCH] fix compiler warnings

---
 options.c | 19 ++++++++++++-------
 options.h |  4 ++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/options.c b/options.c
index 42e1203..ab90b57 100644
--- a/options.c
+++ b/options.c
@@ -103,10 +103,13 @@ char *get_value(char *section, char *key)
 char *ini_get_string(char *section, char *key, const char *def)
 {
         char *value = get_value(section, key);
-        if (value == NULL)
-                return def;
-        else
+        if (value)
                 return strdup(value);
+
+        if (def == NULL)
+                return NULL;
+        else
+                return strdup(def);
 }
 
 int ini_get_int(char *section, char *key, int def)
@@ -325,15 +328,17 @@ static char *cmdline_get_value(char *key)
         return cmdline_argv[idx + 1];
 }
 
-char *cmdline_get_string(char *key, char *def, char *description)
+char *cmdline_get_string(char *key, const char *def, char *description)
 {
         cmdline_usage_append(key, "string", description);
         char *str = cmdline_get_value(key);
 
         if (str)
-                return str;
+                return strdup(str);
+        if (def == NULL)
+                return NULL;
         else
-                return def;
+                return strdup(def);
 }
 
 int cmdline_get_int(char *key, int def, char *description)
@@ -368,7 +373,7 @@ int cmdline_get_bool(char *key, int def, char *description)
 }
 
 char *option_get_string(char *ini_section, char *ini_key, char *cmdline_key,
-                        char *def, char *description)
+                        const char *def, char *description)
 {
         char *val = NULL;
 
diff --git a/options.h b/options.h
index dd34a79..13cf490 100644
--- a/options.h
+++ b/options.h
@@ -12,14 +12,14 @@ void free_ini(void);
 
 void cmdline_load(int argc, char *argv[]);
 /* for all cmdline_get_* key can be either "-key" or "-key/-longkey" */
-char *cmdline_get_string(char *key, char *def, char *description);
+char *cmdline_get_string(char *key, const char *def, char *description);
 int cmdline_get_int(char *key, int def, char *description);
 double cmdline_get_double(char *key, double def, char *description);
 int cmdline_get_bool(char *key, int def, char *description);
 char *cmdline_create_usage(void);
 
 char *option_get_string(char *ini_section, char *ini_key, char *cmdline_key,
-                        char *def, char *description);
+                        const char *def, char *description);
 int option_get_int(char *ini_section, char *ini_key, char *cmdline_key, int def,
                    char *description);
 double option_get_double(char *ini_section, char *ini_key, char *cmdline_key,