summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-07-07 22:14:55 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-07-07 22:14:55 +0000
commit8e8ef2a3ffb03d48bb9d6b894152497810f19044 (patch)
treeaf57e22aa2c967912baaf253beaac22981fd7ef8
parent2bf759cba5f24c09e450bb8fcabfd9e6e32c137d (diff)
- deraadt@cvs.openbsd.org 2002/07/06 01:00:49
[log.c] KNF
-rw-r--r--ChangeLog5
-rw-r--r--log.c10
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0073f52c0..923f44463 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@
16 [key.c monitor_wrap.c ssh-dss.c ssh-rsa.c] 16 [key.c monitor_wrap.c ssh-dss.c ssh-rsa.c]
17 don't allocate, copy, and discard if there is not interested in the data; 17 don't allocate, copy, and discard if there is not interested in the data;
18 ok deraadt@ 18 ok deraadt@
19 - deraadt@cvs.openbsd.org 2002/07/06 01:00:49
20 [log.c]
21 KNF
19 22
2020020705 2320020705
21 - (tim) [configure.ac] AIX 4.2.1 has authenticate() in libs. 24 - (tim) [configure.ac] AIX 4.2.1 has authenticate() in libs.
@@ -1299,4 +1302,4 @@
1299 - (stevesk) entropy.c: typo in debug message 1302 - (stevesk) entropy.c: typo in debug message
1300 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1303 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1301 1304
1302$Id: ChangeLog,v 1.2344 2002/07/07 22:13:31 mouring Exp $ 1305$Id: ChangeLog,v 1.2345 2002/07/07 22:14:55 mouring Exp $
diff --git a/log.c b/log.c
index c88f632c9..8c09ec1b2 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.22 2002/02/22 12:20:34 markus Exp $"); 37RCSID("$OpenBSD: log.c,v 1.23 2002/07/06 01:00:49 deraadt Exp $");
38 38
39#include "log.h" 39#include "log.h"
40#include "xmalloc.h" 40#include "xmalloc.h"
@@ -92,6 +92,7 @@ SyslogFacility
92log_facility_number(char *name) 92log_facility_number(char *name)
93{ 93{
94 int i; 94 int i;
95
95 if (name != NULL) 96 if (name != NULL)
96 for (i = 0; log_facilities[i].name; i++) 97 for (i = 0; log_facilities[i].name; i++)
97 if (strcasecmp(log_facilities[i].name, name) == 0) 98 if (strcasecmp(log_facilities[i].name, name) == 0)
@@ -103,6 +104,7 @@ LogLevel
103log_level_number(char *name) 104log_level_number(char *name)
104{ 105{
105 int i; 106 int i;
107
106 if (name != NULL) 108 if (name != NULL)
107 for (i = 0; log_levels[i].name; i++) 109 for (i = 0; log_levels[i].name; i++)
108 if (strcasecmp(log_levels[i].name, name) == 0) 110 if (strcasecmp(log_levels[i].name, name) == 0)
@@ -116,6 +118,7 @@ void
116error(const char *fmt,...) 118error(const char *fmt,...)
117{ 119{
118 va_list args; 120 va_list args;
121
119 va_start(args, fmt); 122 va_start(args, fmt);
120 do_log(SYSLOG_LEVEL_ERROR, fmt, args); 123 do_log(SYSLOG_LEVEL_ERROR, fmt, args);
121 va_end(args); 124 va_end(args);
@@ -127,6 +130,7 @@ void
127log(const char *fmt,...) 130log(const char *fmt,...)
128{ 131{
129 va_list args; 132 va_list args;
133
130 va_start(args, fmt); 134 va_start(args, fmt);
131 do_log(SYSLOG_LEVEL_INFO, fmt, args); 135 do_log(SYSLOG_LEVEL_INFO, fmt, args);
132 va_end(args); 136 va_end(args);
@@ -138,6 +142,7 @@ void
138verbose(const char *fmt,...) 142verbose(const char *fmt,...)
139{ 143{
140 va_list args; 144 va_list args;
145
141 va_start(args, fmt); 146 va_start(args, fmt);
142 do_log(SYSLOG_LEVEL_VERBOSE, fmt, args); 147 do_log(SYSLOG_LEVEL_VERBOSE, fmt, args);
143 va_end(args); 148 va_end(args);
@@ -149,6 +154,7 @@ void
149debug(const char *fmt,...) 154debug(const char *fmt,...)
150{ 155{
151 va_list args; 156 va_list args;
157
152 va_start(args, fmt); 158 va_start(args, fmt);
153 do_log(SYSLOG_LEVEL_DEBUG1, fmt, args); 159 do_log(SYSLOG_LEVEL_DEBUG1, fmt, args);
154 va_end(args); 160 va_end(args);
@@ -158,6 +164,7 @@ void
158debug2(const char *fmt,...) 164debug2(const char *fmt,...)
159{ 165{
160 va_list args; 166 va_list args;
167
161 va_start(args, fmt); 168 va_start(args, fmt);
162 do_log(SYSLOG_LEVEL_DEBUG2, fmt, args); 169 do_log(SYSLOG_LEVEL_DEBUG2, fmt, args);
163 va_end(args); 170 va_end(args);
@@ -167,6 +174,7 @@ void
167debug3(const char *fmt,...) 174debug3(const char *fmt,...)
168{ 175{
169 va_list args; 176 va_list args;
177
170 va_start(args, fmt); 178 va_start(args, fmt);
171 do_log(SYSLOG_LEVEL_DEBUG3, fmt, args); 179 do_log(SYSLOG_LEVEL_DEBUG3, fmt, args);
172 va_end(args); 180 va_end(args);