chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nss-myhostname: ensure that glibc's assert is used
[elogind.git]
/
src
/
journal
/
coredumpctl.c
diff --git
a/src/journal/coredumpctl.c
b/src/journal/coredumpctl.c
index 4f0ed5839776f24d62c4ee1efa907e74fb14d18f..0bbfff2ecdc30aec0afac4c0eb7590822b7ac048 100644
(file)
--- a/
src/journal/coredumpctl.c
+++ b/
src/journal/coredumpctl.c
@@
-34,6
+34,8
@@
#include "log.h"
#include "path-util.h"
#include "pager.h"
#include "log.h"
#include "path-util.h"
#include "pager.h"
+#include "macro.h"
+#include "journal-internal.h"
static enum {
ACTION_NONE,
static enum {
ACTION_NONE,
@@
-42,7
+44,6
@@
static enum {
ACTION_GDB,
} arg_action = ACTION_LIST;
ACTION_GDB,
} arg_action = ACTION_LIST;
-static Set *matches = NULL;
static FILE* output = NULL;
static char* field = NULL;
static FILE* output = NULL;
static char* field = NULL;
@@
-103,7
+104,7
@@
static int add_match(Set *set, const char *match) {
unsigned pid;
const char* prefix;
char *pattern = NULL;
unsigned pid;
const char* prefix;
char *pattern = NULL;
-
char _cleanup_free_
*p = NULL;
+
_cleanup_free_ char
*p = NULL;
if (strchr(match, '='))
prefix = "";
if (strchr(match, '='))
prefix = "";
@@
-139,7
+140,7
@@
fail:
return r;
}
return r;
}
-static int parse_argv(int argc, char *argv[]) {
+static int parse_argv(int argc, char *argv[]
, Set *matches
) {
enum {
ARG_VERSION = 0x100,
ARG_NO_PAGER,
enum {
ARG_VERSION = 0x100,
ARG_NO_PAGER,
@@
-170,7
+171,6
@@
static int parse_argv(int argc, char *argv[]) {
case ARG_VERSION:
puts(PACKAGE_STRING);
case ARG_VERSION:
puts(PACKAGE_STRING);
- puts(DISTRIBUTION);
puts(SYSTEMD_FEATURES);
arg_action = ACTION_NONE;
return 0;
puts(SYSTEMD_FEATURES);
arg_action = ACTION_NONE;
return 0;
@@
-269,7
+269,7
@@
static int retrieve(const void *data,
}
static void print_field(FILE* file, sd_journal *j) {
}
static void print_field(FILE* file, sd_journal *j) {
-
const char _cleanup_free_
*value = NULL;
+
_cleanup_free_ const char
*value = NULL;
const void *d;
size_t l;
const void *d;
size_t l;
@@
-282,7
+282,7
@@
static void print_field(FILE* file, sd_journal *j) {
}
static int print_entry(FILE* file, sd_journal *j, int had_legend) {
}
static int print_entry(FILE* file, sd_journal *j, int had_legend) {
- const char _cleanup_free_
+ _cleanup_free_ const char
*pid = NULL, *uid = NULL, *gid = NULL,
*sgnl = NULL, *exe = NULL;
const void *d;
*pid = NULL, *uid = NULL, *gid = NULL,
*sgnl = NULL, *exe = NULL;
const void *d;
@@
-520,10
+520,11
@@
finish:
}
int main(int argc, char *argv[]) {
}
int main(int argc, char *argv[]) {
-
sd_journal
*j = NULL;
+
_cleanup_journal_close_ sd_journal
*j = NULL;
const char* match;
Iterator it;
int r = 0;
const char* match;
Iterator it;
int r = 0;
+ _cleanup_set_free_free_ Set *matches = NULL;
setlocale(LC_ALL, "");
log_parse_environment();
setlocale(LC_ALL, "");
log_parse_environment();
@@
-535,7
+536,7
@@
int main(int argc, char *argv[]) {
goto end;
}
goto end;
}
- r = parse_argv(argc, argv);
+ r = parse_argv(argc, argv
, matches
);
if (r < 0)
goto end;
if (r < 0)
goto end;
@@
-561,7
+562,7
@@
int main(int argc, char *argv[]) {
case ACTION_LIST:
if (!arg_no_pager)
case ACTION_LIST:
if (!arg_no_pager)
- pager_open();
+ pager_open(
false
);
r = dump_list(j);
break;
r = dump_list(j);
break;
@@
-579,11
+580,6
@@
int main(int argc, char *argv[]) {
}
end:
}
end:
- if (j)
- sd_journal_close(j);
-
- set_free_free(matches);
-
pager_close();
if (output)
pager_close();
if (output)