summaryrefslogtreecommitdiffstats
path: root/libopkg/conffile.c
diff options
context:
space:
mode:
authorgraham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>2009-11-03 22:14:39 (EST)
committer graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>2009-11-03 22:14:39 (EST)
commitedf1b1964b565726a0b0f730b109e4491c7929b9 (patch)
tree1b44b552451f0dd57c7da2b547e79c9df6943348 /libopkg/conffile.c
parent923f73d334e7969a814d09cbba3a2a416ac7b0dc (diff)
Remove some strdup abuse.
git-svn-id: http://opkg.googlecode.com/svn/trunk@254 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
Diffstat (limited to 'libopkg/conffile.c')
-rw-r--r--libopkg/conffile.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libopkg/conffile.c b/libopkg/conffile.c
index b93488e..d74ee60 100644
--- a/libopkg/conffile.c
+++ b/libopkg/conffile.c
@@ -40,7 +40,7 @@ int conffile_has_been_modified(opkg_conf_t *conf, conffile_t *conffile)
char *md5sum;
char *filename = conffile->name;
char *root_filename;
- int ret;
+ int ret = 1;
if (conffile->value == NULL) {
opkg_message(conf, OPKG_NOTICE, "%s: conffile %s has no md5sum\n", __FUNCTION__, conffile->name);
@@ -51,14 +51,14 @@ int conffile_has_been_modified(opkg_conf_t *conf, conffile_t *conffile)
md5sum = file_md5sum_alloc(root_filename);
- ret = strcmp(md5sum, conffile->value);
- if (ret) {
+ if (md5sum && (ret = strcmp(md5sum, conffile->value))) {
opkg_message(conf, OPKG_NOTICE, "%s: conffile %s: \t\nold md5=%s \t\nnew md5=%s\n", __FUNCTION__,
conffile->name, md5sum, conffile->value);
}
free(root_filename);
- free(md5sum);
+ if (md5sum)
+ free(md5sum);
return ret;
}