commit b2b363b2f464c849ea73a94e6b2be46339b06275 from: Omar Polo via: Thomas Adam date: Thu Jun 22 13:10:34 2023 UTC retire GOT_ERR_QUERYSTRING it's redundant with GOT_ERR_BAD_QUERYSTRING; convert its only use to the latter. commit - 57048aa537a8bf2612732f428913f113c0c7792e commit + b2b363b2f464c849ea73a94e6b2be46339b06275 blob - 59ca5bf55c49c212f0bcd9008f72ca685cfed645 blob + 7e31506198c3c606f2e163a630d2c934412e2a5f --- gotwebd/gotweb.c +++ gotwebd/gotweb.c @@ -189,7 +189,7 @@ gotweb_process_request(struct request *c) if (qs->action == BLAME || qs->action == BLOB || qs->action == BLOBRAW || qs->action == DIFF) { if (qs->commit == NULL) { - error = got_error(GOT_ERR_QUERYSTRING); + error = got_error(GOT_ERR_BAD_QUERYSTRING); goto err; } } blob - 0582e35816efd0e75172f961b9d274e6c249d83d blob + c7c5ce296704a7d0c3345092eccebd5837fcd453 --- include/got_error.h +++ include/got_error.h @@ -131,7 +131,7 @@ #define GOT_ERR_GITCONFIG_SYNTAX 114 #define GOT_ERR_REBASE_OUT_OF_DATE 115 #define GOT_ERR_CACHE_DUP_ENTRY 116 -#define GOT_ERR_QUERYSTRING 117 +/* 117 is currently unused */ #define GOT_ERR_FETCH_FAILED 118 #define GOT_ERR_PARSE_URI 119 #define GOT_ERR_BAD_PROTO 120 blob - 387feb8883a4304158ca0f93f35832950b29002d blob + b4ca77c49c18fb141c0860234550c8e9aa0c627e --- lib/error.c +++ lib/error.c @@ -179,7 +179,6 @@ static const struct got_error got_errors[] = { { GOT_ERR_REBASE_OUT_OF_DATE, "work tree must be updated before it " "can be used to rebase a branch" }, { GOT_ERR_CACHE_DUP_ENTRY, "duplicate cache entry" }, - { GOT_ERR_QUERYSTRING, "bad querystring" }, { GOT_ERR_FETCH_FAILED, "fetch failed" }, { GOT_ERR_PARSE_URI, "failed to parse uri" }, { GOT_ERR_BAD_PROTO, "unknown protocol" },