CVS commit: src/external/bsd/am-utils/dist/include
Module Name:src Committed By: christos Date: Wed Oct 14 16:00:18 UTC 2015 Modified Files: src/external/bsd/am-utils/dist/include: am_utils.h Log Message: use syslog attribute To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 \ src/external/bsd/am-utils/dist/include/am_utils.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/am-utils/dist/include/am_utils.h diff -u src/external/bsd/am-utils/dist/include/am_utils.h:1.1.1.3 src/external/bsd/am-utils/dist/include/am_utils.h:1.2 --- src/external/bsd/am-utils/dist/include/am_utils.h:1.1.1.3 Sat Jan 17 11:34:18 2015 +++ src/external/bsd/am-utils/dist/include/am_utils.h Wed Oct 14 12:00:17 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: am_utils.h,v 1.1.1.3 2015/01/17 16:34:18 christos Exp $ */ +/* $NetBSD: am_utils.h,v 1.2 2015/10/14 16:00:17 christos Exp $ */ /* * Copyright (c) 1997-2014 Erez Zadok @@ -53,6 +53,10 @@ /*** MACROS***/ /**/ +#if !defined(__syslog_attribute__) && !defined(__syslog__) +#define __syslog__ __printf__ +#endif + /* * General macros. */ @@ -324,7 +328,7 @@ extern void getwire(char **name1, char * extern void going_down(int); extern void mnt_free(mntent_t *); extern void plog(int, const char *,...) - __attribute__ ((__format__ (__printf__, 2, 3))); + __attribute__ ((__format__ (__syslog__, 2, 3))); extern void rmdirs(char *); extern void rpc_msg_init(struct rpc_msg *, u_long, u_long, u_long); extern void set_amd_program_number(u_long program); @@ -489,7 +493,7 @@ extern void malloc_verify(void); extern void print_nfs_args(const void *, u_long nfs_version); extern int debug_option (char *opt); extern void dplog(const char *fmt, ...) - __attribute__ ((__format__ (__printf__, 1, 2))); + __attribute__ ((__format__ (__syslog__, 1, 2))); #else /* not DEBUG */
CVS commit: src/external/bsd/am-utils/dist/include
Module Name:src Committed By: christos Date: Wed Oct 28 15:00:26 UTC 2009 Modified Files: src/external/bsd/am-utils/dist/include: am_defs.h Log Message: Bring in the proper fix from upstream. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/dist/include/am_defs.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/am-utils/dist/include/am_defs.h diff -u src/external/bsd/am-utils/dist/include/am_defs.h:1.2 src/external/bsd/am-utils/dist/include/am_defs.h:1.3 --- src/external/bsd/am-utils/dist/include/am_defs.h:1.2 Wed Oct 28 09:08:45 2009 +++ src/external/bsd/am-utils/dist/include/am_defs.h Wed Oct 28 11:00:26 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: am_defs.h,v 1.2 2009/10/28 13:08:45 christos Exp $ */ +/* $NetBSD: am_defs.h,v 1.3 2009/10/28 15:00:26 christos Exp $ */ /* * Copyright (c) 1997-2009 Erez Zadok @@ -321,17 +321,6 @@ # include #endif /* HAVE_MNTENT_H */ -/* - * Actions to take if exists. - */ -#ifdef HAVE_SYS_ERRNO_H -# ifdef __NetBSD__ -# include -# else -# include -extern int errno; -# endif -#endif /* HAVE_SYS_ERRNO_H */ /* * Actions to take if exists. @@ -937,6 +926,14 @@ */ #ifdef HAVE_ERRNO_H # include +#else +/* + * Actions to take if exists. + */ +# ifdef HAVE_SYS_ERRNO_H +# include +extern int errno; +# endif /* HAVE_SYS_ERRNO_H */ #endif /* HAVE_ERRNO_H */ /*
CVS commit: src/external/bsd/am-utils/dist/include
Module Name:src Committed By: christos Date: Wed Oct 28 13:08:45 UTC 2009 Modified Files: src/external/bsd/am-utils/dist/include: am_defs.h Log Message: Deal with errno correctly. Fixed better upstream. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/am-utils/dist/include/am_defs.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/am-utils/dist/include/am_defs.h diff -u src/external/bsd/am-utils/dist/include/am_defs.h:1.1.1.2 src/external/bsd/am-utils/dist/include/am_defs.h:1.2 --- src/external/bsd/am-utils/dist/include/am_defs.h:1.1.1.2 Fri Mar 20 16:26:55 2009 +++ src/external/bsd/am-utils/dist/include/am_defs.h Wed Oct 28 09:08:45 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: am_defs.h,v 1.1.1.2 2009/03/20 20:26:55 christos Exp $ */ +/* $NetBSD: am_defs.h,v 1.2 2009/10/28 13:08:45 christos Exp $ */ /* * Copyright (c) 1997-2009 Erez Zadok @@ -325,8 +325,12 @@ * Actions to take if exists. */ #ifdef HAVE_SYS_ERRNO_H -# include +# ifdef __NetBSD__ +# include +# else +# include extern int errno; +# endif #endif /* HAVE_SYS_ERRNO_H */ /*
