This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=6c394a4c75f995dfabeee19200efde63b1c6f44f commit 6c394a4c75f995dfabeee19200efde63b1c6f44f Author: Guillem Jover <[email protected]> AuthorDate: Wed Sep 20 04:55:35 2023 +0200 libdpkg: Add underscore after NO to FHFF_NONEW and FHFF_NOCOPY enum values These values are rather confusing when combined with FHFF_NONE. --- lib/dpkg/fsys-hash.c | 4 ++-- lib/dpkg/fsys.h | 4 ++-- lib/dpkg/t/t-fsys-hash.c | 16 ++++++++-------- lib/dpkg/triglib.h | 2 +- src/divert/main.c | 6 +++--- src/main/configure.c | 2 +- src/statoverride/main.c | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/dpkg/fsys-hash.c b/lib/dpkg/fsys-hash.c index 5794c96fd..42cb956de 100644 --- a/lib/dpkg/fsys-hash.c +++ b/lib/dpkg/fsys-hash.c @@ -93,12 +93,12 @@ fsys_hash_find_node(const char *name, enum fsys_hash_find_flags flags) pointerp = &(*pointerp)->next; } - if (flags & FHFF_NONEW) + if (flags & FHFF_NO_NEW) return NULL; newnode = nfmalloc(sizeof(*newnode)); memset(newnode, 0, sizeof(*newnode)); - if ((flags & FHFF_NOCOPY) && name > orig_name && name[-1] == '/') { + if ((flags & FHFF_NO_COPY) && name > orig_name && name[-1] == '/') { newnode->name = name - 1; } else { char *newname = nfmalloc(strlen(name) + 2); diff --git a/lib/dpkg/fsys.h b/lib/dpkg/fsys.h index 2f52250bb..ede5cdff8 100644 --- a/lib/dpkg/fsys.h +++ b/lib/dpkg/fsys.h @@ -57,9 +57,9 @@ enum DPKG_ATTR_ENUM_FLAGS fsys_hash_find_flags { /** No flags. */ FHFF_NONE = 0, /** Do not need to copy filename. */ - FHFF_NOCOPY = DPKG_BIT(0), + FHFF_NO_COPY = DPKG_BIT(0), /** Do not insert the item if it is not found, and return NULL. */ - FHFF_NONEW = DPKG_BIT(1), + FHFF_NO_NEW = DPKG_BIT(1), }; enum DPKG_ATTR_ENUM_FLAGS fsys_namenode_flags { diff --git a/lib/dpkg/t/t-fsys-hash.c b/lib/dpkg/t/t-fsys-hash.c index afb238ca8..88a05544b 100644 --- a/lib/dpkg/t/t-fsys-hash.c +++ b/lib/dpkg/t/t-fsys-hash.c @@ -36,12 +36,12 @@ test_fsys_nodes(void) fsys_hash_init(); - fnn = fsys_hash_find_node("/nonexistent", FHFF_NONEW); + fnn = fsys_hash_find_node("/nonexistent", FHFF_NO_NEW); test_pass(fnn == NULL); test_pass(fsys_hash_entries() == 0); name = "/test/path/aa"; - fnn = fsys_hash_find_node(name, FHFF_NOCOPY); + fnn = fsys_hash_find_node(name, FHFF_NO_COPY); test_pass(fnn != NULL); test_pass(fsys_hash_entries() == 1); test_pass(fnn->name == name); @@ -81,21 +81,21 @@ test_fsys_nodes(void) fsys_hash_init(); test_pass(fsys_hash_entries() == 3); - fnn = fsys_hash_find_node("/test/path/aa", FHFF_NONEW); + fnn = fsys_hash_find_node("/test/path/aa", FHFF_NO_NEW); test_pass(fnn != NULL); - fnn = fsys_hash_find_node("/test/path/bb", FHFF_NONEW); + fnn = fsys_hash_find_node("/test/path/bb", FHFF_NO_NEW); test_pass(fnn != NULL); - fnn = fsys_hash_find_node("/test/path/cc", FHFF_NONEW); + fnn = fsys_hash_find_node("/test/path/cc", FHFF_NO_NEW); test_pass(fnn != NULL); test_pass(fsys_hash_entries() == 3); fsys_hash_reset(); test_pass(fsys_hash_entries() == 0); - fnn = fsys_hash_find_node("/test/path/aa", FHFF_NONEW); + fnn = fsys_hash_find_node("/test/path/aa", FHFF_NO_NEW); test_pass(fnn == NULL); - fnn = fsys_hash_find_node("/test/path/bb", FHFF_NONEW); + fnn = fsys_hash_find_node("/test/path/bb", FHFF_NO_NEW); test_pass(fnn == NULL); - fnn = fsys_hash_find_node("/test/path/cc", FHFF_NONEW); + fnn = fsys_hash_find_node("/test/path/cc", FHFF_NO_NEW); test_pass(fnn == NULL); test_pass(fsys_hash_entries() == 0); } diff --git a/lib/dpkg/triglib.h b/lib/dpkg/triglib.h index b8666fc17..946ba4b44 100644 --- a/lib/dpkg/triglib.h +++ b/lib/dpkg/triglib.h @@ -80,7 +80,7 @@ struct trig_hooks { #define TRIGHOOKS_DEFINE_NAMENODE_ACCESSORS \ static struct fsys_namenode *th_nn_find(const char *name, bool nonew) \ - { return fsys_hash_find_node(name, nonew ? FHFF_NONEW : 0); } \ + { return fsys_hash_find_node(name, nonew ? FHFF_NO_NEW : 0); } \ static struct trigfileint **th_nn_interested(struct fsys_namenode *fnn) \ { return &fnn->trig_interested; } \ static const char *th_nn_name(struct fsys_namenode *fnn) \ diff --git a/src/divert/main.c b/src/divert/main.c index 31ba4c080..9fb6387ac 100644 --- a/src/divert/main.c +++ b/src/divert/main.c @@ -630,7 +630,7 @@ diversion_remove(const char *const *argv) modstatdb_open(msdbrw_readonly); ensure_diversions(); - namenode = fsys_hash_find_node(filename, FHFF_NONEW); + namenode = fsys_hash_find_node(filename, FHFF_NO_NEW); if (namenode == NULL || namenode->divert == NULL || namenode->divert->useinstead == NULL) { @@ -763,7 +763,7 @@ diversion_truename(const char *const *argv) modstatdb_open(msdbrw_readonly); ensure_diversions(); - namenode = fsys_hash_find_node(filename, FHFF_NONEW); + namenode = fsys_hash_find_node(filename, FHFF_NO_NEW); /* Print the given name if file is not diverted. */ if (namenode && namenode->divert && namenode->divert->useinstead) @@ -790,7 +790,7 @@ diversion_listpackage(const char *const *argv) modstatdb_open(msdbrw_readonly); ensure_diversions(); - namenode = fsys_hash_find_node(filename, FHFF_NONEW); + namenode = fsys_hash_find_node(filename, FHFF_NO_NEW); /* Print nothing if file is not diverted. */ if (namenode == NULL || namenode->divert == NULL) diff --git a/src/main/configure.c b/src/main/configure.c index 4512b8e42..c2d58c768 100644 --- a/src/main/configure.c +++ b/src/main/configure.c @@ -383,7 +383,7 @@ deferred_configure_conffile(struct pkginfo *pkg, struct conffile *conff) char *cdr2rest; int rc; - usenode = namenodetouse(fsys_hash_find_node(conff->name, FHFF_NOCOPY), + usenode = namenodetouse(fsys_hash_find_node(conff->name, FHFF_NO_COPY), pkg, &pkg->installed); rc = conffderef(pkg, &cdr, usenode->name); diff --git a/src/statoverride/main.c b/src/statoverride/main.c index 6304d46d5..5274a5712 100644 --- a/src/statoverride/main.c +++ b/src/statoverride/main.c @@ -159,7 +159,7 @@ statdb_node_remove(const char *filename) { struct fsys_namenode *file; - file = fsys_hash_find_node(filename, FHFF_NONEW); + file = fsys_hash_find_node(filename, FHFF_NO_NEW); if (!file || !file->statoverride) return 0; -- Dpkg.Org's dpkg
