libdpkg: Move trigdeferred declarations to a new trigdeferred.h

lib/dpkg/Makefile.am

@@ -81,5 +81,6 @@ pkginclude_HEADERS = \
 	string.h \
 	subproc.h \
 	tarfn.h \
+	trigdeferred.h \
 	triglib.h \
 	varbuf.h

lib/dpkg/dpkg-db.h

@@ -214,37 +214,6 @@ extern char *statusfile, *availablefile;
 const char *pkgadmindir(void);
 const char *pkgadminfile(struct pkginfo *pkg, const char *whichfile);
 
-/*** from trigdeferred.l ***/
-
-enum trigdef_updateflags {
-  tduf_nolockok =           001,
-  tduf_write =              002,
-  tduf_nolock =             003,
-  /* Should not be set unless _write is. */
-  tduf_writeifempty =       010,
-  tduf_writeifenoent =      020,
-};
-
-struct trigdefmeths {
-  void (*trig_begin)(const char *trig);
-  void (*package)(const char *awname);
-  void (*trig_end)(void);
-};
-
-void trigdef_set_methods(const struct trigdefmeths *methods);
-
-/* Return values:
- *  -1  Lock ENOENT with O_CREAT (directory does not exist)
- *  -2  Unincorp empty, tduf_writeifempty unset
- *  -3  Unincorp ENOENT, tduf_writeifenoent unset
- *   1  Unincorp ENOENT, tduf_writeifenoent set   } caller must call
- *   2  ok                                        }  trigdef_update_done!
- */
-int trigdef_update_start(enum trigdef_updateflags uf, const char *admindir);
-void trigdef_update_printf(const char *format, ...) DPKG_ATTR_PRINTF(1);
-int trigdef_yylex(void);
-void trigdef_process_done(void);
-
 /*** from database.c ***/
 
 struct pkginfo *findpackage(const char *name);

lib/dpkg/trigdeferred.h

@@ -0,0 +1,61 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * trigdeferred.h - parsing of triggers/Deferred
+ *
+ * Copyright © 2007 Canonical, Ltd.
+ *   written by Ian Jackson <ian@chiark.greenend.org.uk>
+ *
+ * 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/>.
+ */
+
+#ifndef LIBDPKG_TRIGDEFERRED_H
+#define LIBDPKG_TRIGDEFERRED_H
+
+#include <dpkg/macros.h>
+
+DPKG_BEGIN_DECLS
+
+enum trigdef_updateflags {
+	tduf_nolockok =           001,
+	tduf_write =              002,
+	tduf_nolock =             003,
+	/* Should not be set unless _write is. */
+	tduf_writeifempty =       010,
+	tduf_writeifenoent =      020,
+};
+
+struct trigdefmeths {
+	void (*trig_begin)(const char *trig);
+	void (*package)(const char *awname);
+	void (*trig_end)(void);
+};
+
+void trigdef_set_methods(const struct trigdefmeths *methods);
+
+/*
+ * Return values:
+ *  -1  Lock ENOENT with O_CREAT (directory does not exist)
+ *  -2  Unincorp empty, tduf_writeifempty unset
+ *  -3  Unincorp ENOENT, tduf_writeifenoent unset
+ *   1  Unincorp ENOENT, tduf_writeifenoent set   } caller must call
+ *   2  ok                                        }  trigdef_update_done!
+ */
+int trigdef_update_start(enum trigdef_updateflags uf, const char *admindir);
+void trigdef_update_printf(const char *format, ...) DPKG_ATTR_PRINTF(1);
+int trigdef_yylex(void);
+void trigdef_process_done(void);
+
+DPKG_END_DECLS
+
+#endif /* LIBDPKG_TRIGDEFERRED_H */

lib/dpkg/trigdeferred.l

@@ -45,6 +45,7 @@
 #include <dpkg/dpkg-db.h>
 #include <dpkg/file.h>
 #include <dpkg/dir.h>
+#include <dpkg/trigdeferred.h>
 #include <dpkg/triglib.h>
 
 #define YY_NO_INPUT

lib/dpkg/triglib.c

@@ -36,6 +36,7 @@
 #include <dpkg/pkg-list.h>
 #include <dpkg/dlist.h>
 #include <dpkg/dir.h>
+#include <dpkg/trigdeferred.h>
 #include <dpkg/triglib.h>
 
 const char *

src/trigcmd.c

@@ -39,6 +39,7 @@
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/myopt.h>
+#include <dpkg/trigdeferred.h>
 #include <dpkg/triglib.h>
 
 const char thisname[] = "dpkg-trigger";