Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/ntp - fixes for non-literal strings



details:   https://anonhg.NetBSD.org/src/rev/d0118c7552a8
branches:  trunk
changeset: 768385:d0118c7552a8
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Aug 16 04:45:17 2011 +0000

description:
- fixes for non-literal strings
- add missing strbuf initialization

diffstat:

 external/bsd/ntp/dist/lib/isc/log.c                    |   5 +++--
 external/bsd/ntp/dist/lib/isc/netaddr.c                |   5 +++--
 external/bsd/ntp/dist/lib/isc/sockaddr.c               |  14 +++++++++-----
 external/bsd/ntp/dist/lib/isc/unix/ifiter_getifaddrs.c |   6 +++---
 external/bsd/ntp/dist/lib/isc/unix/socket.c            |   4 ++--
 external/bsd/ntp/lib/libopts/Makefile                  |   4 +++-
 6 files changed, 23 insertions(+), 15 deletions(-)

diffs (158 lines):

diff -r 5e5e25ae727b -r d0118c7552a8 external/bsd/ntp/dist/lib/isc/log.c
--- a/external/bsd/ntp/dist/lib/isc/log.c       Tue Aug 16 04:04:57 2011 +0000
+++ b/external/bsd/ntp/dist/lib/isc/log.c       Tue Aug 16 04:45:17 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: log.c,v 1.1.1.1 2009/12/13 16:54:22 kardel Exp $       */
+/*     $NetBSD: log.c,v 1.2 2011/08/16 04:45:17 christos Exp $ */
 
 /*
  * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -1520,10 +1520,11 @@
                    level_string[0] == '\0') {
                        if (level < ISC_LOG_CRITICAL)
                                snprintf(level_string, sizeof(level_string),
+                                        "%s %d: ",
                                         isc_msgcat_get(isc_msgcat,
                                                        ISC_MSGSET_LOG,
                                                        ISC_MSG_LEVEL,
-                                                       "level %d: "),
+                                                       "level"),
                                         level);
                        else if (level > ISC_LOG_DYNAMIC)
                                snprintf(level_string, sizeof(level_string),
diff -r 5e5e25ae727b -r d0118c7552a8 external/bsd/ntp/dist/lib/isc/netaddr.c
--- a/external/bsd/ntp/dist/lib/isc/netaddr.c   Tue Aug 16 04:04:57 2011 +0000
+++ b/external/bsd/ntp/dist/lib/isc/netaddr.c   Tue Aug 16 04:45:17 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netaddr.c,v 1.1.1.1 2009/12/13 16:54:13 kardel Exp $   */
+/*     $NetBSD: netaddr.c,v 1.2 2011/08/16 04:45:17 christos Exp $     */
 
 /*
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
@@ -202,9 +202,10 @@
 
        if (result != ISC_R_SUCCESS) {
                snprintf(array, size,
+                        "<%s %u>",
                         isc_msgcat_get(isc_msgcat, ISC_MSGSET_NETADDR,
                                        ISC_MSG_UNKNOWNADDR,
-                                       "<unknown address, family %u>"),
+                                       "unknown address, family"),
                         na->family);
                array[size - 1] = '\0';
        }
diff -r 5e5e25ae727b -r d0118c7552a8 external/bsd/ntp/dist/lib/isc/sockaddr.c
--- a/external/bsd/ntp/dist/lib/isc/sockaddr.c  Tue Aug 16 04:04:57 2011 +0000
+++ b/external/bsd/ntp/dist/lib/isc/sockaddr.c  Tue Aug 16 04:45:17 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sockaddr.c,v 1.1.1.1 2009/12/13 16:54:14 kardel Exp $  */
+/*     $NetBSD: sockaddr.c,v 1.2 2011/08/16 04:45:17 christos Exp $    */
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -191,9 +191,10 @@
                 * The message is the same as in netaddr.c.
                 */
                snprintf(array, size,
+                        "<%s %u>",
                         isc_msgcat_get(isc_msgcat, ISC_MSGSET_NETADDR,
                                        ISC_MSG_UNKNOWNADDR,
-                                       "<unknown address, family %u>"),
+                                       "unknown address, family"),
                         sa->type.sa.sa_family);
                array[size - 1] = '\0';
        }
