}
if (p) {
- k = join(p, m->type == MATCH_OR_TERM ? " OR " : " AND ", t, NULL);
+ k = strjoin(p, m->type == MATCH_OR_TERM ? " OR " : " AND ", t, NULL);
free(p);
free(t);
}
if (enclose) {
- r = join("(", p, ")", NULL);
+ r = strjoin("(", p, ")", NULL);
free(p);
return r;
}
return journal_file_next_entry(f, c, cp, direction, ret, offset);
/* If we have a match then we look for the next matching entry
- * wiht an offset at least one step larger */
+ * with an offset at least one step larger */
return next_for_match(j, j->level0, f, direction == DIRECTION_DOWN ? cp+1 : cp-1, direction, ret, offset);
}
(startswith(filename, "system@") && endswith(filename, ".journal"))))
return 0;
- path = join(prefix, "/", filename, NULL);
+ path = strjoin(prefix, "/", filename, NULL);
if (!path)
return -ENOMEM;
assert(prefix);
assert(filename);
- path = join(prefix, "/", filename, NULL);
+ path = strjoin(prefix, "/", filename, NULL);
if (!path)
return -ENOMEM;
!sd_id128_equal(id, mid)))
return 0;
- path = join(prefix, "/", dirname, NULL);
+ path = strjoin(prefix, "/", dirname, NULL);
if (!path)
return -ENOMEM;
}
_public_ int sd_journal_process(sd_journal *j) {
- uint8_t buffer[sizeof(struct inotify_event) + FILENAME_MAX];
+ uint8_t buffer[sizeof(struct inotify_event) + FILENAME_MAX] _alignas_(struct inotify_event);
bool got_something = false;
if (!j)