This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=a709de31f6b6bf6f394fb7c053e73d92e34a825b commit a709de31f6b6bf6f394fb7c053e73d92e34a825b Author: Guillem Jover <guil...@debian.org> AuthorDate: Tue Nov 6 03:02:52 2018 +0100 dpkg: Factor trigproc_new_cyclenode() out from check_trigger_cycle() --- debian/changelog | 1 + src/trigproc.c | 37 +++++++++++++++++++++++++------------ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index b254ffacc..6ed5cf035 100644 --- a/debian/changelog +++ b/debian/changelog @@ -80,6 +80,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium - dpkg: Negate tortoise_not_in_hare() function name and return value. - dpkg: Initialize trigcyclenode's next member once. - dpkg: Use common pattern of assigning as an iterator. + - dpkg: Factor trigproc_new_cyclenode() out from check_trigger_cycle(). * Build system: - get-version: Use a format string with printf. - run-script: Use $() instead of deprecated ``. diff --git a/src/trigproc.c b/src/trigproc.c index 3c670f8b1..fa7af26ef 100644 --- a/src/trigproc.c +++ b/src/trigproc.c @@ -248,21 +248,13 @@ tortoise_in_hare(struct pkginfo *processing_now, return true; } -/* - * Returns package we're to give up on. - */ -static struct pkginfo * -check_trigger_cycle(struct pkginfo *processing_now) +static struct trigcyclenode * +trigproc_new_cyclenode(struct pkginfo *processing_now) { struct trigcyclenode *tcn; - struct trigcycleperpkg *tcpp, *tortoise_pkg; - struct trigpend *tortoise_trig; + struct trigcycleperpkg *tcpp; + struct pkginfo *pkg; struct pkgiterator *iter; - struct pkginfo *pkg, *giveup; - const char *sep; - - debug(dbg_triggers, "check_triggers_cycle pnow=%s", - pkg_name(processing_now, pnaw_always)); tcn = nfmalloc(sizeof(*tcn)); tcn->pkgs = NULL; @@ -280,6 +272,27 @@ check_trigger_cycle(struct pkginfo *processing_now) tcn->pkgs = tcpp; } pkg_db_iter_free(iter); + + return tcn; +} + +/* + * Returns package we are to give up on. + */ +static struct pkginfo * +check_trigger_cycle(struct pkginfo *processing_now) +{ + struct trigcyclenode *tcn; + struct trigcycleperpkg *tortoise_pkg; + struct trigpend *tortoise_trig; + struct pkginfo *giveup; + const char *sep; + + debug(dbg_triggers, "check_triggers_cycle pnow=%s", + pkg_name(processing_now, pnaw_always)); + + tcn = trigproc_new_cyclenode(processing_now); + if (!hare) { debug(dbg_triggersdetail, "check_triggers_cycle pnow=%s first", pkg_name(processing_now, pnaw_always)); -- Dpkg.Org's dpkg
