Remove duplicate cu_parsedb function and use cu_closefd instead

diff --git a/ChangeLog b/ChangeLog
index 87c50284ca397518d48926b4b9b906c15648f1c6..2bf8e4ac9b06ca1d1a41d1ad8a5e0534b6f28d2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-21  Guillem Jover  <guillem@debian.org>
+
+       * lib/parse.c (cu_parsedb): Remove duplicate function.
+       (parsedb): Use cu_closefd instead of cu_parsedb.
+
 2008-03-21  Ian Jackson  <ian@davenant.greenend.org.uk>
 
        * src/archives.c (tarobject): Make 'fd' static.

diff --git a/lib/parse.c b/lib/parse.c
index 1075d740153f13da60d27baad23420ce73394164..3de8a614b5a99615b5bbd3c6609b8dd9fe022535 100644 (file)
--- a/lib/parse.c
+++ b/lib/parse.c
@@ -76,8 +76,6 @@ const struct fieldinfo fieldinfos[]= {
 #define NFIELDS (sizeof(fieldinfos)/sizeof(struct fieldinfo))
 const int nfields= NFIELDS;
 
-static void cu_parsedb(int argc, void **argv) { close(*(int *)argv); }
-
 int parsedb(const char *filename, enum parsedbflags flags,
             struct pkginfo **donep, FILE *warnto, int *warncount) {
   /* warnto, warncount and donep may be null.
@@ -105,7 +103,7 @@ int parsedb(const char *filename, enum parsedbflags flags,
   fd= open(filename, O_RDONLY);
   if (fd == -1) ohshite(_("failed to open package info file `%.255s' for reading"),filename);
 
-  push_cleanup(cu_parsedb, ~ehflag_normaltidy, NULL, 0, 1, &fd);
+  push_cleanup(cu_closefd, ~ehflag_normaltidy, NULL, 0, 1, &fd);
 
   if (fstat(fd, &stat) == -1)
     ohshite(_("can't stat package info file `%.255s'"),filename);