Deleted Added
full compact
yp_error.c (79294) yp_error.c (90298)
1/*
2 * Copyright (c) 1995
3 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 19 unchanged lines hidden (view full) ---

28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
32 */
33
34#ifndef lint
35static const char rcsid[] =
1/*
2 * Copyright (c) 1995
3 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 19 unchanged lines hidden (view full) ---

28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
32 */
33
34#ifndef lint
35static const char rcsid[] =
36 "$FreeBSD: head/usr.sbin/ypserv/yp_error.c 79294 2001-07-05 08:17:06Z kris $";
36 "$FreeBSD: head/usr.sbin/ypserv/yp_error.c 90298 2002-02-06 15:26:07Z des $";
37#endif /* not lint */
38
39/*
40 * error logging/reporting facilities
41 * stolen from /usr/libexec/mail.local via ypserv
42 */
43
37#endif /* not lint */
38
39/*
40 * error logging/reporting facilities
41 * stolen from /usr/libexec/mail.local via ypserv
42 */
43
44#include <stdio.h>
45#include <sys/types.h>
44#include <sys/types.h>
45#include <stdio.h>
46#include <stdarg.h>
46#include <syslog.h>
47#include "yp_extern.h"
48
49int debug;
50extern int _rpcpmstart;
51
52extern char *progname;
53
47#include <syslog.h>
48#include "yp_extern.h"
49
50int debug;
51extern int _rpcpmstart;
52
53extern char *progname;
54
54#if __STDC__
55#include <stdarg.h>
56#else
57#include <varargs.h>
58#endif
55static void __verr(const char *fmt, va_list ap) __printflike(1, 0);
59
56
60static void __verr(const char *fmt, _BSD_VA_LIST_ ap) __printflike(1, 0);
61
62static void __verr(fmt, ap)
63 const char *fmt;
64 _BSD_VA_LIST_ ap;
65
57static void __verr(const char *fmt, va_list ap)
66{
67 if (debug && !_rpcpmstart) {
68 fprintf(stderr,"%s: ",progname);
69 vfprintf(stderr, fmt, ap);
70 fprintf(stderr, "\n");
71 } else {
72 vsyslog(LOG_NOTICE, fmt, ap);
73 }
74}
75
76void
58{
59 if (debug && !_rpcpmstart) {
60 fprintf(stderr,"%s: ",progname);
61 vfprintf(stderr, fmt, ap);
62 fprintf(stderr, "\n");
63 } else {
64 vsyslog(LOG_NOTICE, fmt, ap);
65 }
66}
67
68void
77#ifdef __STDC__
78yp_error(const char *fmt, ...)
69yp_error(const char *fmt, ...)
79#else
80yp_error(fmt, va_list)
81 const char *fmt;
82 va_dcl
83#endif
84{
85 va_list ap;
70{
71 va_list ap;
86#ifdef __STDC__
87 va_start(ap, fmt);
72 va_start(ap, fmt);
88#else
89 va_start(ap);
90#endif
91 __verr(fmt,ap);
92 va_end(ap);
93}
73 __verr(fmt,ap);
74 va_end(ap);
75}