chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cryptsetup: RequiresMountsFor if source is a file
[elogind.git]
/
src
/
journal
/
journald-syslog.c
diff --git
a/src/journal/journald-syslog.c
b/src/journal/journald-syslog.c
index d3e0f6f6c11868e4dcf5a9bd8c88f4d063a170c0..afddca3630097162bc7c6677efaa3b309f1d263b 100644
(file)
--- a/
src/journal/journald-syslog.c
+++ b/
src/journal/journald-syslog.c
@@
-25,7
+25,7
@@
#include "systemd/sd-messages.h"
#include "socket-util.h"
#include "systemd/sd-messages.h"
#include "socket-util.h"
-#include "journald.h"
+#include "journald
-server
.h"
#include "journald-syslog.h"
#include "journald-kmsg.h"
#include "journald-console.h"
#include "journald-syslog.h"
#include "journald-kmsg.h"
#include "journald-console.h"
@@
-185,7
+185,7
@@
int syslog_fixup_facility(int priority) {
return priority;
}
return priority;
}
-
void
syslog_parse_identifier(const char **buf, char **identifier, char **pid) {
+
size_t
syslog_parse_identifier(const char **buf, char **identifier, char **pid) {
const char *p;
char *t;
size_t l, e;
const char *p;
char *t;
size_t l, e;
@@
-201,7
+201,7
@@
void syslog_parse_identifier(const char **buf, char **identifier, char **pid) {
if (l <= 0 ||
p[l-1] != ':')
if (l <= 0 ||
p[l-1] != ':')
- return;
+ return
0
;
e = l;
l--;
e = l;
l--;
@@
-231,8
+231,9
@@
void syslog_parse_identifier(const char **buf, char **identifier, char **pid) {
if (t)
*identifier = t;
if (t)
*identifier = t;
+ e += strspn(p + e, WHITESPACE);
*buf = p + e;
*buf = p + e;
-
*buf += strspn(*buf, WHITESPACE)
;
+
return e
;
}
void syslog_parse_priority(char **p, int *priority) {
}
void syslog_parse_priority(char **p, int *priority) {