diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2017-10-04 23:01:32 +0900 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-10-04 16:01:32 +0200 |
| commit | 4c701096002fff540d9ddb3b21398c551ac3af78 (patch) | |
| tree | 537e654dc92baa5eed5b6ff69867114384ecfa47 /src/journal/catalog.c | |
| parent | 6d0aa4db7b33c9ce71b820c76428a1cfd24fb56f (diff) | |
| download | systemd-4c701096002fff540d9ddb3b21398c551ac3af78.tar.gz | |
tree-wide: use IN_SET macro (#6977)
Diffstat (limited to 'src/journal/catalog.c')
| -rw-r--r-- | src/journal/catalog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/journal/catalog.c b/src/journal/catalog.c index f42be0adf9..bf92da9f90 100644 --- a/src/journal/catalog.c +++ b/src/journal/catalog.c @@ -216,7 +216,7 @@ int catalog_file_lang(const char* filename, char **lang) { return 0; beg = end - 1; - while (beg > filename && *beg != '.' && *beg != '/' && end - beg < 32) + while (beg > filename && !IN_SET(*beg, '.', '/') && end - beg < 32) beg--; if (*beg != '.' || end <= beg + 1) @@ -312,7 +312,7 @@ int catalog_import_file(Hashmap *h, const char *path) { line[0] == '-' && line[1] == '-' && line[2] == ' ' && - (line[2+1+32] == ' ' || line[2+1+32] == '\0')) { + IN_SET(line[2+1+32], ' ', '\0')) { bool with_language; sd_id128_t jd; |