chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test: hook up more tests with make check
[elogind.git]
/
src
/
journal
/
sd-journal.c
diff --git
a/src/journal/sd-journal.c
b/src/journal/sd-journal.c
index 4bcc65c5c717c6c1e8b516e7c43aed9cd841b360..57572d4f0113f988c8d88db5cf105501eb927c76 100644
(file)
--- a/
src/journal/sd-journal.c
+++ b/
src/journal/sd-journal.c
@@
-313,7
+313,7
@@
static char *match_make_string(Match *m) {
}
if (p) {
}
if (p) {
- k = join(p, m->type == MATCH_OR_TERM ? " OR " : " AND ", t, NULL);
+ k =
str
join(p, m->type == MATCH_OR_TERM ? " OR " : " AND ", t, NULL);
free(p);
free(t);
free(p);
free(t);
@@
-330,7
+330,7
@@
static char *match_make_string(Match *m) {
}
if (enclose) {
}
if (enclose) {
- r = join("(", p, ")", NULL);
+ r =
str
join("(", p, ")", NULL);
free(p);
return r;
}
free(p);
return r;
}
@@
-1101,7
+1101,7
@@
static int add_file(sd_journal *j, const char *prefix, const char *filename) {
(startswith(filename, "system@") && endswith(filename, ".journal"))))
return 0;
(startswith(filename, "system@") && endswith(filename, ".journal"))))
return 0;
- path = join(prefix, "/", filename, NULL);
+ path =
str
join(prefix, "/", filename, NULL);
if (!path)
return -ENOMEM;
if (!path)
return -ENOMEM;
@@
-1149,7
+1149,7
@@
static int remove_file(sd_journal *j, const char *prefix, const char *filename)
assert(prefix);
assert(filename);
assert(prefix);
assert(filename);
- path = join(prefix, "/", filename, NULL);
+ path =
str
join(prefix, "/", filename, NULL);
if (!path)
return -ENOMEM;
if (!path)
return -ENOMEM;
@@
-1184,7
+1184,7
@@
static int add_directory(sd_journal *j, const char *prefix, const char *dirname)
!sd_id128_equal(id, mid)))
return 0;
!sd_id128_equal(id, mid)))
return 0;
- path = join(prefix, "/", dirname, NULL);
+ path =
str
join(prefix, "/", dirname, NULL);
if (!path)
return -ENOMEM;
if (!path)
return -ENOMEM;