From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AA6FB138A87 for ; Tue, 24 Feb 2015 01:26:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A2A0E083B; Tue, 24 Feb 2015 01:26:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B195DE083B for ; Tue, 24 Feb 2015 01:26:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E0D1340956 for ; Tue, 24 Feb 2015 01:26:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A911126B0 for ; Tue, 24 Feb 2015 01:26:04 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1424595442.667542314e66dda0897778b0ce75dd56d9adddc7.vapier@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qmerge.c X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 667542314e66dda0897778b0ce75dd56d9adddc7 X-VCS-Branch: master Date: Tue, 24 Feb 2015 01:26:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8908c979-fe17-4e9f-9aaa-4d9e37910828 X-Archives-Hash: 1a72c3260941445fc5d0346a7ea8ad04 commit: 667542314e66dda0897778b0ce75dd56d9adddc7 Author: Mike Frysinger gentoo org> AuthorDate: Sun Feb 22 08:57:22 2015 +0000 Commit: Mike Frysinger gentoo 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();