@@ -229,10 +230,11 @@
                break;
        default:
                UNEXPECTED_ERROR(__FILE__, __LINE__,
+                                "%s: %d",
                                 isc_msgcat_get(isc_msgcat,
                                                ISC_MSGSET_SOCKADDR,
                                                ISC_MSG_UNKNOWNFAMILY,
-                                               "unknown address family: %d"),
+                                               "unknown address family"),
                                             (int)sockaddr->type.sa.sa_family);
                s = (const unsigned char *)&sockaddr->type;
                length = sockaddr->length;
@@ -409,9 +411,10 @@
                break;
        default:
                FATAL_ERROR(__FILE__, __LINE__,
+                           "%s: %d",
                            isc_msgcat_get(isc_msgcat, ISC_MSGSET_SOCKADDR,
                                           ISC_MSG_UNKNOWNFAMILY,
-                                          "unknown address family: %d"),
+                                          "unknown address family"),
                            (int)sockaddr->type.sa.sa_family);
        }
 }
@@ -429,9 +432,10 @@
                break;
        default:
                FATAL_ERROR(__FILE__, __LINE__,
+                           "%s: %d",
                            isc_msgcat_get(isc_msgcat, ISC_MSGSET_SOCKADDR,
                                           ISC_MSG_UNKNOWNFAMILY,
-                                          "unknown address family: %d"),
+                                          "unknown address family"),
                            (int)sockaddr->type.sa.sa_family);
        }
 
diff -r 5e5e25ae727b -r d0118c7552a8 external/bsd/ntp/dist/lib/isc/unix/ifiter_getifaddrs.c
--- a/external/bsd/ntp/dist/lib/isc/unix/ifiter_getifaddrs.c    Tue Aug 16 04:04:57 2011 +0000
+++ b/external/bsd/ntp/dist/lib/isc/unix/ifiter_getifaddrs.c    Tue Aug 16 04:45:17 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ifiter_getifaddrs.c,v 1.1.1.1 2009/12/13 16:54:32 kardel Exp $ */
+/*     $NetBSD: ifiter_getifaddrs.c,v 1.2 2011/08/16 04:45:17 christos Exp $   */
 
 /*
  * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
@@ -85,11 +85,11 @@
        if (getifaddrs(&iter->ifaddrs) < 0) {
                isc__strerror(errno, strbuf, sizeof(strbuf));
                UNEXPECTED_ERROR(__FILE__, __LINE__,
+                                "getting interface addresses: %s: %s",
                                 isc_msgcat_get(isc_msgcat,
                                                ISC_MSGSET_IFITERGETIFADDRS,
                                                ISC_MSG_GETIFADDRS,
-                                               "getting interface "
-                                               "addresses: getifaddrs: %s"),
+                                               "getifaddrs"),
                                 strbuf);
                result = ISC_R_UNEXPECTED;
                goto failure;
diff -r 5e5e25ae727b -r d0118c7552a8 external/bsd/ntp/dist/lib/isc/unix/socket.c
--- a/external/bsd/ntp/dist/lib/isc/unix/socket.c       Tue Aug 16 04:04:57 2011 +0000
+++ b/external/bsd/ntp/dist/lib/isc/unix/socket.c       Tue Aug 16 04:45:17 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: socket.c,v 1.1.1.1 2009/12/13 16:54:37 kardel Exp $    */
+/*     $NetBSD: socket.c,v 1.2 2011/08/16 04:45:17 christos Exp $      */
 
 /*
  * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
@@ -603,7 +603,7 @@
 
        if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_RECVPKTINFO,
                       (void *)&on, sizeof(on)) < 0) {
-
+               isc__strerror(errno, strbuf, sizeof(strbuf));
                UNEXPECTED_ERROR(__FILE__, __LINE__,
                                 "setsockopt(%d, IPV6_RECVPKTINFO) "
                                 "%s: %s", sock->fd,
diff -r 5e5e25ae727b -r d0118c7552a8 external/bsd/ntp/lib/libopts/Makefile
--- a/external/bsd/ntp/lib/libopts/Makefile     Tue Aug 16 04:04:57 2011 +0000
+++ b/external/bsd/ntp/lib/libopts/Makefile     Tue Aug 16 04:45:17 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2009/12/13 17:13:47 kardel Exp $
+#      $NetBSD: Makefile,v 1.2 2011/08/16 04:45:17 christos Exp $
 
 LIBISPRIVATE=yes
 
@@ -16,4 +16,6 @@
 
 SRCS=libopts.c
 
+COPTS.libopts.c += -Wno-format-nonliteral
+
 .include <bsd.lib.mk>



Home | Main Index | Thread Index | Old Index