[src/trunk]: src/external/ibm-public/postfix/dist/src/postconf Resolve confli...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b4a4e6d50afe
branches:  trunk
changeset: 336246:b4a4e6d50afe
user:      tron <tron%NetBSD.org@localhost>
date:      Sat Feb 21 12:00:48 2015 +0000

description:
Resolve conflicts from last import.

diffstat:

 external/ibm-public/postfix/dist/src/postconf/postconf_master.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 63a8f8c1406d -r b4a4e6d50afe external/ibm-public/postfix/dist/src/postconf/postconf_master.c
--- a/external/ibm-public/postfix/dist/src/postconf/postconf_master.c   Sat Feb 21 11:56:30 2015 +0000
+++ b/external/ibm-public/postfix/dist/src/postconf/postconf_master.c   Sat Feb 21 12:00:48 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: postconf_master.c,v 1.3 2014/07/06 19:45:50 tron Exp $ */
+/*     $NetBSD: postconf_master.c,v 1.4 2015/02/21 12:00:48 tron Exp $ */
 
 /*++
 /* NAME
@@ -275,7 +275,7 @@
     for (field = PCF_MASTER_FLD_PRIVATE; field <= PCF_MASTER_FLD_CHROOT; field++) {
        cp = argv->argv[field];
        if (cp[1] != 0 || strchr(pcf_valid_bool_types, *cp) == 0)
-           pcf_fix_fatal("invalid %s field \%s\" in \"%s\"",
+           pcf_fix_fatal("invalid %s field \"%s\" in \"%s\"",
                          pcf_str_field_pattern(field), cp, raw_text);
     }
 
@@ -284,12 +284,12 @@
     if (len > 0 && cp[len - 1] == '?')
        len--;
     if (!(cp[0] == '-' && len == 1) && strspn(cp, "0123456789") != len)
-       pcf_fix_fatal("invalid " PCF_MASTER_NAME_WAKEUP " field \%s\" in \"%s\"",
+       pcf_fix_fatal("invalid " PCF_MASTER_NAME_WAKEUP " field \"%s\" in \"%s\"",
                      cp, raw_text);
 
     cp = argv->argv[PCF_MASTER_FLD_MAXPROC];
     if (strcmp("-", cp) != 0 && cp[strspn(cp, "0123456789")] != 0)
-       pcf_fix_fatal("invalid " PCF_MASTER_NAME_MAXPROC " field \%s\" in \"%s\"",
+       pcf_fix_fatal("invalid " PCF_MASTER_NAME_MAXPROC " field \"%s\" in \"%s\"",
                      cp, raw_text);
 }