diff options
Diffstat (limited to 'src/grp-journal-remote')
10 files changed, 57 insertions, 57 deletions
diff --git a/src/grp-journal-remote/microhttpd-util.c b/src/grp-journal-remote/microhttpd-util.c index c65c43186f..99d6f32a2a 100644 --- a/src/grp-journal-remote/microhttpd-util.c +++ b/src/grp-journal-remote/microhttpd-util.c @@ -27,13 +27,13 @@ #include <gnutls/x509.h> #endif -#include "alloc-util.h" -#include "log.h" -#include "macro.h" +#include "basic/alloc-util.h" +#include "basic/log.h" +#include "basic/macro.h" #include "microhttpd-util.h" -#include "string-util.h" -#include "strv.h" -#include "util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/util.h" void microhttpd_logger(void *arg, const char *fmt, va_list ap) { char *f; diff --git a/src/grp-journal-remote/microhttpd-util.h b/src/grp-journal-remote/microhttpd-util.h index ea160f212b..178e78f892 100644 --- a/src/grp-journal-remote/microhttpd-util.h +++ b/src/grp-journal-remote/microhttpd-util.h @@ -22,7 +22,7 @@ #include <microhttpd.h> #include <stdarg.h> -#include "macro.h" +#include "basic/macro.h" /* Compatiblity with libmicrohttpd < 0.9.38 */ #ifndef MHD_HTTP_NOT_ACCEPTABLE diff --git a/src/grp-journal-remote/systemd-journal-gatewayd/journal-gatewayd.c b/src/grp-journal-remote/systemd-journal-gatewayd/journal-gatewayd.c index 1cfb5e2c9c..2e21f9ecb7 100644 --- a/src/grp-journal-remote/systemd-journal-gatewayd/journal-gatewayd.c +++ b/src/grp-journal-remote/systemd-journal-gatewayd/journal-gatewayd.c @@ -31,17 +31,17 @@ #include <systemd/sd-daemon.h> #include <systemd/sd-journal.h> -#include "alloc-util.h" -#include "bus-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "hostname-util.h" -#include "log.h" -#include "logs-show.h" +#include "basic/alloc-util.h" +#include "shared/bus-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/hostname-util.h" +#include "basic/log.h" +#include "shared/logs-show.h" #include "microhttpd-util.h" -#include "parse-util.h" -#include "sigbus.h" -#include "util.h" +#include "basic/parse-util.h" +#include "basic/sigbus.h" +#include "basic/util.h" #define JOURNAL_WAIT_TIMEOUT (10*USEC_PER_SEC) diff --git a/src/grp-journal-remote/systemd-journal-remote/journal-remote-parse.c b/src/grp-journal-remote/systemd-journal-remote/journal-remote-parse.c index 9ba9ee3fc0..ec5358fb97 100644 --- a/src/grp-journal-remote/systemd-journal-remote/journal-remote-parse.c +++ b/src/grp-journal-remote/systemd-journal-remote/journal-remote-parse.c @@ -17,12 +17,12 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "alloc-util.h" -#include "fd-util.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" #include "journal-remote-parse.h" #include "journald-native.h" -#include "parse-util.h" -#include "string-util.h" +#include "basic/parse-util.h" +#include "basic/string-util.h" #define LINE_CHUNK 8*1024u diff --git a/src/grp-journal-remote/systemd-journal-remote/journal-remote-write.c b/src/grp-journal-remote/systemd-journal-remote/journal-remote-write.c index 7bba52566e..82292fd240 100644 --- a/src/grp-journal-remote/systemd-journal-remote/journal-remote-write.c +++ b/src/grp-journal-remote/systemd-journal-remote/journal-remote-write.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "journal-remote.h" int iovw_put(struct iovec_wrapper *iovw, void* data, size_t len) { diff --git a/src/grp-journal-remote/systemd-journal-remote/journal-remote.c b/src/grp-journal-remote/systemd-journal-remote/journal-remote.c index 9b4d12d336..6ea7adabb0 100644 --- a/src/grp-journal-remote/systemd-journal-remote/journal-remote.c +++ b/src/grp-journal-remote/systemd-journal-remote/journal-remote.c @@ -33,25 +33,25 @@ #include <systemd/sd-daemon.h> -#include "alloc-util.h" -#include "conf-parser.h" -#include "def.h" -#include "escape.h" -#include "fd-util.h" -#include "fileio.h" +#include "basic/alloc-util.h" +#include "shared/conf-parser.h" +#include "basic/def.h" +#include "basic/escape.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" #include "journal-file.h" #include "journal-remote-write.h" #include "journal-remote.h" #include "journald-native.h" -#include "macro.h" -#include "parse-util.h" -#include "signal-util.h" -#include "socket-util.h" -#include "stat-util.h" -#include "stdio-util.h" -#include "string-table.h" -#include "string-util.h" -#include "strv.h" +#include "basic/macro.h" +#include "basic/parse-util.h" +#include "basic/signal-util.h" +#include "basic/socket-util.h" +#include "basic/stat-util.h" +#include "basic/stdio-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/strv.h" #define REMOTE_JOURNAL_PATH "/var/log/journal/remote" diff --git a/src/grp-journal-remote/systemd-journal-remote/journal-remote.h b/src/grp-journal-remote/systemd-journal-remote/journal-remote.h index 58487e498a..2e8d5999b0 100644 --- a/src/grp-journal-remote/systemd-journal-remote/journal-remote.h +++ b/src/grp-journal-remote/systemd-journal-remote/journal-remote.h @@ -21,7 +21,7 @@ #include <systemd/sd-event.h> -#include "hashmap.h" +#include "basic/hashmap.h" #include "journal-remote-parse.h" #include "journal-remote-write.h" #include "microhttpd-util.h" diff --git a/src/grp-journal-remote/systemd-journal-upload/journal-upload-journal.c b/src/grp-journal-remote/systemd-journal-upload/journal-upload-journal.c index aef095c8c9..eddfc384fa 100644 --- a/src/grp-journal-remote/systemd-journal-upload/journal-upload-journal.c +++ b/src/grp-journal-remote/systemd-journal-upload/journal-upload-journal.c @@ -20,11 +20,11 @@ #include <curl/curl.h> #include <stdbool.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "journal-upload.h" -#include "log.h" -#include "utf8.h" -#include "util.h" +#include "basic/log.h" +#include "basic/utf8.h" +#include "basic/util.h" #include <systemd/sd-daemon.h> /** diff --git a/src/grp-journal-remote/systemd-journal-upload/journal-upload.c b/src/grp-journal-remote/systemd-journal-upload/journal-upload.c index e622f6c1e1..643f44cd86 100644 --- a/src/grp-journal-remote/systemd-journal-upload/journal-upload.c +++ b/src/grp-journal-remote/systemd-journal-upload/journal-upload.c @@ -25,21 +25,21 @@ #include <systemd/sd-daemon.h> -#include "alloc-util.h" -#include "conf-parser.h" -#include "def.h" -#include "fd-util.h" -#include "fileio.h" -#include "formats-util.h" -#include "glob-util.h" +#include "basic/alloc-util.h" +#include "shared/conf-parser.h" +#include "basic/def.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/formats-util.h" +#include "basic/glob-util.h" #include "journal-upload.h" -#include "log.h" -#include "mkdir.h" -#include "parse-util.h" -#include "sigbus.h" -#include "signal-util.h" -#include "string-util.h" -#include "util.h" +#include "basic/log.h" +#include "basic/mkdir.h" +#include "basic/parse-util.h" +#include "basic/sigbus.h" +#include "basic/signal-util.h" +#include "basic/string-util.h" +#include "basic/util.h" #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-upload.pem" #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-upload.pem" diff --git a/src/grp-journal-remote/systemd-journal-upload/journal-upload.h b/src/grp-journal-remote/systemd-journal-upload/journal-upload.h index 4a521bf78f..0b0336c84b 100644 --- a/src/grp-journal-remote/systemd-journal-upload/journal-upload.h +++ b/src/grp-journal-remote/systemd-journal-upload/journal-upload.h @@ -4,7 +4,7 @@ #include <systemd/sd-event.h> #include <systemd/sd-journal.h> -#include "time-util.h" +#include "basic/time-util.h" typedef enum { ENTRY_CURSOR = 0, /* Nothing actually written yet. */ |