Module Name: src
Committed By: christos
Date: Wed Oct 14 15:58:46 UTC 2015
Modified Files:
src/external/bsd/dhcp/dist/includes: dhcpd.h
src/external/bsd/dhcp/dist/includes/omapip: omapip_p.h
Log Message:
use __sysloglike where appropriate.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcp/dist/includes/dhcpd.h
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/bsd/dhcp/dist/includes/omapip/omapip_p.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcp/dist/includes/dhcpd.h
diff -u src/external/bsd/dhcp/dist/includes/dhcpd.h:1.6 src/external/bsd/dhcp/dist/includes/dhcpd.h:1.7
--- src/external/bsd/dhcp/dist/includes/dhcpd.h:1.6 Sat Jul 12 08:09:37 2014
+++ src/external/bsd/dhcp/dist/includes/dhcpd.h Wed Oct 14 11:58:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dhcpd.h,v 1.6 2014/07/12 12:09:37 spz Exp $ */
+/* $NetBSD: dhcpd.h,v 1.7 2015/10/14 15:58:46 christos Exp $ */
/* dhcpd.h
Definitions for dhcpd... */
@@ -2092,8 +2092,7 @@ int parse_option_token (struct expressio
const char **, struct expression *, int, int);
int parse_allow_deny (struct option_cache **, struct parse *, int);
int parse_auth_key (struct data_string *, struct parse *);
-int parse_warn (struct parse *, const char *, ...)
- __attribute__((__format__(__printf__,2,3)));
+int parse_warn (struct parse *, const char *, ...) __sysloglike(2, 3);
struct expression *parse_domain_list(struct parse *cfile, int);
Index: src/external/bsd/dhcp/dist/includes/omapip/omapip_p.h
diff -u src/external/bsd/dhcp/dist/includes/omapip/omapip_p.h:1.1.1.4 src/external/bsd/dhcp/dist/includes/omapip/omapip_p.h:1.2
--- src/external/bsd/dhcp/dist/includes/omapip/omapip_p.h:1.1.1.4 Sat Jul 12 07:57:57 2014
+++ src/external/bsd/dhcp/dist/includes/omapip/omapip_p.h Wed Oct 14 11:58:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: omapip_p.h,v 1.1.1.4 2014/07/12 11:57:57 spz Exp $ */
+/* $NetBSD: omapip_p.h,v 1.2 2015/10/14 15:58:46 christos Exp $ */
/* omapip_p.h
Private master include file for the OMAPI library. */
@@ -283,14 +283,10 @@ extern int log_priority;
extern int log_perror;
extern void (*log_cleanup) (void);
-void log_fatal (const char *, ...)
- __attribute__((__format__(__printf__,1,2))) ISC_DHCP_NORETURN;
-int log_error (const char *, ...)
- __attribute__((__format__(__printf__,1,2)));
-int log_info (const char *, ...)
- __attribute__((__format__(__printf__,1,2)));
-int log_debug (const char *, ...)
- __attribute__((__format__(__printf__,1,2)));
+void log_fatal (const char *, ...) __sysloglike(1, 2) ISC_DHCP_NORETURN;
+int log_error (const char *, ...) __sysloglike(1, 2);
+int log_info (const char *, ...) __sysloglike(1, 2);
+int log_debug (const char *, ...) __sysloglike(1, 2);
void do_percentm (char *obuf, const char *ibuf);
isc_result_t uerr2isc (int);
