projects
/
project
/
ubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
syslog: remove unnecessary sizeof struct between messages
[project/ubox.git]
/
log
/
syslog.c
diff --git
a/log/syslog.c
b/log/syslog.c
index fcc4a74f906a026796a87ed6254c7d1fb14a62bd..856fa60edce459f7cf525384b9d128dbdc8218ad 100644
(file)
--- a/
log/syslog.c
+++ b/
log/syslog.c
@@
-51,7
+51,7
@@
static regex_t pat_tstamp;
static struct log_head*
log_next(struct log_head *h, int size)
{
static struct log_head*
log_next(struct log_head *h, int size)
{
- struct log_head *n = (struct log_head *) &h->data[PAD(size
of(struct log_head) + size
)];
+ struct log_head *n = (struct log_head *) &h->data[PAD(size)];
return (n >= log_end) ? (log) : (n);
}
return (n >= log_end) ? (log) : (n);
}
@@
-66,7
+66,7
@@
log_add(char *buf, int size, int source)
/* bounce out if we don't have init'ed yet (regmatch etc will blow) */
if (!log) {
/* bounce out if we don't have init'ed yet (regmatch etc will blow) */
if (!log) {
- fprintf(stderr, buf);
+ fprintf(stderr,
"%s",
buf);
return;
}
return;
}
@@
-203,7
+203,7
@@
syslog_open(void)
int fd;
unlink(log_dev);
int fd;
unlink(log_dev);
- fd = usock(USOCK_UNIX | USOCK_UDP |
USOCK_SERVER | USOCK_NONBLOCK, log_dev, NULL);
+ fd = usock(USOCK_UNIX | USOCK_UDP | USOCK_SERVER | USOCK_NONBLOCK, log_dev, NULL);
if (fd < 0) {
fprintf(stderr,"Failed to open %s\n", log_dev);
return -1;
if (fd < 0) {
fprintf(stderr,"Failed to open %s\n", log_dev);
return -1;
@@
-274,8
+274,11
@@
log_buffer_init(int size)
}
void
}
void
-log_init(
void
)
+log_init(
int _log_size
)
{
{
+ if (_log_size > 0)
+ log_size = _log_size;
+
regcomp(&pat_prio, "^<([0-9]*)>(.*)", REG_EXTENDED);
regcomp(&pat_tstamp, "^\[[ 0]*([0-9]*).([0-9]*)] (.*)", REG_EXTENDED);
regcomp(&pat_prio, "^<([0-9]*)>(.*)", REG_EXTENDED);
regcomp(&pat_tstamp, "^\[[ 0]*([0-9]*).([0-9]*)] (.*)", REG_EXTENDED);
@@
-296,4
+299,7
@@
log_shutdown(void)
ustream_free(&klog.stream);
close(slog.fd.fd);
close(klog.fd.fd);
ustream_free(&klog.stream);
close(slog.fd.fd);
close(klog.fd.fd);
+ free(log);
+ regfree(&pat_prio);
+ regfree(&pat_tstamp);
}
}