The following commit has been merged in the master branch:
commit a6066a13aa23b28036b692b570f280a70efcf971
Author: Guillem Jover <[email protected]>
Date: Sun Oct 24 02:55:55 2010 +0200
libdpkg: Rename illegal_triggername to trig_name_is_illegal
diff --git a/lib/dpkg/fields.c b/lib/dpkg/fields.c
index 47fc811..5a61cca 100644
--- a/lib/dpkg/fields.c
+++ b/lib/dpkg/fields.c
@@ -492,7 +492,7 @@ f_trigpend(struct pkginfo *pend, struct pkginfoperfile
*pifp,
"this context"));
while ((word = scan_word(&value))) {
- emsg = illegal_triggername(word);
+ emsg = trig_name_is_illegal(word);
if (emsg)
parse_error(ps, pend,
_("illegal pending trigger name `%.255s': %s"), word, emsg);
diff --git a/lib/dpkg/libdpkg.Versions b/lib/dpkg/libdpkg.Versions
index b7d5103..52503c4 100644
--- a/lib/dpkg/libdpkg.Versions
+++ b/lib/dpkg/libdpkg.Versions
@@ -223,7 +223,7 @@ LIBDPKG_PRIVATE {
modstatdb_shutdown;
# Triggers support
- illegal_triggername;
+ trig_name_is_illegal;
trigdef_set_methods;
trigdef_update_start;
trigdef_update_printf;
diff --git a/lib/dpkg/triglib.c b/lib/dpkg/triglib.c
index 2869c8c..50bd6b5 100644
--- a/lib/dpkg/triglib.c
+++ b/lib/dpkg/triglib.c
@@ -40,7 +40,7 @@
#include <dpkg/triglib.h>
const char *
-illegal_triggername(const char *p)
+trig_name_is_illegal(const char *p)
{
int c;
@@ -678,7 +678,7 @@ parse_ci_call(const char *file, const char *cmd,
trig_parse_cicb *cb,
{
const char *emsg;
- emsg = illegal_triggername(trig);
+ emsg = trig_name_is_illegal(trig);
if (emsg)
ohshit(_("triggers ci file `%.250s' contains illegal trigger "
"syntax in trigger name `%.250s': %.250s"),
diff --git a/lib/dpkg/triglib.h b/lib/dpkg/triglib.h
index 0be5178..1cbeba9 100644
--- a/lib/dpkg/triglib.h
+++ b/lib/dpkg/triglib.h
@@ -36,7 +36,7 @@ DPKG_BEGIN_DECLS
* we're actually doing real package management work.
*/
-const char *illegal_triggername(const char *p);
+const char *trig_name_is_illegal(const char *p);
struct trigfileint {
struct pkginfo *pkg;
diff --git a/src/trigcmd.c b/src/trigcmd.c
index a0645b8..4dfdca6 100644
--- a/src/trigcmd.c
+++ b/src/trigcmd.c
@@ -215,7 +215,8 @@ main(int argc, const char *const *argv)
bypackage, badname);
activate = argv[0];
- if ((badname = illegal_triggername(activate)))
+ badname = trig_name_is_illegal(activate);
+ if (badname)
badusage(_("invalid trigger name `%.250s': %.250s"),
activate, badname);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
