Revert "libdpkg: Refactor varbuf_pkgadminfile() out from pkgadminfile()"

This reverts commit bad18329473a306d59a9c35823e85fc964bbf724.

The varbuf_pkgadminfile() function is not being used anymore.

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;
 }

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 ***/

lib/dpkg/libdpkg.Versions

@@ -218,7 +218,6 @@ LIBDPKG_PRIVATE {
 	varbufrecord;
 	writerecord;
 	pkgadmindir;
-	varbuf_pkgadminfile;
 	pkgadminfile;
 	parsedb;
 	writedb;