The following commit has been merged in the master branch:
commit af4a5dd8bb2e88c0d97646b697f60f9e9d265fdf
Author: Guillem Jover <[email protected]>
Date: Mon Sep 5 16:08:51 2011 +0200
libdpkg: Move trigger note support to a new trignote module
This detangles the trigger note support from triglib and avoids code
using parsedb() to end up pulling the triglib and dbmodify modules.
This reduces the dpkg-deb binary size.
diff --git a/debian/changelog b/debian/changelog
index f7afd68..bf1648b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -213,6 +213,8 @@ dpkg (1.16.1) UNRELEASED; urgency=low
Closes: #639997
* Reduce dpkg-trigger binary size by refactoring libdpkg modules so that
it does not end up pulling triglib.
+ * Reduce dpkg-deb binary size by refectoring libdpkg modules so that it
+ does not end up pulling triglib.
[ Updated dpkg translations ]
* German (Sven Joachim). Closes: #620312
diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am
index bfd02c1..98d084d 100644
--- a/lib/dpkg/Makefile.am
+++ b/lib/dpkg/Makefile.am
@@ -63,6 +63,7 @@ libdpkg_a_SOURCES = \
tarfn.c \
test.h \
trigname.c \
+ trignote.c \
triglib.c \
trigdeferred.l \
utils.c \
diff --git a/lib/dpkg/triglib.c b/lib/dpkg/triglib.c
index dffc708..324ba57 100644
--- a/lib/dpkg/triglib.c
+++ b/lib/dpkg/triglib.c
@@ -34,7 +34,6 @@
#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
-#include <dpkg/pkg-list.h>
#include <dpkg/dlist.h>
#include <dpkg/dir.h>
#include <dpkg/trigdeferred.h>
@@ -100,73 +99,6 @@ trig_record_activation(struct pkginfo *pend, struct pkginfo
*aw, const char *tri
}
}
-/*
- * Note: This is also called from fields.c where *pend is a temporary!
- *
- * trig is not copied!
- */
-bool
-trig_note_pend_core(struct pkginfo *pend, const char *trig)
-{
- struct trigpend *tp;
-
- for (tp = pend->trigpend_head; tp; tp = tp->next)
- if (!strcmp(tp->name, trig))
- return false;
-
- tp = nfmalloc(sizeof(*tp));
- tp->name = trig;
- tp->next = pend->trigpend_head;
- pend->trigpend_head = tp;
-
- return true;
-}
-
-/*
- * trig is not copied!
- *
- * @retval true For done.
- * @retval false For already noted.
- */
-bool
-trig_note_pend(struct pkginfo *pend, const char *trig)
-{
- if (!trig_note_pend_core(pend, trig))
- return false;
-
- pend->status = pend->trigaw.head ? stat_triggersawaited :
- stat_triggerspending;
-
- return true;
-}
-
-/*
- * Note: This is called also from fields.c where *aw is a temporary
- * but pend is from pkg_db_find()!
- *
- * @retval true For done.
- * @retval false For already noted.
- */
-bool
-trig_note_aw(struct pkginfo *pend, struct pkginfo *aw)
-{
- struct trigaw *ta;
-
- /* We search through aw's list because that's probably shorter. */
- for (ta = aw->trigaw.head; ta; ta = ta->sameaw.next)
- if (ta->pend == pend)
- return false;
-
- ta = nfmalloc(sizeof(*ta));
- ta->aw = aw;
- ta->pend = pend;
- ta->samepend_next = pend->othertrigaw_head;
- pend->othertrigaw_head = ta;
- LIST_LINK_TAIL_PART(aw->trigaw, ta, sameaw.);
-
- return true;
-}
-
void
trig_clear_awaiters(struct pkginfo *notpend)
{
@@ -190,37 +122,6 @@ trig_clear_awaiters(struct pkginfo *notpend)
}
}
-static struct pkg_list *trig_awaited_pend_head;
-
-void
-trig_awaited_pend_enqueue(struct pkginfo *pend)
-{
- struct pkg_list *tp;
-
- for (tp = trig_awaited_pend_head; tp; tp = tp->next)
- if (tp->pkg == pend)
- return;
-
- pkg_list_prepend(&trig_awaited_pend_head, pend);
-}
-
-void
-trig_awaited_pend_foreach(trig_awaited_pend_foreach_func *func)
-{
- struct pkg_list *tp;
-
- for (tp = trig_awaited_pend_head; tp; tp = tp->next)
- if (!tp->pkg->trigpend_head)
- func(tp->pkg);
-}
-
-void
-trig_awaited_pend_free(void)
-{
- pkg_list_free(trig_awaited_pend_head);
- trig_awaited_pend_head = NULL;
-}
-
/*
* Fix up packages in state triggers-awaited w/o the corresponding package
* with pending triggers. This can happen when dpkg was interrupted
diff --git a/lib/dpkg/trignote.c b/lib/dpkg/trignote.c
new file mode 100644
index 0000000..2681eb6
--- /dev/null
+++ b/lib/dpkg/trignote.c
@@ -0,0 +1,128 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * trignote.c - trigger note handling
+ *
+ * Copyright © 2007 Canonical Ltd
+ * Written by Ian Jackson <[email protected]>
+ * Copyright © 2008-2011 Guillem Jover <[email protected]>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <dpkg/dpkg.h>
+#include <dpkg/dpkg-db.h>
+#include <dpkg/pkg-list.h>
+#include <dpkg/dlist.h>
+#include <dpkg/triglib.h>
+
+/*
+ * Note: This is also called from fields.c where *pend is a temporary!
+ *
+ * trig is not copied!
+ */
+bool
+trig_note_pend_core(struct pkginfo *pend, const char *trig)
+{
+ struct trigpend *tp;
+
+ for (tp = pend->trigpend_head; tp; tp = tp->next)
+ if (!strcmp(tp->name, trig))
+ return false;
+
+ tp = nfmalloc(sizeof(*tp));
+ tp->name = trig;
+ tp->next = pend->trigpend_head;
+ pend->trigpend_head = tp;
+
+ return true;
+}
+
+/*
+ * trig is not copied!
+ *
+ * @retval true For done.
+ * @retval false For already noted.
+ */
+bool
+trig_note_pend(struct pkginfo *pend, const char *trig)
+{
+ if (!trig_note_pend_core(pend, trig))
+ return false;
+
+ pend->status = pend->trigaw.head ? stat_triggersawaited :
+ stat_triggerspending;
+
+ return true;
+}
+
+/*
+ * Note: This is called also from fields.c where *aw is a temporary
+ * but pend is from pkg_db_find()!
+ *
+ * @retval true For done.
+ * @retval false For already noted.
+ */
+bool
+trig_note_aw(struct pkginfo *pend, struct pkginfo *aw)
+{
+ struct trigaw *ta;
+
+ /* We search through aw's list because that's probably shorter. */
+ for (ta = aw->trigaw.head; ta; ta = ta->sameaw.next)
+ if (ta->pend == pend)
+ return false;
+
+ ta = nfmalloc(sizeof(*ta));
+ ta->aw = aw;
+ ta->pend = pend;
+ ta->samepend_next = pend->othertrigaw_head;
+ pend->othertrigaw_head = ta;
+ LIST_LINK_TAIL_PART(aw->trigaw, ta, sameaw.);
+
+ return true;
+}
+
+static struct pkg_list *trig_awaited_pend_head;
+
+void
+trig_awaited_pend_enqueue(struct pkginfo *pend)
+{
+ struct pkg_list *tp;
+
+ for (tp = trig_awaited_pend_head; tp; tp = tp->next)
+ if (tp->pkg == pend)
+ return;
+
+ pkg_list_prepend(&trig_awaited_pend_head, pend);
+}
+
+void
+trig_awaited_pend_foreach(trig_awaited_pend_foreach_func *func)
+{
+ struct pkg_list *tp;
+
+ for (tp = trig_awaited_pend_head; tp; tp = tp->next)
+ if (!tp->pkg->trigpend_head)
+ func(tp->pkg);
+}
+
+void
+trig_awaited_pend_free(void)
+{
+ pkg_list_free(trig_awaited_pend_head);
+ trig_awaited_pend_head = NULL;
+}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
