[systemd-commits] src/journal src/kmod-setup.c src/logs-show.c src/logs-show.h src/systemctl.c
Lennart Poettering
lennart at kemper.freedesktop.org
Thu Mar 15 12:49:34 PDT 2012
src/journal/journalctl.c | 2 +-
src/journal/journald.c | 9 +++------
src/kmod-setup.c | 2 +-
src/logs-show.c | 42 +++++++++++++++++++-----------------------
src/logs-show.h | 3 +--
src/systemctl.c | 2 +-
6 files changed, 26 insertions(+), 34 deletions(-)
New commits:
commit 34a35eced40860181757abe5ec00ac0e5d8d0225
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Mar 15 20:49:25 2012 +0100
a couple of fixes to make llvm-analyze quiet
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 089086e..d556072 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -284,7 +284,7 @@ int main(int argc, char *argv[]) {
line ++;
- r = output_journal(j, arg_output, line, arg_show_all);
+ r = output_journal(j, arg_output, line, 0, arg_show_all);
if (r < 0)
goto finish;
diff --git a/src/journal/journald.c b/src/journal/journald.c
index 74a58b0..baad3ab 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -154,13 +154,10 @@ static uint64_t available_space(Server *s) {
for (;;) {
struct stat st;
struct dirent buf, *de;
- int k;
- k = readdir_r(d, &buf, &de);
- if (k != 0) {
- r = -k;
- goto finish;
- }
+ r = readdir_r(d, &buf, &de);
+ if (r != 0)
+ break;
if (!de)
break;
diff --git a/src/kmod-setup.c b/src/kmod-setup.c
index dc35156..debf871 100644
--- a/src/kmod-setup.c
+++ b/src/kmod-setup.c
@@ -90,7 +90,7 @@ int kmod_setup(void) {
}
if (ctx)
- ctx = kmod_unref(ctx);
+ kmod_unref(ctx);
return 0;
}
diff --git a/src/logs-show.c b/src/logs-show.c
index f023f0a..f71c6b0 100644
--- a/src/logs-show.c
+++ b/src/logs-show.c
@@ -86,7 +86,7 @@ static bool shall_print(bool show_all, char *p, size_t l) {
return true;
}
-static int output_short(sd_journal *j, unsigned line, bool show_all, bool monotonic_mode) {
+static int output_short(sd_journal *j, unsigned line, unsigned n_columns, bool show_all, bool monotonic_mode) {
int r;
const void *data;
size_t length;
@@ -228,12 +228,12 @@ static int output_short(sd_journal *j, unsigned line, bool show_all, bool monoto
else if (contains_unprintable(message, message_len)) {
char bytes[FORMAT_BYTES_MAX];
printf(": [%s blob data]\n", format_bytes(bytes, sizeof(bytes), message_len));
- } else if (message_len + n < columns())
+ } else if (message_len + n < n_columns)
printf(": %.*s\n", (int) message_len, message);
- else if (n < columns()) {
+ else if (n < n_columns) {
char *e;
- e = ellipsize_mem(message, message_len, columns() - n - 2, 90);
+ e = ellipsize_mem(message, message_len, n_columns - n - 2, 90);
if (!e)
printf(": %.*s\n", (int) message_len, message);
@@ -259,15 +259,15 @@ finish:
return r;
}
-static int output_short_realtime(sd_journal *j, unsigned line, bool show_all) {
- return output_short(j, line, show_all, false);
+static int output_short_realtime(sd_journal *j, unsigned line, unsigned n_columns, bool show_all) {
+ return output_short(j, line, n_columns, show_all, false);
}
-static int output_short_monotonic(sd_journal *j, unsigned line, bool show_all) {
- return output_short(j, line, show_all, true);
+static int output_short_monotonic(sd_journal *j, unsigned line, unsigned n_columns, bool show_all) {
+ return output_short(j, line, n_columns, show_all, true);
}
-static int output_verbose(sd_journal *j, unsigned line, bool show_all) {
+static int output_verbose(sd_journal *j, unsigned line, unsigned n_columns, bool show_all) {
const void *data;
size_t length;
char *cursor;
@@ -318,7 +318,7 @@ static int output_verbose(sd_journal *j, unsigned line, bool show_all) {
return 0;
}
-static int output_export(sd_journal *j, unsigned line, bool show_all) {
+static int output_export(sd_journal *j, unsigned line, unsigned n_columns, bool show_all) {
sd_id128_t boot_id;
char sid[33];
int r;
@@ -424,7 +424,7 @@ static void json_escape(const char* p, size_t l) {
}
}
-static int output_json(sd_journal *j, unsigned line, bool show_all) {
+static int output_json(sd_journal *j, unsigned line, unsigned n_columns, bool show_all) {
uint64_t realtime, monotonic;
char *cursor;
const void *data;
@@ -491,7 +491,7 @@ static int output_json(sd_journal *j, unsigned line, bool show_all) {
return 0;
}
-static int output_cat(sd_journal *j, unsigned line, bool show_all) {
+static int output_cat(sd_journal *j, unsigned line, unsigned n_columns, bool show_all) {
const void *data;
size_t l;
int r;
@@ -512,7 +512,7 @@ static int output_cat(sd_journal *j, unsigned line, bool show_all) {
return 0;
}
-static int (*output_funcs[_OUTPUT_MODE_MAX])(sd_journal*j, unsigned line, bool show_all) = {
+static int (*output_funcs[_OUTPUT_MODE_MAX])(sd_journal*j, unsigned line, unsigned n_columns, bool show_all) = {
[OUTPUT_SHORT] = output_short_realtime,
[OUTPUT_SHORT_MONOTONIC] = output_short_monotonic,
[OUTPUT_VERBOSE] = output_verbose,
@@ -521,17 +521,19 @@ static int (*output_funcs[_OUTPUT_MODE_MAX])(sd_journal*j, unsigned line, bool s
[OUTPUT_CAT] = output_cat
};
-int output_journal(sd_journal *j, OutputMode mode, unsigned line, bool show_all) {
+int output_journal(sd_journal *j, OutputMode mode, unsigned line, unsigned n_columns, bool show_all) {
assert(mode >= 0);
assert(mode < _OUTPUT_MODE_MAX);
- return output_funcs[mode](j, line, show_all);
+ if (n_columns <= 0)
+ n_columns = columns();
+
+ return output_funcs[mode](j, line, n_columns, show_all);
}
int show_journal_by_unit(
const char *unit,
OutputMode mode,
- const char *prefix,
unsigned n_columns,
usec_t not_before,
unsigned how_many,
@@ -558,12 +560,6 @@ int show_journal_by_unit(
if (how_many <= 0)
return 0;
- if (n_columns <= 0)
- n_columns = columns();
-
- if (!prefix)
- prefix = "";
-
if (asprintf(&m, "_SYSTEMD_UNIT=%s", unit) < 0) {
r = -ENOMEM;
goto finish;
@@ -625,7 +621,7 @@ int show_journal_by_unit(
line ++;
- r = output_journal(j, mode, line, show_all);
+ r = output_journal(j, mode, line, n_columns, show_all);
if (r < 0)
goto finish;
}
diff --git a/src/logs-show.h b/src/logs-show.h
index abb82c8..db9c7e3 100644
--- a/src/logs-show.h
+++ b/src/logs-show.h
@@ -39,12 +39,11 @@ typedef enum OutputMode {
_OUTPUT_MODE_INVALID = -1
} OutputMode;
-int output_journal(sd_journal *j, OutputMode mode, unsigned line, bool show_all);
+int output_journal(sd_journal *j, OutputMode mode, unsigned line, unsigned n_columns, bool show_all);
int show_journal_by_unit(
const char *unit,
OutputMode mode,
- const char *prefix,
unsigned n_columns,
usec_t not_before,
unsigned how_many,
diff --git a/src/systemctl.c b/src/systemctl.c
index 8f99a72..f51085f 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -2375,7 +2375,7 @@ static void print_status_info(UnitStatusInfo *i) {
if (i->id && arg_transport != TRANSPORT_SSH) {
printf("\n");
- show_journal_by_unit(i->id, arg_output, NULL, 0, i->inactive_exit_timestamp_monotonic, arg_lines, arg_all, arg_follow);
+ show_journal_by_unit(i->id, arg_output, 0, i->inactive_exit_timestamp_monotonic, arg_lines, arg_all, arg_follow);
}
if (i->need_daemon_reload)
More information about the systemd-commits
mailing list