From 01e0290d6e37436b422ac8a2c8997b23cf83186d Mon Sep 17 00:00:00 2001 From: Andrew Wood Date: Sat, 8 Jun 2024 21:57:36 +0100 Subject: [PATCH] More replacement of hard-coded exit status bitmask values with named constants. --- src/include/pv.h | 14 +++++++------- src/main/main.c | 18 +++++++++--------- src/main/remote.c | 14 +++++++------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/include/pv.h b/src/include/pv.h index 3e1aa94..d75106a 100644 --- a/src/include/pv.h +++ b/src/include/pv.h @@ -26,13 +26,13 @@ extern "C" { /* * Exit status bitmask values. */ -#define PV_ERROREXIT_REMOTE 1 -#define PV_ERROREXIT_ACCESS 2 -#define PV_ERROREXIT_OUROBOROS 4 -#define PV_ERROREXIT_TRANSITION 8 -#define PV_ERROREXIT_TRANSFER 16 -#define PV_ERROREXIT_SIGNAL 32 -#define PV_ERROREXIT_MEMORY 64 +#define PV_ERROREXIT_REMOTE_OR_PID 1 +#define PV_ERROREXIT_ACCESS 2 +#define PV_ERROREXIT_OUROBOROS 4 +#define PV_ERROREXIT_TRANSITION 8 +#define PV_ERROREXIT_TRANSFER 16 +#define PV_ERROREXIT_SIGNAL 32 +#define PV_ERROREXIT_MEMORY 64 /* * Opaque structure for PV internal state. diff --git a/src/main/main.c b/src/main/main.c index d4ae744..d7e8636 100644 --- a/src/main/main.c +++ b/src/main/main.c @@ -49,8 +49,8 @@ int main(int argc, char **argv) /* Parse the command line arguments. */ opts = opts_parse(argc >= 0 ? (unsigned int) argc : 0, argv); if (NULL == opts) { - debug("%s: %d", "exiting with status", 64); - return 64; + debug("%s: %d", "exiting with status", PV_ERROREXIT_MEMORY); + return PV_ERROREXIT_MEMORY; } /* Early exit if necessary, such as with "-h". */ @@ -73,8 +73,8 @@ int main(int argc, char **argv) */ fprintf(stderr, "%s: %s: %s\n", opts->program_name, _("state allocation failed"), strerror(errno)); opts_free(opts); - debug("%s: %d", "exiting with status", 64); - return 64; + debug("%s: %d", "exiting with status", PV_ERROREXIT_MEMORY); + return PV_ERROREXIT_MEMORY; /*@+mustfreefresh@ */ } @@ -115,7 +115,7 @@ int main(int argc, char **argv) fprintf(stderr, "%s: %s\n", opts->program_name, strerror(errno)); pv_state_free(state); opts_free(opts); - return 1; + return PV_ERROREXIT_REMOTE_OR_PID; } memset(pidfile_tmp_name, 0, pidfile_tmp_bufsize); (void) pv_snprintf(pidfile_tmp_name, pidfile_tmp_bufsize, "%s.XXXXXX", opts->pidfile); @@ -133,7 +133,7 @@ int main(int argc, char **argv) free(pidfile_tmp_name); pv_state_free(state); opts_free(opts); - return 1; + return PV_ERROREXIT_REMOTE_OR_PID; } (void) umask(prev_umask); /* flawfinder: ignore */ @@ -159,7 +159,7 @@ int main(int argc, char **argv) free(pidfile_tmp_name); pv_state_free(state); opts_free(opts); - return 1; + return PV_ERROREXIT_REMOTE_OR_PID; } fprintf(pidfile_tmp_fptr, "%d\n", getpid()); @@ -183,7 +183,7 @@ int main(int argc, char **argv) if (!opts_add_file(opts, "-")) { pv_state_free(state); opts_free(opts); - return 64; + return PV_ERROREXIT_MEMORY; } } @@ -318,7 +318,7 @@ int main(int argc, char **argv) fprintf(stderr, "%s: %s: %s\n", opts->program_name, opts->output, strerror(errno)); pv_state_free(state); opts_free(opts); - return 2; + return PV_ERROREXIT_ACCESS; } pv_state_output_set(state, fd, opts->output); } diff --git a/src/main/remote.c b/src/main/remote.c index de2f18a..25b5988 100644 --- a/src/main/remote.c +++ b/src/main/remote.c @@ -158,7 +158,7 @@ int pv_remote_set(opts_t opts, pvstate_t state) */ if (kill((pid_t) (opts->remote), 0) != 0) { pv_error(state, "%u: %s", opts->remote, strerror(errno)); - return 1; + return PV_ERROREXIT_REMOTE_OR_PID; } /* @@ -219,7 +219,7 @@ int pv_remote_set(opts_t opts, pvstate_t state) control_fptr = pv__control_file(control_filename, sizeof(control_filename), getpid(), true); if (NULL == control_fptr) { pv_error(state, "%s", strerror(errno)); - return 1; + return PV_ERROREXIT_REMOTE_OR_PID; } /* @@ -230,13 +230,13 @@ int pv_remote_set(opts_t opts, pvstate_t state) pv_error(state, "%s", strerror(errno)); (void) fclose(control_fptr); (void) remove(control_filename); - return 1; + return PV_ERROREXIT_REMOTE_OR_PID; } if (0 != fclose(control_fptr)) { pv_error(state, "%s", strerror(errno)); (void) remove(control_filename); - return 1; + return PV_ERROREXIT_REMOTE_OR_PID; } /* @@ -248,7 +248,7 @@ int pv_remote_set(opts_t opts, pvstate_t state) if (kill((pid_t) (opts->remote), SIGUSR2) != 0) { pv_error(state, "%u: %s", opts->remote, strerror(errno)); (void) remove(control_filename); - return 1; + return PV_ERROREXIT_REMOTE_OR_PID; } debug("%s", "message sent"); @@ -300,7 +300,7 @@ int pv_remote_set(opts_t opts, pvstate_t state) * fact we only translate each string once. */ pv_error(state, "%u: %s", opts->remote, _("message not received")); - return 1; + return PV_ERROREXIT_REMOTE_OR_PID; /*@+mustfreefresh @ */ } @@ -428,7 +428,7 @@ int pv_remote_set( /*@unused@ */ /*@-mustfreefresh@ *//* splint - see above */ fprintf(stderr, "%s\n", _("SA_SIGINFO not supported on this system")); /*@+mustfreefresh@ */ - return 1; + return PV_ERROREXIT_REMOTE_OR_PID; } #endif /* SA_SIGINFO */