[SCM] dpkg's main repository branch, master, updated. 1.15.7.2-115-gad9b46b

[Guillem Jover]

The following commit has been merged in the master branch:
commit 1f6b854a2d8319f8b90cb3964117aaf95e10e0a8
Author: Guillem Jover <guil...@debian.org>
Date:   Thu Jun 24 04:04:08 2010 +0200

    libdpkg: Rename trigdef_yylex() to trigdef_parse()

diff --git a/lib/dpkg/trigdeferred.h b/lib/dpkg/trigdeferred.h
index 1942ad6..7faccf9 100644
--- a/lib/dpkg/trigdeferred.h
+++ b/lib/dpkg/trigdeferred.h
@@ -53,7 +53,7 @@ void trigdef_set_methods(const struct trigdefmeths *methods);
  */
 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);
+int trigdef_parse(void);
 void trigdef_process_done(void);
 
 DPKG_END_DECLS
diff --git a/lib/dpkg/trigdeferred.l b/lib/dpkg/trigdeferred.l
index 40b59c9..3be1e83 100644
--- a/lib/dpkg/trigdeferred.l
+++ b/lib/dpkg/trigdeferred.l
@@ -49,6 +49,7 @@
 #include <dpkg/triglib.h>
 
 #define YY_NO_INPUT
+#define YY_DECL int trigdef_parse(void)
 
 static struct varbuf fn, newfn;
 
diff --git a/lib/dpkg/triglib.c b/lib/dpkg/triglib.c
index 52c9e3b..8e494e5 100644
--- a/lib/dpkg/triglib.c
+++ b/lib/dpkg/triglib.c
@@ -809,7 +809,7 @@ trig_incorporate(enum modstatdb_rw cstatus, const char 
*admindir)
                break;
        case 2:
                /* Read and incorporate triggers. */
-               trigdef_yylex();
+               trigdef_parse();
                break;
        default:
                internerr("unknown trigdef_update_start return value '%d'", ur);
diff --git a/src/trigcmd.c b/src/trigcmd.c
index ae076af..c13323f 100644
--- a/src/trigcmd.c
+++ b/src/trigcmd.c
@@ -227,7 +227,7 @@ main(int argc, const char *const *argv)
                tduf |= tduf_write | tduf_writeifempty;
        uf = trigdef_update_start(tduf, admindir);
        if (uf >= 0) {
-               trigdef_yylex();
+               trigdef_parse();
                if (!done_trig)
                        trigdef_update_printf("%s %s\n", activate, bypackage);
                trigdef_process_done();

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org