Deleted Added
full compact
log.c (158115) log.c (171795)
1/*-
2 * Copyright (c) 2005 Michael Bushkov <bushman@rsu.ru>
3 * 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

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

21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 */
27
28#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2005 Michael Bushkov <bushman@rsu.ru>
3 * 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

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

21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 */
27
28#include <sys/cdefs.h>
29__FBSDID("$FreeBSD: head/usr.sbin/nscd/log.c 158115 2006-04-28 12:03:38Z ume $");
29__FBSDID("$FreeBSD: head/usr.sbin/nscd/log.c 171795 2007-08-09 13:06:12Z bushman $");
30
31#include <assert.h>
32#include <stdarg.h>
33#include <stdio.h>
34#include <stdlib.h>
35#include <syslog.h>
36#include "log.h"
37

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

45 va_start(ap, message);
46 vasprintf(&fmessage, message, ap);
47 va_end(ap);
48 assert(fmessage != NULL);
49
50 printf("M%d from %s: %s\n", level, sender, fmessage);
51#ifndef NO_SYSLOG
52 if (level == 0)
30
31#include <assert.h>
32#include <stdarg.h>
33#include <stdio.h>
34#include <stdlib.h>
35#include <syslog.h>
36#include "log.h"
37

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

45 va_start(ap, message);
46 vasprintf(&fmessage, message, ap);
47 va_end(ap);
48 assert(fmessage != NULL);
49
50 printf("M%d from %s: %s\n", level, sender, fmessage);
51#ifndef NO_SYSLOG
52 if (level == 0)
53 syslog(LOG_INFO, "cached message (from %s): %s", sender,
53 syslog(LOG_INFO, "nscd message (from %s): %s", sender,
54 fmessage);
55#endif
56 free(fmessage);
57}
58
59void
60__log_err(int level, const char *sender, const char *error, ...)
61{

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

67 vasprintf(&ferror, error, ap);
68 va_end(ap);
69 assert(ferror != NULL);
70
71 printf("E%d from %s: %s\n", level, sender, ferror);
72
73#ifndef NO_SYSLOG
74 if (level == 0)
54 fmessage);
55#endif
56 free(fmessage);
57}
58
59void
60__log_err(int level, const char *sender, const char *error, ...)
61{

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

67 vasprintf(&ferror, error, ap);
68 va_end(ap);
69 assert(ferror != NULL);
70
71 printf("E%d from %s: %s\n", level, sender, ferror);
72
73#ifndef NO_SYSLOG
74 if (level == 0)
75 syslog(LOG_ERR, "cached error (from %s): %s", sender, ferror);
75 syslog(LOG_ERR, "nscd error (from %s): %s", sender, ferror);
76#endif
77 free(ferror);
78}
76#endif
77 free(ferror);
78}