logindefs: use xalloc.h, code cleanup
- remove else-after-return - use else-if - use xalloc stuff Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
parent
0c960dd8b9
commit
19a353947d
|
@ -279,8 +279,8 @@ void logindefs_load_file(const char *filename)
|
||||||
logindefs_loader = NULL; /* No recursion */
|
logindefs_loader = NULL; /* No recursion */
|
||||||
|
|
||||||
#if USE_VENDORDIR
|
#if USE_VENDORDIR
|
||||||
if (asprintf (&path, _PATH_VENDORDIR"/%s", filename) == -1)
|
xasprintf(&path, _PATH_VENDORDIR"/%s", filename);
|
||||||
return;
|
|
||||||
if (!econf_readFile(&file_l, path, "= \t", "#")) {
|
if (!econf_readFile(&file_l, path, "= \t", "#")) {
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
file = file_l;
|
file = file_l;
|
||||||
|
@ -293,8 +293,8 @@ void logindefs_load_file(const char *filename)
|
||||||
free (path);
|
free (path);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (asprintf (&path, "/etc/%s", filename) == -1)
|
xasprintf(&path, "/etc/%s", filename);
|
||||||
return;
|
|
||||||
if (!econf_readFile(&file_l, path, "= \t", "#")) {
|
if (!econf_readFile(&file_l, path, "= \t", "#")) {
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
file = file_l;
|
file = file_l;
|
||||||
|
@ -303,16 +303,15 @@ void logindefs_load_file(const char *filename)
|
||||||
file = file_m;
|
file = file_m;
|
||||||
econf_free(file_l);
|
econf_free(file_l);
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
/* Try original filename, could be relative */
|
/* Try original filename, could be relative */
|
||||||
if (!econf_readFile(&file_l, filename, "= \t", "#")) {
|
} else if (!econf_readFile(&file_l, filename, "= \t", "#")) {
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
file = file_l;
|
file = file_l;
|
||||||
else if (!econf_mergeFiles(&file_m, file, file_l)) {
|
else if (!econf_mergeFiles(&file_m, file, file_l)) {
|
||||||
econf_free(file);
|
econf_free(file);
|
||||||
file = file_m;
|
file = file_m;
|
||||||
econf_free(file_l);
|
econf_free(file_l);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
free (path);
|
free (path);
|
||||||
|
@ -383,8 +382,8 @@ const char *getlogindefs_str(const char *name, const char *dflt)
|
||||||
}
|
}
|
||||||
if (value)
|
if (value)
|
||||||
return value;
|
return value;
|
||||||
else
|
|
||||||
return strdup("");
|
return xstrdup("");
|
||||||
}
|
}
|
||||||
#endif /* !HAVE_LIBECONF */
|
#endif /* !HAVE_LIBECONF */
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue