diff options
author | graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358> | 2009-12-08 20:20:03 (EST) |
---|---|---|
committer | graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358> | 2009-12-08 20:20:03 (EST) |
commit | 2fdb3fc0b67757afd6fe7a244b6e14d2a546af0e (patch) | |
tree | a5e28a26a07e429a753f29945cc8ba9c4f6c9884 /libopkg/conffile.c | |
parent | e4a49209222ea7385f64e9336425df115a3ea1a3 (diff) |
Merge commit 'grg' into HEAD
git-svn-id: http://opkg.googlecode.com/svn/trunk@471 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
Diffstat (limited to 'libopkg/conffile.c')
-rw-r--r-- | libopkg/conffile.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libopkg/conffile.c b/libopkg/conffile.c index 4bedf73..984a191 100644 --- a/libopkg/conffile.c +++ b/libopkg/conffile.c @@ -35,7 +35,7 @@ void conffile_deinit(conffile_t *conffile) nv_pair_deinit(conffile); } -int conffile_has_been_modified(opkg_conf_t *conf, conffile_t *conffile) +int conffile_has_been_modified(conffile_t *conffile) { char *md5sum; char *filename = conffile->name; @@ -43,17 +43,17 @@ int conffile_has_been_modified(opkg_conf_t *conf, conffile_t *conffile) int ret = 1; if (conffile->value == NULL) { - opkg_message(conf, OPKG_NOTICE, "%s: conffile %s has no md5sum\n", __FUNCTION__, conffile->name); + opkg_msg(NOTICE, "Conffile %s has no md5sum.\n", conffile->name); return 1; } - root_filename = root_filename_alloc(conf, filename); + root_filename = root_filename_alloc(filename); md5sum = file_md5sum_alloc(root_filename); if (md5sum && (ret = strcmp(md5sum, conffile->value))) { - opkg_message(conf, OPKG_INFO, "%s: conffile %s: \t\nold md5=%s \t\nnew md5=%s\n", __FUNCTION__, - conffile->name, md5sum, conffile->value); + opkg_msg(INFO, "Conffile %s:\n\told md5=%s\n\tnew md5=%s\n", + conffile->name, md5sum, conffile->value); } free(root_filename); |