agora inbox for [email protected]help / color / mirror / Atom feed
[PATCH v20260912 2/4] Continue to remove some unnecesary strlen calls 167+ messages / 2 participants [nested] [flat]
* [PATCH v20260912 2/4] Continue to remove some unnecesary strlen calls @ 2024-09-11 04:21 Andy Fan <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Andy Fan @ 2024-09-11 04:21 UTC (permalink / raw) sprintf return the number of characters printed (not including the trailing `\0'), so it is exactly same as strlen. so we can reuse that value and avoid a strlen call. --- src/backend/utils/adt/datetime.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 8f25c15fcfc..83c3c85305b 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -4717,6 +4717,7 @@ EncodeInterval(struct pg_itm *itm, int style, char *str) int fsec = itm->tm_usec; bool is_before = false; bool is_zero = true; + int data_len; /* * The sign of year and month are guaranteed to match, since they are @@ -4774,11 +4775,11 @@ EncodeInterval(struct pg_itm *itm, int style, char *str) char sec_sign = (hour < 0 || min < 0 || sec < 0 || fsec < 0) ? '-' : '+'; - sprintf(cp, "%c%d-%d %c%" PRId64 " %c%" PRId64 ":%02d:", + data_len = sprintf(cp, "%c%d-%d %c%" PRId64 " %c%" PRId64 ":%02d:", year_sign, abs(year), abs(mon), day_sign, i64abs(mday), sec_sign, i64abs(hour), abs(min)); - cp += strlen(cp); + cp += data_len; cp = AppendSeconds(cp, sec, fsec, MAX_INTERVAL_PRECISION, true); *cp = '\0'; } @@ -4788,16 +4789,16 @@ EncodeInterval(struct pg_itm *itm, int style, char *str) } else if (has_day) { - sprintf(cp, "%" PRId64 " %" PRId64 ":%02d:", + data_len = sprintf(cp, "%" PRId64 " %" PRId64 ":%02d:", mday, hour, min); - cp += strlen(cp); + cp += data_len; cp = AppendSeconds(cp, sec, fsec, MAX_INTERVAL_PRECISION, true); *cp = '\0'; } else { - sprintf(cp, "%" PRId64 ":%02d:", hour, min); - cp += strlen(cp); + data_len = sprintf(cp, "%" PRId64 ":%02d:", hour, min); + cp += data_len; cp = AppendSeconds(cp, sec, fsec, MAX_INTERVAL_PRECISION, true); *cp = '\0'; } -- 2.43.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v20260912-0004-Make-printtup-a-bit-faster-intermediate-st.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
* [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition @ 2026-07-01 10:31 Jonathan Gonzalez V. <[email protected]> 0 siblings, 0 replies; 167+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:31 UTC (permalink / raw) There was three separated definition of the function making lcov v2.x fail with an error. --- src/interfaces/libpq/fe-auth-oauth.c | 61 +++++++++++----------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/src/interfaces/libpq/fe-auth-oauth.c b/src/interfaces/libpq/fe-auth-oauth.c index 826f7461cb3..7a35647feb8 100644 --- a/src/interfaces/libpq/fe-auth-oauth.c +++ b/src/interfaces/libpq/fe-auth-oauth.c @@ -833,41 +833,42 @@ cleanup_oauth_flow(PGconn *conn) * failure, and positive indicates success. */ -#if !defined(USE_LIBCURL) +#if defined(USE_LIBCURL) && defined(USE_DYNAMIC_OAUTH) /* - * This configuration doesn't support the builtin flow. + * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. */ -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ - return 0; -} +typedef char *(*libpq_gettext_func) (const char *msgid); -#elif defined(USE_DYNAMIC_OAUTH) +#elif defined(USE_LIBCURL) /* - * Use the builtin flow in the libpq-oauth plugin, which is loaded at runtime. + * For static builds, we can just call pg_start_oauthbearer() directly. It's + * provided by libpq-oauth.a. */ +extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); -typedef char *(*libpq_gettext_func) (const char *msgid); +#endif -/* - * Loads the libpq-oauth plugin via dlopen(), initializes it, and plugs its - * callbacks into the connection's async auth handlers. - * - * Failure to load here results in a relatively quiet connection error, to - * handle the use case where the build supports loading a flow but a user does - * not want to install it. Troubleshooting of linker/loader failures can be done - * via PGOAUTHDEBUG. - * - * The lifetime of *request ends shortly after this call, so it must be copied - * to longer-lived storage. - */ static int use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) { +#if !defined(USE_LIBCURL) + return 0; +#elif defined(USE_DYNAMIC_OAUTH) + /* + * Load the libpq-oauth plugin via dlopen(), initialize it, and plug its + * callbacks into the connection's async auth handlers. + * + * Failure to load here results in a relatively quiet connection error, to + * handle the use case where the build supports loading a flow but a user + * does not want to install it. Troubleshooting of linker/loader failures + * can be done via PGOAUTHDEBUG. + * + * The lifetime of *request ends shortly after this call, so it must be + * copied to longer-lived storage. + */ static bool initialized = false; static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; int lockerr; @@ -976,24 +977,10 @@ use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *re } return (start_flow(conn, request) == 0) ? 1 : -1; -} - #else - -/* - * For static builds, we can just call pg_start_oauthbearer() directly. It's - * provided by libpq-oauth.a. - */ - -extern int pg_start_oauthbearer(PGconn *conn, PGoauthBearerRequestV2 *request); - -static int -use_builtin_flow(PGconn *conn, fe_oauth_state *state, PGoauthBearerRequestV2 *request) -{ return (pg_start_oauthbearer(conn, request) == 0) ? 1 : -1; -} - #endif /* USE_LIBCURL */ +} /* -- 2.53.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v1-0002-Collapse-SH_CREATE-into-a-single-definition.patch ^ permalink raw reply [nested|flat] 167+ messages in thread
end of thread, other threads:[~2026-07-01 10:31 UTC | newest] Thread overview: 167+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2024-09-11 04:21 [PATCH v20260912 2/4] Continue to remove some unnecesary strlen calls Andy Fan <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]> 2026-07-01 10:31 [PATCH v1 1/2] libpq-oauth: collapse use_builtin_flow() into a single definition Jonathan Gonzalez V. <[email protected]>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox