This commit was manufactured by cvs2svn to create tag 'FreeBSD-release/1.1'.

[unix-history] / sys / sys / syslog.h

diff --git a/sys/sys/syslog.h b/sys/sys/syslog.h
index f5635da..503111d 100644 (file)
--- a/sys/sys/syslog.h
+++ b/sys/sys/syslog.h
@@ -30,9 +30,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *

- *     @(#)syslog.h    7.20 (Berkeley) 2/23/91
+ *     from: @(#)syslog.h      7.20 (Berkeley) 2/23/91
+ *     $Id: syslog.h,v 1.3 1993/11/07 17:53:06 wollman Exp $

  */
 
  */
 

+#ifndef _SYS_SYSLOG_H_
+#define _SYS_SYSLOG_H_ 1
+

 #define        _PATH_LOG       "/dev/log"
 
 /*
 #define        _PATH_LOG       "/dev/log"
 
 /*


@@ -58,32 +62,6 @@
 #define        LOG_PRI(p)      ((p) & LOG_PRIMASK)
 #define        LOG_MAKEPRI(fac, pri)   (((fac) << 3) | (pri))
 
 #define        LOG_PRI(p)      ((p) & LOG_PRIMASK)
 #define        LOG_MAKEPRI(fac, pri)   (((fac) << 3) | (pri))
 

-#ifdef SYSLOG_NAMES
-#define        INTERNAL_NOPRI  0x10    /* the "no priority" priority */
-                               /* mark "facility" */
-#define        INTERNAL_MARK   LOG_MAKEPRI(LOG_NFACILITIES, 0)
-typedef struct _code {
-       char    *c_name;
-       int     c_val;
-} CODE;
-
-CODE prioritynames[] = {
-       "alert",        LOG_ALERT,
-       "crit",         LOG_CRIT,
-       "debug",        LOG_DEBUG,
-       "emerg",        LOG_EMERG,
-       "err",          LOG_ERR,
-       "error",        LOG_ERR,                /* DEPRECATED */
-       "info",         LOG_INFO,
-       "none",         INTERNAL_NOPRI,         /* INTERNAL */
-       "notice",       LOG_NOTICE,
-       "panic",        LOG_EMERG,              /* DEPRECATED */
-       "warn",         LOG_WARNING,            /* DEPRECATED */
-       "warning",      LOG_WARNING,
-       NULL,           -1,
-};
-#endif
-

 /* facility codes */
 #define        LOG_KERN        (0<<3)  /* kernel messages */
 #define        LOG_USER        (1<<3)  /* random user-level messages */
 /* facility codes */
 #define        LOG_KERN        (0<<3)  /* kernel messages */
 #define        LOG_USER        (1<<3)  /* random user-level messages */


@@ -112,33 +90,6 @@ CODE prioritynames[] = {
                                /* facility of pri */
 #define        LOG_FAC(p)      (((p) & LOG_FACMASK) >> 3)
 
                                /* facility of pri */
 #define        LOG_FAC(p)      (((p) & LOG_FACMASK) >> 3)
 

-#ifdef SYSLOG_NAMES
-CODE facilitynames[] = {
-       "auth",         LOG_AUTH,
-       "authpriv",     LOG_AUTHPRIV,
-       "cron",         LOG_CRON,
-       "daemon",       LOG_DAEMON,
-       "kern",         LOG_KERN,
-       "lpr",          LOG_LPR,
-       "mail",         LOG_MAIL,
-       "mark",         INTERNAL_MARK,          /* INTERNAL */
-       "news",         LOG_NEWS,
-       "security",     LOG_AUTH,               /* DEPRECATED */
-       "syslog",       LOG_SYSLOG,
-       "user",         LOG_USER,
-       "uucp",         LOG_UUCP,
-       "local0",       LOG_LOCAL0,
-       "local1",       LOG_LOCAL1,
-       "local2",       LOG_LOCAL2,
-       "local3",       LOG_LOCAL3,
-       "local4",       LOG_LOCAL4,
-       "local5",       LOG_LOCAL5,
-       "local6",       LOG_LOCAL6,
-       "local7",       LOG_LOCAL7,
-       NULL,           -1,
-};
-#endif
-

 #ifdef KERNEL
 #define        LOG_PRINTF      -1      /* pseudo-priority to indicate use of printf */
 #endif
 #ifdef KERNEL
 #define        LOG_PRINTF      -1      /* pseudo-priority to indicate use of printf */
 #endif


@@ -176,3 +127,59 @@ void       vsyslog __P((int, const char *, va_list));
 __END_DECLS
 
 #endif /* !KERNEL */
 __END_DECLS
 
 #endif /* !KERNEL */

+#endif /* _SYS_SYSLOG_H_ */
+
+/*
+ * Following code must NOT be protected...
+ */
+#ifdef SYSLOG_NAMES
+#define        INTERNAL_NOPRI  0x10    /* the "no priority" priority */
+                               /* mark "facility" */
+#define        INTERNAL_MARK   LOG_MAKEPRI(LOG_NFACILITIES, 0)
+typedef struct _code {
+       char    *c_name;
+       int     c_val;
+} CODE;
+
+CODE prioritynames[] = {
+       "alert",        LOG_ALERT,
+       "crit",         LOG_CRIT,
+       "debug",        LOG_DEBUG,
+       "emerg",        LOG_EMERG,
+       "err",          LOG_ERR,
+       "error",        LOG_ERR,                /* DEPRECATED */
+       "info",         LOG_INFO,
+       "none",         INTERNAL_NOPRI,         /* INTERNAL */
+       "notice",       LOG_NOTICE,
+       "panic",        LOG_EMERG,              /* DEPRECATED */
+       "warn",         LOG_WARNING,            /* DEPRECATED */
+       "warning",      LOG_WARNING,
+       NULL,           -1,
+};
+
+CODE facilitynames[] = {
+       "auth",         LOG_AUTH,
+       "authpriv",     LOG_AUTHPRIV,
+       "cron",         LOG_CRON,
+       "daemon",       LOG_DAEMON,
+       "kern",         LOG_KERN,
+       "lpr",          LOG_LPR,
+       "mail",         LOG_MAIL,
+       "mark",         INTERNAL_MARK,          /* INTERNAL */
+       "news",         LOG_NEWS,
+       "security",     LOG_AUTH,               /* DEPRECATED */
+       "syslog",       LOG_SYSLOG,
+       "user",         LOG_USER,
+       "uucp",         LOG_UUCP,
+       "local0",       LOG_LOCAL0,
+       "local1",       LOG_LOCAL1,
+       "local2",       LOG_LOCAL2,
+       "local3",       LOG_LOCAL3,
+       "local4",       LOG_LOCAL4,
+       "local5",       LOG_LOCAL5,
+       "local6",       LOG_LOCAL6,
+       "local7",       LOG_LOCAL7,
+       NULL,           -1,
+};
+#endif
+