From: Michael Tremer Date: Wed, 15 Mar 2023 16:43:36 +0000 (+0000) Subject: file: Rename extension check to patterns X-Git-Tag: 0.9.29~310 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=239230c2332ac10b5040e28cdeea48e3e0eb327b;p=pakfire.git file: Rename extension check to patterns Signed-off-by: Michael Tremer --- diff --git a/src/libpakfire/file.c b/src/libpakfire/file.c index 91f7a82fd..a3b1dc5b3 100644 --- a/src/libpakfire/file.c +++ b/src/libpakfire/file.c @@ -1151,23 +1151,23 @@ static int pakfire_file_classify_mode(struct pakfire_file* file) { return 0; } -static const struct extension { - const char* extension; +static const struct pattern { + const char* pattern; int class; -} extensions[] = { +} patterns[] = { { "*.a", PAKFIRE_FILE_STATIC_LIBRARY }, { "*.la", PAKFIRE_FILE_LIBTOOL_ARCHIVE }, { "*.pm", PAKFIRE_FILE_PERL }, { "*.pc", PAKFIRE_FILE_PKGCONFIG }, { "/usr/lib/firmware/*", PAKFIRE_FILE_FIRMWARE }, { "/usr/lib*/ld-*.so*", PAKFIRE_FILE_RUNTIME_LINKER }, - { NULL , 0 }, + { NULL }, }; -static int pakfire_file_classify_extension(struct pakfire_file* file) { - for (const struct extension* e = extensions; e->extension; e++) { - if (pakfire_file_matches(file, e->extension)) { - file->class |= e->class; +static int pakfire_file_classify_pattern(struct pakfire_file* file) { + for (const struct pattern* p = patterns; p->pattern; p++) { + if (pakfire_file_matches(file, p->pattern)) { + file->class |= p->class; break; } } @@ -1268,8 +1268,8 @@ int pakfire_file_classify(struct pakfire_file* file) { // Only run this for regular files if (file->class & PAKFIRE_FILE_REGULAR) { - // Then check for the extension - r = pakfire_file_classify_extension(file); + // Then check for patterns + r = pakfire_file_classify_pattern(file); if (r) goto ERROR;