[gentoo-commits] proj/portage-utils:master commit in: /

[Mike Frysinger]

commit:     667542314e66dda0897778b0ce75dd56d9adddc7
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 22 08:57:22 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Feb 22 08:57:22 2015 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/portage-utils.git;a=commit;h=66754231

qmerge: push down global Pkg state to funcs that use it

---
 qmerge.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/qmerge.c b/qmerge.c
index 44b2f47..f713a7f 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -95,7 +95,7 @@ struct pkg_t {
        size_t SIZE;
        char USE[BUFSIZ];
        char REPO[64];
-} Pkg;
+};
 
 struct llist_char_t {
        char *data;
@@ -1579,6 +1579,7 @@ grab_binpkg_info(const char *name)
        char *p;
        depend_atom *atom;
 
+       struct pkg_t Pkg;
        struct pkg_t *pkg = xzalloc(sizeof(struct pkg_t));
        struct pkg_t *rpkg = xzalloc(sizeof(struct pkg_t));
 
@@ -1678,6 +1679,7 @@ find_binpkg(const char *name)
        FILE *fp;
        char buf[BUFSIZ];
        char *p;
+       struct pkg_t Pkg;
        char PF[sizeof(Pkg.PF)];
        char CATEGORY[sizeof(Pkg.CATEGORY)];
 
@@ -1759,6 +1761,7 @@ parse_packages(queue *todo)
        size_t buflen;
        char *buf, *p;
        long lineno = 0;
+       struct pkg_t Pkg;
 
        fp = open_binpkg_index();