projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.7' into collectd-5.8
[collectd.git]
/
src
/
syslog.c
diff --git
a/src/syslog.c
b/src/syslog.c
index
6d326ff
..
90a97fb
100644
(file)
--- a/
src/syslog.c
+++ b/
src/syslog.c
@@
-51,15
+51,15
@@
static int sl_config(const char *key, const char *value) {
if (log_level < 0) {
log_level = LOG_INFO;
ERROR("syslog: invalid loglevel [%s] defaulting to 'info'", value);
if (log_level < 0) {
log_level = LOG_INFO;
ERROR("syslog: invalid loglevel [%s] defaulting to 'info'", value);
- return
(1)
;
+ return
1
;
}
} else if (strcasecmp(key, "NotifyLevel") == 0) {
notif_severity = parse_notif_severity(value);
if (notif_severity < 0)
}
} else if (strcasecmp(key, "NotifyLevel") == 0) {
notif_severity = parse_notif_severity(value);
if (notif_severity < 0)
- return
(1)
;
+ return
1
;
}
}
- return
(0)
;
+ return
0
;
} /* int sl_config */
static void sl_log(int severity, const char *msg,
} /* int sl_config */
static void sl_log(int severity, const char *msg,
@@
-73,7
+73,7
@@
static void sl_log(int severity, const char *msg,
static int sl_shutdown(void) {
closelog();
static int sl_shutdown(void) {
closelog();
- return
(0)
;
+ return
0
;
}
static int sl_notification(const notification_t *n,
}
static int sl_notification(const notification_t *n,
@@
-85,7
+85,7
@@
static int sl_notification(const notification_t *n,
int status;
if (n->severity > notif_severity)
int status;
if (n->severity > notif_severity)
- return
(0)
;
+ return
0
;
switch (n->severity) {
case NOTIF_FAILURE:
switch (n->severity) {
case NOTIF_FAILURE:
@@
-107,11
+107,11
@@
static int sl_notification(const notification_t *n,
#define BUFFER_ADD(...) \
do { \
#define BUFFER_ADD(...) \
do { \
- status = s
snprintf(&buf[offset], sizeof(buf) - offset, __VA_ARGS__);
\
+ status = s
nprintf(&buf[offset], sizeof(buf) - offset, __VA_ARGS__);
\
if (status < 1) \
if (status < 1) \
- return
(-1);
\
+ return
-1;
\
else if (((size_t)status) >= (sizeof(buf) - offset)) \
else if (((size_t)status) >= (sizeof(buf) - offset)) \
- return
(-ENOMEM);
\
+ return
-ENOMEM;
\
else \
offset += ((size_t)status); \
} while (0)
else \
offset += ((size_t)status); \
} while (0)
@@
-137,7
+137,7
@@
static int sl_notification(const notification_t *n,
sl_log(log_severity, buf, NULL);
sl_log(log_severity, buf, NULL);
- return
(0)
;
+ return
0
;
} /* int sl_notification */
void module_register(void) {
} /* int sl_notification */
void module_register(void) {