Make libpqsrv_cancel's return const char *, not char *

Per headerscheck's C++ check.

Discussion: https://postgr.es/m/372769.1712179784@sss.pgh.pa.us

diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index de858e165abdc5b779ad33de68564c217b5f5d93..755293456fff687183c969aeb9724db24af13c35 100644 (file)
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -1347,7 +1347,7 @@ Datum
 dblink_cancel_query(PG_FUNCTION_ARGS)
 {
    PGconn     *conn;
-   char       *msg;
+   const char *msg;
    TimestampTz endtime;
 
    dblink_init();

diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c
index e4595926641229f33e0673e6dd9bea94c4875445..603e043af40ba164874e081ce1eeb746edccd802 100644 (file)
--- a/contrib/postgres_fdw/connection.c
+++ b/contrib/postgres_fdw/connection.c
@@ -1332,7 +1332,7 @@ pgfdw_cancel_query(PGconn *conn)
 static bool
 pgfdw_cancel_query_begin(PGconn *conn, TimestampTz endtime)
 {
-   char       *errormsg = libpqsrv_cancel(conn, endtime);
+   const char *errormsg = libpqsrv_cancel(conn, endtime);
 
    if (errormsg != NULL)
        ereport(WARNING,

diff --git a/src/include/libpq/libpq-be-fe-helpers.h b/src/include/libpq/libpq-be-fe-helpers.h
index 8be9aa1f2f990914541059e80e03221d261df681..fe508292743f6080738b3cc4b8e54c597dda7908 100644 (file)
--- a/src/include/libpq/libpq-be-fe-helpers.h
+++ b/src/include/libpq/libpq-be-fe-helpers.h
@@ -382,11 +382,11 @@ libpqsrv_get_result(PGconn *conn, uint32 wait_event_info)
  * Note: this function leaks a string's worth of memory when reporting
  * libpq errors.  Make sure to call it in a transient memory context.
  */
-static inline char *
+static inline const char *
 libpqsrv_cancel(PGconn *conn, TimestampTz endtime)
 {
    PGcancelConn *cancel_conn;
-   char       *error = NULL;
+   const char *error = NULL;
 
    cancel_conn = PQcancelCreate(conn);
    if (cancel_conn == NULL)