[Reproducible-commits] [dpkg] 09/54: libdpkg: Rename pkg_summary to pkgbin_summary

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit cb55c5b4f0662d83d3df4da25f2f87373fabe11d
Author: Guillem Jover <guillem at debian.org>
Date:   Sun Oct 25 01:29:05 2015 +0200

    libdpkg: Rename pkg_summary to pkgbin_summary
    
    This makes the function name consistent with the existing coding
    convention, and the other functions that require a pkgbin to operate.
---
 lib/dpkg/libdpkg.map  | 2 +-
 lib/dpkg/pkg-format.c | 2 +-
 lib/dpkg/pkg-show.c   | 2 +-
 lib/dpkg/pkg-show.h   | 4 ++--
 src/enquiry.c         | 2 +-
 src/querycmd.c        | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map
index 3b2aff7..4006dd3 100644
--- a/lib/dpkg/libdpkg.map
+++ b/lib/dpkg/libdpkg.map
@@ -253,7 +253,7 @@ LIBDPKG_PRIVATE {
 	varbuf_add_archqual;
 	pkgbin_name;
 	pkg_name;
-	pkg_summary;
+	pkgbin_summary;
 	pkg_abbrev_want;
 	pkg_abbrev_status;
 	pkg_abbrev_eflag;
diff --git a/lib/dpkg/pkg-format.c b/lib/dpkg/pkg-format.c
index fbf18be..8e6acc7 100644
--- a/lib/dpkg/pkg-format.c
+++ b/lib/dpkg/pkg-format.c
@@ -276,7 +276,7 @@ virt_summary(struct varbuf *vb,
 	const char *desc;
 	int len;
 
-	desc = pkg_summary(pkg, pkgbin, &len);
+	desc = pkgbin_summary(pkg, pkgbin, &len);
 
 	varbuf_add_buf(vb, desc, len);
 }
diff --git a/lib/dpkg/pkg-show.c b/lib/dpkg/pkg-show.c
index e73e500..18c115b 100644
--- a/lib/dpkg/pkg-show.c
+++ b/lib/dpkg/pkg-show.c
@@ -131,7 +131,7 @@ pkg_name(struct pkginfo *pkg, enum pkg_name_arch_when pnaw)
 }
 
 const char *
-pkg_summary(const struct pkginfo *pkg, const struct pkgbin *pkgbin, int *len)
+pkgbin_summary(const struct pkginfo *pkg, const struct pkgbin *pkgbin, int *len)
 {
 	const char *pdesc;
 
diff --git a/lib/dpkg/pkg-show.h b/lib/dpkg/pkg-show.h
index e6529b4..dd8f666 100644
--- a/lib/dpkg/pkg-show.h
+++ b/lib/dpkg/pkg-show.h
@@ -34,8 +34,8 @@ DPKG_BEGIN_DECLS
 
 int pkg_sorter_by_nonambig_name_arch(const void *a, const void *b);
 
-const char *pkg_summary(const struct pkginfo *pkg, const struct pkgbin *pkgbin,
-                        int *len_ret);
+const char *pkgbin_summary(const struct pkginfo *pkg,
+                           const struct pkgbin *pkgbin, int *len_ret);
 int pkg_abbrev_want(const struct pkginfo *pkg);
 int pkg_abbrev_status(const struct pkginfo *pkg);
 int pkg_abbrev_eflag(const struct pkginfo *pkg);
diff --git a/src/enquiry.c b/src/enquiry.c
index 9b1a093..416194f 100644
--- a/src/enquiry.c
+++ b/src/enquiry.c
@@ -169,7 +169,7 @@ static void describebriefly(struct pkginfo *pkg) {
   l= strlen(pkg->set->name);
   if (l>20) maxl -= (l-20);
 
-  pdesc = pkg_summary(pkg, &pkg->installed, &l);
+  pdesc = pkgbin_summary(pkg, &pkg->installed, &l);
   l = min(l, maxl);
 
   printf(" %-20s %.*s\n", pkg_name(pkg, pnaw_nonambig), l, pdesc);
diff --git a/src/querycmd.c b/src/querycmd.c
index 9edba7c..22d635c 100644
--- a/src/querycmd.c
+++ b/src/querycmd.c
@@ -125,7 +125,7 @@ list_format_init(struct list_format *fmt, struct pkg_array *array)
       vlen = str_width(versiondescribe(&array->pkgs[i]->installed.version,
                                        vdew_nonambig));
       alen = str_width(dpkg_arch_describe(array->pkgs[i]->installed.arch));
-      pkg_summary(array->pkgs[i], &array->pkgs[i]->installed, &dlen);
+      pkgbin_summary(array->pkgs[i], &array->pkgs[i]->installed, &dlen);
 
       if (plen > fmt->nw)
         fmt->nw = plen;
@@ -231,7 +231,7 @@ pkg_array_list_item(struct pkg_array *array, struct pkginfo *pkg, void *pkg_data
   list_format_init(fmt, array);
   list_format_print_header(fmt);
 
-  pdesc = pkg_summary(pkg, &pkg->installed, &l);
+  pdesc = pkgbin_summary(pkg, &pkg->installed, &l);
   l = min(l, fmt->dw);
 
   list_format_print(fmt,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git