summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-01-22 23:32:57 +1100
committerDamien Miller <djm@mindrot.org>2002-01-22 23:32:57 +1100
commit5488b7ec4edc06e344f899933cab615d7b925b70 (patch)
treeb4ed84a7bf586b1abf13fe6d02be8fa360cd0c48
parentc497e38ce626a35f68844c7667adae6434be7d6c (diff)
- stevesk@cvs.openbsd.org 2002/01/17 04:27:37
[log.c] casts to silence enum type warnings for bugzilla bug 37; ok markus@
-rw-r--r--ChangeLog5
-rw-r--r--log.c6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b9afc1801..ee72e9d43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -198,6 +198,9 @@
198 - stevesk@cvs.openbsd.org 2002/01/16 17:55:33 198 - stevesk@cvs.openbsd.org 2002/01/16 17:55:33
199 [ssh_config] 199 [ssh_config]
200 correct some commented defaults. add Ciphers default. ok markus@ 200 correct some commented defaults. add Ciphers default. ok markus@
201 - stevesk@cvs.openbsd.org 2002/01/17 04:27:37
202 [log.c]
203 casts to silence enum type warnings for bugzilla bug 37; ok markus@
201 204
20220020121 20520020121
203 - (djm) Rework ssh-rand-helper: 206 - (djm) Rework ssh-rand-helper:
@@ -7345,4 +7348,4 @@
7345 - Wrote replacements for strlcpy and mkdtemp 7348 - Wrote replacements for strlcpy and mkdtemp
7346 - Released 1.0pre1 7349 - Released 1.0pre1
7347 7350
7348$Id: ChangeLog,v 1.1778 2002/01/22 12:32:39 djm Exp $ 7351$Id: ChangeLog,v 1.1779 2002/01/22 12:32:57 djm Exp $
diff --git a/log.c b/log.c
index 5e45f5559..d1d13dd53 100644
--- a/log.c
+++ b/log.c
@@ -34,7 +34,7 @@
34 */ 34 */
35 35
36#include "includes.h" 36#include "includes.h"
37RCSID("$OpenBSD: log.c,v 1.19 2001/12/19 07:18:56 deraadt Exp $"); 37RCSID("$OpenBSD: log.c,v 1.20 2002/01/17 04:27:37 stevesk Exp $");
38 38
39#include "log.h" 39#include "log.h"
40#include "xmalloc.h" 40#include "xmalloc.h"
@@ -68,7 +68,7 @@ static struct {
68 { "LOCAL5", SYSLOG_FACILITY_LOCAL5 }, 68 { "LOCAL5", SYSLOG_FACILITY_LOCAL5 },
69 { "LOCAL6", SYSLOG_FACILITY_LOCAL6 }, 69 { "LOCAL6", SYSLOG_FACILITY_LOCAL6 },
70 { "LOCAL7", SYSLOG_FACILITY_LOCAL7 }, 70 { "LOCAL7", SYSLOG_FACILITY_LOCAL7 },
71 { NULL, 0 } 71 { NULL, (SyslogFacility)0 }
72}; 72};
73 73
74static struct { 74static struct {
@@ -85,7 +85,7 @@ static struct {
85 { "DEBUG1", SYSLOG_LEVEL_DEBUG1 }, 85 { "DEBUG1", SYSLOG_LEVEL_DEBUG1 },
86 { "DEBUG2", SYSLOG_LEVEL_DEBUG2 }, 86 { "DEBUG2", SYSLOG_LEVEL_DEBUG2 },
87 { "DEBUG3", SYSLOG_LEVEL_DEBUG3 }, 87 { "DEBUG3", SYSLOG_LEVEL_DEBUG3 },
88 { NULL, 0 } 88 { NULL, (LogLevel)0 }
89}; 89};
90 90
91static void do_log(LogLevel level, const char *fmt, va_list args); 91static void do_log(LogLevel level, const char *fmt, va_list args);