mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 16:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor cgit_parse_snapshots_mask()

Browse Source 
Use Git string lists instead of str{spn,cspn,ncmp}() magic. This
significantly improves readability.

Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2014-01-10 12:44:37 +01:00 committed by Jason A. Donenfeld
parent 2abce4300b
commit f04b8d5c99
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
shared.c
View File

@ -404,28 +404,29 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix)
int cgit_parse_snapshots_mask(const char *str) int cgit_parse_snapshots_mask(const char *str)
{ {
struct string_list tokens = STRING_LIST_INIT_DUP;
struct string_list_item *item;
const struct cgit_snapshot_format *f; const struct cgit_snapshot_format *f;
static const char *delim = " "; int rv = 0;
int tl, sl, rv = 0;
/* favor legacy setting */ /* favor legacy setting */
if (atoi(str)) if (atoi(str))
return 1; return 1;
for (;;) {
str += strspn(str, delim); string_list_split(&tokens, str, ' ', -1);
tl = strcspn(str, delim); string_list_remove_empty_items(&tokens, 0);
if (!tl)
break; for_each_string_list_item(item, &tokens) {
for (f = cgit_snapshot_formats; f->suffix; f++) { for (f = cgit_snapshot_formats; f->suffix; f++) {
sl = strlen(f->suffix); if (!strcmp(item->string, f->suffix) ||
if ((tl == sl && !strncmp(f->suffix, str, tl)) || !strcmp(item->string, f->suffix + 1)) {
(tl == sl - 1 && !strncmp(f->suffix + 1, str, tl - 1))) {
rv |= f->bit; rv |= f->bit;
break; break;
} }
} }
str += tl;
} }
string_list_clear(&tokens, 0);
return rv; return rv;
} }