The following commit has been merged in the master branch:
commit bad18329473a306d59a9c35823e85fc964bbf724
Author: Guillem Jover <[email protected]>
Date: Thu Feb 3 17:37:31 2011 +0100
libdpkg: Refactor varbuf_pkgadminfile() out from pkgadminfile()
diff --git a/lib/dpkg/dbmodify.c b/lib/dpkg/dbmodify.c
index 20d3bfb..eba1446 100644
--- a/lib/dpkg/dbmodify.c
+++ b/lib/dpkg/dbmodify.c
@@ -410,13 +410,21 @@ 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_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');
+
+ varbuf_pkgadminfile(&vb, pkg, whichfile);
+
return vb.buf;
}
diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h
index 574db5f..73a1351 100644
--- a/lib/dpkg/dpkg-db.h
+++ b/lib/dpkg/dpkg-db.h
@@ -232,6 +232,8 @@ 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 8a45b29..648a420 100644
--- a/lib/dpkg/libdpkg.Versions
+++ b/lib/dpkg/libdpkg.Versions
@@ -213,6 +213,7 @@ 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]
