[systemd-commits] 2 commits - Makefile.am src/journal src/libsystemd-journal.sym src/util.c

[Lennart Poettering]

 Makefile.am                        |    4 +--
 src/journal/libsystemd-journal.sym |   45 +++++++++++++++++++++++++++++++++++++
 src/libsystemd-journal.sym         |   45 -------------------------------------
 src/util.c                         |    2 -
 4 files changed, 48 insertions(+), 48 deletions(-)

New commits:
commit c0f99c21f4d5ccbdedf5f648258ae3483566c847
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Dec 31 03:35:45 2011 +0100

    util: fix warning

diff --git a/src/util.c b/src/util.c
index 0d1d16d..de36d15 100644
--- a/src/util.c
+++ b/src/util.c
@@ -5942,7 +5942,7 @@ unsigned long cap_last_cap(void) {
 }
 
 char *format_bytes(char *buf, size_t l, off_t t) {
-        int i;
+        unsigned i;
 
         static const struct {
                 const char *suffix;

commit e81e801af69f11cc13ed1952b48ce8b0cd066559
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Dec 31 03:35:38 2011 +0100

    journal: move symver file into subdirectory

diff --git a/Makefile.am b/Makefile.am
index da2e980..5255fcc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -522,7 +522,7 @@ EXTRA_DIST = \
 	src/libsystemd-daemon.sym \
 	src/login/libsystemd-login.sym \
 	src/libsystemd-id128.sym \
-	src/libsystemd-journal.sym \
+	src/journal/libsystemd-journal.sym \
 	introspect.awk \
 	src/73-seat-late.rules.in \
         src/99-systemd.rules.in \
@@ -1791,7 +1791,7 @@ libsystemd_journal_la_CFLAGS = \
 libsystemd_journal_la_LDFLAGS = \
         -shared \
         -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
-        -Wl,--version-script=$(top_srcdir)/src/libsystemd-journal.sym
+        -Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym
 
 libsystemd_journal_la_LIBADD = \
 	libsystemd-basic.la \
diff --git a/src/journal/libsystemd-journal.sym b/src/journal/libsystemd-journal.sym
new file mode 100644
index 0000000..7653880
--- /dev/null
+++ b/src/journal/libsystemd-journal.sym
@@ -0,0 +1,45 @@
+/***
+  This file is part of systemd.
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+***/
+
+/* Original symbols from systemd v38 */
+
+LIBSYSTEMD_JOURNAL_38 {
+global:
+        sd_journal_print;
+        sd_journal_printv;
+        sd_journal_send;
+        sd_journal_sendv;
+        sd_journal_stream_fd;
+        sd_journal_open;
+        sd_journal_close;
+        sd_journal_previous;
+        sd_journal_next;
+        sd_journal_previous_skip;
+        sd_journal_next_skip;
+        sd_journal_get_realtime_usec;
+        sd_journal_get_monotonic_usec;
+        sd_journal_get_data;
+        sd_journal_enumerate_data;
+        sd_journal_restart_data;
+        sd_journal_add_match;
+        sd_journal_flush_matches;
+        sd_journal_seek_head;
+        sd_journal_seek_tail;
+        sd_journal_seek_monotonic_usec;
+        sd_journal_seek_realtime_usec;
+        sd_journal_seek_cursor;
+        sd_journal_get_cursor;
+        sd_journal_query_unique;
+        sd_journal_enumerate_unique;
+        sd_journal_restart_unique;
+        sd_journal_get_fd;
+        sd_journal_process;
+local:
+        *;
+};
diff --git a/src/libsystemd-journal.sym b/src/libsystemd-journal.sym
deleted file mode 100644
index 7653880..0000000
--- a/src/libsystemd-journal.sym
+++ /dev/null
@@ -1,45 +0,0 @@
-/***
-  This file is part of systemd.
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-***/
-
-/* Original symbols from systemd v38 */
-
-LIBSYSTEMD_JOURNAL_38 {
-global:
-        sd_journal_print;
-        sd_journal_printv;
-        sd_journal_send;
-        sd_journal_sendv;
-        sd_journal_stream_fd;
-        sd_journal_open;
-        sd_journal_close;
-        sd_journal_previous;
-        sd_journal_next;
-        sd_journal_previous_skip;
-        sd_journal_next_skip;
-        sd_journal_get_realtime_usec;
-        sd_journal_get_monotonic_usec;
-        sd_journal_get_data;
-        sd_journal_enumerate_data;
-        sd_journal_restart_data;
-        sd_journal_add_match;
-        sd_journal_flush_matches;
-        sd_journal_seek_head;
-        sd_journal_seek_tail;
-        sd_journal_seek_monotonic_usec;
-        sd_journal_seek_realtime_usec;
-        sd_journal_seek_cursor;
-        sd_journal_get_cursor;
-        sd_journal_query_unique;
-        sd_journal_enumerate_unique;
-        sd_journal_restart_unique;
-        sd_journal_get_fd;
-        sd_journal_process;
-local:
-        *;
-};