nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix compiler warnings

Browse Source
This commit is contained in:
Sascha Kruse 2012-12-05 20:11:49 +01:00
parent 808b37508a
commit 5c4469d56a
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
options.c
View File

@ -103,10 +103,13 @@ char *get_value(char *section, char *key)
char *ini_get_string(char *section, char *key, const char *def) char *ini_get_string(char *section, char *key, const char *def)
{ {
char *value = get_value(section, key); char *value = get_value(section, key);
if (value == NULL) if (value)
return def;
else
return strdup(value); return strdup(value);
if (def == NULL)
return NULL;
else
return strdup(def);
} }
int ini_get_int(char *section, char *key, int 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]; 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); cmdline_usage_append(key, "string", description);
char *str = cmdline_get_value(key); char *str = cmdline_get_value(key);
if (str) if (str)
return str; return strdup(str);
if (def == NULL)
return NULL;
else else
return def; return strdup(def);
} }
int cmdline_get_int(char *key, int def, char *description) 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 *option_get_string(char *ini_section, char *ini_key, char *cmdline_key,
char *def, char *description) const char *def, char *description)
{ {
char *val = NULL; char *val = NULL;

4
options.h
View File

@ -12,14 +12,14 @@ void free_ini(void);
void cmdline_load(int argc, char *argv[]); void cmdline_load(int argc, char *argv[]);
/* for all cmdline_get_* key can be either "-key" or "-key/-longkey" */ /* 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); int cmdline_get_int(char *key, int def, char *description);
double cmdline_get_double(char *key, double def, char *description); double cmdline_get_double(char *key, double def, char *description);
int cmdline_get_bool(char *key, int def, char *description); int cmdline_get_bool(char *key, int def, char *description);
char *cmdline_create_usage(void); char *cmdline_create_usage(void);
char *option_get_string(char *ini_section, char *ini_key, char *cmdline_key, 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, int option_get_int(char *ini_section, char *ini_key, char *cmdline_key, int def,
char *description); char *description);
double option_get_double(char *ini_section, char *ini_key, char *cmdline_key, double option_get_double(char *ini_section, char *ini_key, char *cmdline_key,