[Reproducible-commits] [dpkg] 72/105: dselect: Rename info variable into depinfo

Niko Tyni ntyni at moszumanska.debian.org
Mon May 2 13:49:54 UTC 2016


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

ntyni pushed a commit to branch ntyni/reproducible_builds
in repository dpkg.

commit 0ebb97e4f208d5dec759cfb12b7c0caea6d99894
Author: Guillem Jover <guillem at debian.org>
Date:   Mon Apr 25 00:13:34 2016 +0200

    dselect: Rename info variable into depinfo
---
 dselect/pkgsublist.cc | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/dselect/pkgsublist.cc b/dselect/pkgsublist.cc
index 283864b..30b202f 100644
--- a/dselect/pkgsublist.cc
+++ b/dselect/pkgsublist.cc
@@ -119,45 +119,45 @@ packagelist::add(dependency *depends, showpriority displayimportance)
     return false;
 
   const char *comma= "";
-  varbuf info;
-  info(depends->up->set->name);
-  info(' ');
-  info(gettext(relatestrings[depends->type]));
-  info(' ');
+  varbuf depinfo;
+  depinfo(depends->up->set->name);
+  depinfo(' ');
+  depinfo(gettext(relatestrings[depends->type]));
+  depinfo(' ');
   deppossi *possi;
   for (possi=depends->list;
        possi;
        possi=possi->next, comma=(possi && possi->next ? ", " : _(" or "))) {
-    info(comma);
-    info(possi->ed->name);
+    depinfo(comma);
+    depinfo(possi->ed->name);
     if (possi->verrel != DPKG_RELATION_NONE) {
       switch (possi->verrel) {
       case DPKG_RELATION_LE:
-        info(" (<= ");
+        depinfo(" (<= ");
         break;
       case DPKG_RELATION_GE:
-        info(" (>= ");
+        depinfo(" (>= ");
         break;
       case DPKG_RELATION_LT:
-        info(" (<< ");
+        depinfo(" (<< ");
         break;
       case DPKG_RELATION_GT:
-        info(" (>> ");
+        depinfo(" (>> ");
         break;
       case DPKG_RELATION_EQ:
-        info(" (= ");
+        depinfo(" (= ");
         break;
       default:
         internerr("unknown dpkg_relation %d", possi->verrel);
       }
-      info(versiondescribe(&possi->version, vdew_nonambig));
-      info(")");
+      depinfo(versiondescribe(&possi->version, vdew_nonambig));
+      depinfo(")");
     }
   }
-  info('\n');
-  add(depends->up,info.string(),displayimportance);
+  depinfo('\n');
+  add(depends->up, depinfo.string(), displayimportance);
   for (possi=depends->list; possi; possi=possi->next) {
-    add(&possi->ed->pkg, info.string(), displayimportance);
+    add(&possi->ed->pkg, depinfo.string(), displayimportance);
     if (depends->type != dep_provides) {
       /* Providers are not relevant if we are looking at a provider
        * relationship already. */
@@ -166,7 +166,7 @@ packagelist::add(dependency *depends, showpriority displayimportance)
            provider;
            provider = provider->rev_next) {
         if (provider->up->type != dep_provides) continue;
-        add(provider->up->up,info.string(),displayimportance);
+        add(provider->up->up, depinfo.string(), displayimportance);
         add(provider->up,displayimportance);
       }
     }

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



More information about the Reproducible-commits mailing list