summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmanuele Torre <torreemanuele6@gmail.com>2023-09-28 03:25:55 +0200
committerNico Williams <nico@cryptonector.com>2023-09-27 21:52:23 -0500
commit8206bc8fd2302715cb0948a4468996aecc3c5f7a (patch)
treeff28bcbd96d90790fb95176521aed93a7594e31b /src
parent623ace27e881c0daa43c73201f8131cf8b9c2cec (diff)
main.c: Remove unused EXIT_STATUS_EXACT option
In process there is a suspicious options |= EXIT_STATUS_EXACT that is run when the jq script is terminated by halt, or halt_error. That line of code acutally does nothing because options is a local argument variable, and is not passed as a pointer. It was probably meant to be a *options |= EXIT_STATUS_EXACT with the options argument passed as a int*. In any case, we do not want to run the code in main() that was supposed to run if EXIT_STATUS_EXACT is set (but didn't since it is never added to options); as far as I can tell, we only want to run that code when the --exit-status/-e option is passed. So I removed EXIT_STATUS_EXACT completely, and the useless assignment, instead of fixing it since it was not used for anything else. Useless assignment detected by clang-tidy.
Diffstat (limited to 'src')
-rw-r--r--src/main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c
index 9c6b3cf7..6d857c36 100644
--- a/src/main.c
+++ b/src/main.c
@@ -161,7 +161,6 @@ enum {
RAW_NO_LF = 1024,
UNBUFFERED_OUTPUT = 2048,
EXIT_STATUS = 4096,
- EXIT_STATUS_EXACT = 8192,
SEQ = 16384,
RUN_TESTS = 32768,
/* debugging only */
@@ -231,7 +230,6 @@ static int process(jq_state *jq, jv value, int flags, int dumpopts, int options)
}
if (jq_halted(jq)) {
// jq program invoked `halt` or `halt_error`
- options |= EXIT_STATUS_EXACT;
jv exit_code = jq_get_exit_code(jq);
if (!jv_is_valid(exit_code))
ret = JQ_OK;
@@ -783,7 +781,7 @@ out:
jq_util_input_free(&input_state);
jq_teardown(&jq);
- if (options & (EXIT_STATUS|EXIT_STATUS_EXACT)) {
+ if (options & EXIT_STATUS) {
if (ret != JQ_OK_NO_OUTPUT)
jq_exit_with_status(ret);
else