devs/cproof
1
2
Fork 1
Code Issues 42 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

Use null check convention in preferences.c

Browse Source
This commit is contained in:
James Booth
2015-05-04 22:33:19 +01:00
parent a293045d85
commit b093b99c15
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/config/preferences.c
View File

@@ -95,7 +95,7 @@ prefs_load(void)
err = NULL; err = NULL;
log_maxsize = g_key_file_get_integer(prefs, PREF_GROUP_LOGGING, "maxsize", &err); log_maxsize = g_key_file_get_integer(prefs, PREF_GROUP_LOGGING, "maxsize", &err);
if (err != NULL) { if (err) {
log_maxsize = 0; log_maxsize = 0;
g_error_free(err); g_error_free(err);
} }
@@ -180,7 +180,7 @@ prefs_get_string(preference_t pref)
char *result = g_key_file_get_string(prefs, group, key, NULL); char *result = g_key_file_get_string(prefs, group, key, NULL);
if (result == NULL) { if (result == NULL) {
if (def != NULL) { if (def) {
return strdup(def); return strdup(def);
} else { } else {
return NULL; return NULL;
@@ -193,7 +193,7 @@ prefs_get_string(preference_t pref)
void void
prefs_free_string(char *pref) prefs_free_string(char *pref)
{ {
if (pref != NULL) { if (pref) {
free(pref); free(pref);
} }
pref = NULL; pref = NULL;
@@ -419,7 +419,7 @@ prefs_get_aliases(void)
char *name = keys[i]; char *name = keys[i];
char *value = g_key_file_get_string(prefs, PREF_GROUP_ALIAS, name, NULL); char *value = g_key_file_get_string(prefs, PREF_GROUP_ALIAS, name, NULL);
if (value != NULL) { if (value) {
ProfAlias *alias = malloc(sizeof(struct prof_alias_t)); ProfAlias *alias = malloc(sizeof(struct prof_alias_t));
alias->name = strdup(name); alias->name = strdup(name);
alias->value = strdup(value); alias->value = strdup(value);