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=9d3574c74d2b341a3240f42bd9ca3d310ecf78df commit 9d3574c74d2b341a3240f42bd9ca3d310ecf78df Author: Guillem Jover <[email protected]> AuthorDate: Tue Oct 18 22:42:16 2022 +0200 dpkg: Use explicit EXIT_SUCCESS/EXIT_FAILURE instead of 0/1 in relationinfos The integer constants can be easily confused by boolean values. Use the explicit exit macros to make it obvious what these are about. Changelog: internal --- src/main/enquiry.c | 206 ++++++++++++++++++++++++++--------------------------- 1 file changed, 103 insertions(+), 103 deletions(-) diff --git a/src/main/enquiry.c b/src/main/enquiry.c index 53e7ba0d8..82edd67a3 100644 --- a/src/main/enquiry.c +++ b/src/main/enquiry.c @@ -693,7 +693,7 @@ cmpversions(const char *const *argv) { struct relationinfo { const char *op; - /* These values are exit status codes, so 0 = true, 1 = false. */ + /* These values are exit status codes. */ int if_lesser, if_equal, if_greater; int if_none_a, if_none_both, if_none_b; bool obsolete; @@ -702,148 +702,148 @@ cmpversions(const char *const *argv) static const struct relationinfo relationinfos[]= { { .op = "le", - .if_lesser = 0, - .if_equal = 0, - .if_greater = 1, - .if_none_a = 0, - .if_none_both = 0, - .if_none_b = 1, + .if_lesser = EXIT_SUCCESS, + .if_equal = EXIT_SUCCESS, + .if_greater = EXIT_FAILURE, + .if_none_a = EXIT_SUCCESS, + .if_none_both = EXIT_SUCCESS, + .if_none_b = EXIT_FAILURE, }, { .op = "lt", - .if_lesser = 0, - .if_equal = 1, - .if_greater = 1, - .if_none_a = 0, - .if_none_both = 1, - .if_none_b = 1, + .if_lesser = EXIT_SUCCESS, + .if_equal = EXIT_FAILURE, + .if_greater = EXIT_FAILURE, + .if_none_a = EXIT_SUCCESS, + .if_none_both = EXIT_FAILURE, + .if_none_b = EXIT_FAILURE, }, { .op = "eq", - .if_lesser = 1, - .if_equal = 0, - .if_greater = 1, - .if_none_a = 1, - .if_none_both = 0, - .if_none_b = 1, + .if_lesser = EXIT_FAILURE, + .if_equal = EXIT_SUCCESS, + .if_greater = EXIT_FAILURE, + .if_none_a = EXIT_FAILURE, + .if_none_both = EXIT_SUCCESS, + .if_none_b = EXIT_FAILURE, }, { .op = "ne", - .if_lesser = 0, - .if_equal = 1, - .if_greater = 0, - .if_none_a = 0, - .if_none_both = 1, - .if_none_b = 0, + .if_lesser = EXIT_SUCCESS, + .if_equal = EXIT_FAILURE, + .if_greater = EXIT_SUCCESS, + .if_none_a = EXIT_SUCCESS, + .if_none_both = EXIT_FAILURE, + .if_none_b = EXIT_SUCCESS, }, { .op = "ge", - .if_lesser = 1, - .if_equal = 0, - .if_greater = 0, - .if_none_a = 1, - .if_none_both = 0, - .if_none_b = 0, + .if_lesser = EXIT_FAILURE, + .if_equal = EXIT_SUCCESS, + .if_greater = EXIT_SUCCESS, + .if_none_a = EXIT_FAILURE, + .if_none_both = EXIT_SUCCESS, + .if_none_b = EXIT_SUCCESS, }, { .op = "gt", - .if_lesser = 1, - .if_equal = 1, - .if_greater = 0, - .if_none_a = 1, - .if_none_both = 1, - .if_none_b = 0, + .if_lesser = EXIT_FAILURE, + .if_equal = EXIT_FAILURE, + .if_greater = EXIT_SUCCESS, + .if_none_a = EXIT_FAILURE, + .if_none_both = EXIT_FAILURE, + .if_none_b = EXIT_SUCCESS, }, /* These treat an empty version as later than any version. */ { .op = "le-nl", - .if_lesser = 0, - .if_equal = 0, - .if_greater = 1, - .if_none_a = 1, - .if_none_both = 0, - .if_none_b = 0, + .if_lesser = EXIT_SUCCESS, + .if_equal = EXIT_SUCCESS, + .if_greater = EXIT_FAILURE, + .if_none_a = EXIT_FAILURE, + .if_none_both = EXIT_SUCCESS, + .if_none_b = EXIT_SUCCESS, }, { .op = "lt-nl", - .if_lesser = 0, - .if_equal = 1, - .if_greater = 1, - .if_none_a = 1, - .if_none_both = 1, - .if_none_b = 0, + .if_lesser = EXIT_SUCCESS, + .if_equal = EXIT_FAILURE, + .if_greater = EXIT_FAILURE, + .if_none_a = EXIT_FAILURE, + .if_none_both = EXIT_FAILURE, + .if_none_b = EXIT_SUCCESS, }, { .op = "ge-nl", - .if_lesser = 1, - .if_equal = 0, - .if_greater = 0, - .if_none_a = 0, - .if_none_both = 0, - .if_none_b = 1, + .if_lesser = EXIT_FAILURE, + .if_equal = EXIT_SUCCESS, + .if_greater = EXIT_SUCCESS, + .if_none_a = EXIT_SUCCESS, + .if_none_both = EXIT_SUCCESS, + .if_none_b = EXIT_FAILURE, }, { .op = "gt-nl", - .if_lesser = 1, - .if_equal = 1, - .if_greater = 0, - .if_none_a = 0, - .if_none_both = 1, - .if_none_b = 1, + .if_lesser = EXIT_FAILURE, + .if_equal = EXIT_FAILURE, + .if_greater = EXIT_SUCCESS, + .if_none_a = EXIT_SUCCESS, + .if_none_both = EXIT_FAILURE, + .if_none_b = EXIT_FAILURE, }, /* For compatibility with dpkg control file syntax. */ { .op = "<", - .if_lesser = 0, - .if_equal = 0, - .if_greater = 1, - .if_none_a = 0, - .if_none_both = 0, - .if_none_b = 1, + .if_lesser = EXIT_SUCCESS, + .if_equal = EXIT_SUCCESS, + .if_greater = EXIT_FAILURE, + .if_none_a = EXIT_SUCCESS, + .if_none_both = EXIT_SUCCESS, + .if_none_b = EXIT_FAILURE, .obsolete = true, }, { .op = "<=", - .if_lesser = 0, - .if_equal = 0, - .if_greater = 1, - .if_none_a = 0, - .if_none_both = 0, - .if_none_b = 1, + .if_lesser = EXIT_SUCCESS, + .if_equal = EXIT_SUCCESS, + .if_greater = EXIT_FAILURE, + .if_none_a = EXIT_SUCCESS, + .if_none_both = EXIT_SUCCESS, + .if_none_b = EXIT_FAILURE, }, { .op = "<<", - .if_lesser = 0, - .if_equal = 1, - .if_greater = 1, - .if_none_a = 0, - .if_none_both = 1, - .if_none_b = 1, + .if_lesser = EXIT_SUCCESS, + .if_equal = EXIT_FAILURE, + .if_greater = EXIT_FAILURE, + .if_none_a = EXIT_SUCCESS, + .if_none_both = EXIT_FAILURE, + .if_none_b = EXIT_FAILURE, }, { .op = "=", - .if_lesser = 1, - .if_equal = 0, - .if_greater = 1, - .if_none_a = 1, - .if_none_both = 0, - .if_none_b = 1, + .if_lesser = EXIT_FAILURE, + .if_equal = EXIT_SUCCESS, + .if_greater = EXIT_FAILURE, + .if_none_a = EXIT_FAILURE, + .if_none_both = EXIT_SUCCESS, + .if_none_b = EXIT_FAILURE, }, { .op = ">", - .if_lesser = 1, - .if_equal = 0, - .if_greater = 0, - .if_none_a = 1, - .if_none_both = 0, - .if_none_b = 0, + .if_lesser = EXIT_FAILURE, + .if_equal = EXIT_SUCCESS, + .if_greater = EXIT_SUCCESS, + .if_none_a = EXIT_FAILURE, + .if_none_both = EXIT_SUCCESS, + .if_none_b = EXIT_SUCCESS, .obsolete = true, }, { .op = ">=", - .if_lesser = 1, - .if_equal = 0, - .if_greater = 0, - .if_none_a = 1, - .if_none_both = 0, - .if_none_b = 0, + .if_lesser = EXIT_FAILURE, + .if_equal = EXIT_SUCCESS, + .if_greater = EXIT_SUCCESS, + .if_none_a = EXIT_FAILURE, + .if_none_both = EXIT_SUCCESS, + .if_none_b = EXIT_SUCCESS, }, { .op = ">>", - .if_lesser = 1, - .if_equal = 1, - .if_greater = 0, - .if_none_a = 1, - .if_none_both = 1, - .if_none_b = 0, + .if_lesser = EXIT_FAILURE, + .if_equal = EXIT_FAILURE, + .if_greater = EXIT_SUCCESS, + .if_none_a = EXIT_FAILURE, + .if_none_both = EXIT_FAILURE, + .if_none_b = EXIT_SUCCESS, }, { .op = NULL, } -- Dpkg.Org's dpkg
