The following commit has been merged in the master branch:
commit 18b52757ea38d896e57334ca83bf3c62e21795ed
Author: Guillem Jover <[email protected]>
Date: Sat Feb 19 05:17:52 2011 +0100
Revert "libdpkg: Refactor varbuf_pkgadminfile() out from pkgadminfile()"
This reverts commit bad18329473a306d59a9c35823e85fc964bbf724.
The varbuf_pkgadminfile() function is not being used anymore.
diff --git a/lib/dpkg/dbmodify.c b/lib/dpkg/dbmodify.c
index eba1446..20d3bfb 100644
--- a/lib/dpkg/dbmodify.c
+++ b/lib/dpkg/dbmodify.c
@@ -410,21 +410,13 @@ pkgadmindir(void)
return infodir;
}
-void
-varbuf_pkgadminfile(struct varbuf *vb, struct pkginfo *pkg, const char *file)
-{
- varbuf_reset(vb);
- varbuf_add_str(vb, infodir);
- varbuf_add_str(vb, pkg->name);
- varbuf_add_char(vb, '.');
- varbuf_add_str(vb, file);
- varbuf_add_char(vb, '\0');
-}
-
const char *pkgadminfile(struct pkginfo *pkg, const char *whichfile) {
static struct varbuf vb;
-
- varbuf_pkgadminfile(&vb, pkg, whichfile);
-
+ varbuf_reset(&vb);
+ varbuf_add_str(&vb, infodir);
+ varbuf_add_str(&vb, pkg->name);
+ varbuf_add_char(&vb, '.');
+ varbuf_add_str(&vb, whichfile);
+ varbuf_add_char(&vb, '\0');
return vb.buf;
}
diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h
index 73a1351..574db5f 100644
--- a/lib/dpkg/dpkg-db.h
+++ b/lib/dpkg/dpkg-db.h
@@ -232,8 +232,6 @@ void modstatdb_shutdown(void);
const char *pkgadmindir_init(const char *default_dir);
const char *pkgadmindir(void);
-void varbuf_pkgadminfile(struct varbuf *vb, struct pkginfo *pkg,
- const char *file);
const char *pkgadminfile(struct pkginfo *pkg, const char *whichfile);
/*** from database.c ***/
diff --git a/lib/dpkg/libdpkg.Versions b/lib/dpkg/libdpkg.Versions
index 8100b00..3446d14 100644
--- a/lib/dpkg/libdpkg.Versions
+++ b/lib/dpkg/libdpkg.Versions
@@ -218,7 +218,6 @@ LIBDPKG_PRIVATE {
varbufrecord;
writerecord;
pkgadmindir;
- varbuf_pkgadminfile;
pkgadminfile;
parsedb;
writedb;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
