]> git.proxmox.com Git - systemd.git/commitdiff
journald: remove unused variable
authorMichael Biebl <biebl@debian.org>
Sat, 28 Jun 2014 11:21:25 +0000 (13:21 +0200)
committerMichael Biebl <biebl@debian.org>
Sat, 28 Jun 2014 11:22:19 +0000 (13:22 +0200)
debian/patches/journal-handle-multiline-syslog-messages.patch

index 36628581a6b5a31f1d4d443d82187b894edb7a6b..354ffb296a662836d5a10435e403ac92cec9a841 100644 (file)
@@ -51,17 +51,22 @@ appears in /var/log/messages.
    Sep  7 19:19:39 localhost test2: aaa aaa
 
 https://bugzilla.redhat.com/show_bug.cgi?id=855313
+
+journald: remove unused variable
 ---
- src/journal/journald-server.c | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
+ src/journal/journald-server.c | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
 
 diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index 01f23ce..5c607b6 100644
+index 01f23ce..a62aa5e 100644
 --- a/src/journal/journald-server.c
 +++ b/src/journal/journald-server.c
-@@ -1142,12 +1142,7 @@ int process_event(Server *s, struct epoll_event *ev) {
-                                 char *e;
+@@ -1139,15 +1139,8 @@ int process_event(Server *s, struct epoll_event *ev) {
+                         }
  
+                         if (ev->data.fd == s->syslog_fd) {
+-                                char *e;
+-
                                  if (n > 0 && n_fds == 0) {
 -                                        e = memchr(s->buffer, '\n', n);
 -                                        if (e)