dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-05 07:30:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

sd-journal/catalog: use strdup_to(), rename output param

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2024-03-19 23:21:06 +01:00
parent bca4dc29df
commit 8f6ea3e827
2 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/libsystemd/sd-journal/catalog.c
View File

@@ -223,10 +223,7 @@ static int catalog_entry_lang(
const char* deflang,
char **ret) {
size_t c;
char *z;
c = strlen(t);
size_t c = strlen(t);
if (c < 2)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"[%s:%u] Language too short.", filename, line);
@@ -243,12 +240,7 @@ static int catalog_entry_lang(
log_warning("[%s:%u] language differs from default for file", filename, line);
}
z = strdup(t);
if (!z)
return -ENOMEM;
*ret = z;
return 0;
return strdup_to(ret, t);
}
int catalog_import_file(OrderedHashmap *h, const char *path) {
@@ -588,15 +580,14 @@ static const char *find_id(void *p, sd_id128_t id) {
le64toh(f->offset);
}
int catalog_get(const char* database, sd_id128_t id, char **_text) {
int catalog_get(const char* database, sd_id128_t id, char **ret_text) {
_cleanup_close_ int fd = -EBADF;
void *p = NULL;
struct stat st = {};
char *text = NULL;
struct stat st;
int r;
const char *s;
assert(_text);
assert(ret_text);
r = open_mmap(database, &fd, &st, &p);
if (r < 0)
@@ -608,15 +599,7 @@ int catalog_get(const char* database, sd_id128_t id, char **_text) {
goto finish;
}
text = strdup(s);
if (!text) {
r = -ENOMEM;
goto finish;
}
*_text = text;
r = 0;
r = strdup_to(ret_text, s);
finish:
(void) munmap(p, st.st_size);

2
src/libsystemd/sd-journal/catalog.h
View File

@@ -11,7 +11,7 @@
int catalog_import_file(OrderedHashmap *h, const char *path);
int catalog_update(const char* database, const char* root, const char* const* dirs);
int catalog_get(const char* database, sd_id128_t id, char **data);
int catalog_get(const char* database, sd_id128_t id, char **ret_text);
int catalog_list(FILE *f, const char* database, bool oneline);
int catalog_list_items(FILE *f, const char* database, bool oneline, char **items);
int catalog_file_lang(const char *filename, char **lang);