[SCM] dpkg's main repository branch, master, updated. 1.16.1.2-329-gaee5795

[Guillem Jover]

The following commit has been merged in the master branch:
commit 611bd3dddcdbf0ca4b9ea3edf90b9f0d0d963412
Author: Raphaël Hertzog <hert...@debian.org>
Date:   Sat Feb 19 09:52:17 2011 +0100

    dpkg: Make md5hash() a public function
    
    Sponsored-by: Linaro Limited
    
    Signed-off-by: Guillem Jover <guil...@debian.org>

diff --git a/src/configure.c b/src/configure.c
index 8e72929..5d187c9 100644
--- a/src/configure.c
+++ b/src/configure.c
@@ -61,7 +61,6 @@ static int conffoptcells[2][2] = {
        { cfo_keep,             cfo_prompt_keep },      /* User edited. */
 };
 
-static void md5hash(struct pkginfo *pkg, char *hashbuf, const char *fn);
 static void showdiff(const char *old, const char *new);
 static enum conffopt promptconfaction(struct pkginfo *pkg, const char *cfgfile,
                                       const char *realold, const char *realnew,
@@ -487,7 +486,7 @@ conffderef(struct pkginfo *pkg, struct varbuf *result, 
const char *in)
  * @param[out] hashbuf The buffer to store the generated hash.
  * @param[in] fn The filename.
  */
-static void
+void
 md5hash(struct pkginfo *pkg, char *hashbuf, const char *fn)
 {
        static int fd;
@@ -502,7 +501,7 @@ md5hash(struct pkginfo *pkg, char *hashbuf, const char *fn)
        } else if (errno == ENOENT) {
                strcpy(hashbuf, NONEXISTENTFLAG);
        } else {
-               warning(_("%s: unable to open conffile %s for hash: %s"),
+               warning(_("%s: unable to open %s for hash: %s"),
                        pkg_name(pkg, pnaw_nonambig), fn, strerror(errno));
                strcpy(hashbuf, EMPTYHASHFLAG);
        }
diff --git a/src/main.h b/src/main.h
index 70ab488..afaea45 100644
--- a/src/main.h
+++ b/src/main.h
@@ -183,6 +183,7 @@ int clearselections(const char *const *argv);
 
 /* from packages.c, remove.c and configure.c */
 
+void md5hash(struct pkginfo *pkg, char *hashbuf, const char *fn);
 void add_to_queue(struct pkginfo *pkg);
 void process_queue(void);
 int packages(const char *const *argv);

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org