[postgis-tickets] [SCM] PostGIS branch stable-3.2 updated. 3.2.1-22-g553226efa
git at osgeo.org
git at osgeo.org
Tue May 31 08:19:01 PDT 2022
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, stable-3.2 has been updated
via 553226efaa93de222630944f14a52ce949340c76 (commit)
via 2e416908a1eac7343f160fa5d2f0da332f34e3de (commit)
from c43c353211bd6d27e53b254762ad67b093dc2361 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 553226efaa93de222630944f14a52ce949340c76
Merge: 2e416908a c43c35321
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Tue May 31 08:18:55 2022 -0700
Merge branch 'stable-3.2' of https://git.osgeo.org/gitea/postgis/postgis into stable-3.2
commit 2e416908a1eac7343f160fa5d2f0da332f34e3de
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Tue May 31 08:18:43 2022 -0700
Quiet warnings in CI
diff --git a/loader/pgsql2shp-core.c b/loader/pgsql2shp-core.c
index 4a3d593de..be624c4d1 100644
--- a/loader/pgsql2shp-core.c
+++ b/loader/pgsql2shp-core.c
@@ -1352,8 +1352,10 @@ ShpDumperOpenTable(SHPDUMPERSTATE *state)
/* If a user-defined query has been specified, create and point the state to our new table */
if (state->config->usrquery)
{
- asprintf(&(state->table), "__pgsql2shp%lu_tmp_table", (long)getpid());
- asprintf(&query, "CREATE TEMP TABLE \"%s\" AS %s", state->table, state->config->usrquery);
+ int r = asprintf(&(state->table), "__pgsql2shp%lu_tmp_table", (long)getpid());
+ (void)r;
+ r = asprintf(&query, "CREATE TEMP TABLE \"%s\" AS %s", state->table, state->config->usrquery);
+ (void)r;
res = PQexec(state->conn, query);
free(query);
@@ -1377,23 +1379,25 @@ ShpDumperOpenTable(SHPDUMPERSTATE *state)
/* Get the list of columns and their types for the selected table */
if (state->schema)
{
- asprintf(&query, "SELECT a.attname, a.atttypid, "
+ int r = asprintf(&query, "SELECT a.attname, a.atttypid, "
"a.atttypmod, a.attlen FROM "
"pg_attribute a, pg_class c, pg_namespace n WHERE "
"n.nspname = '%s' AND a.attrelid = c.oid AND "
"n.oid = c.relnamespace AND "
"a.atttypid != 0 AND "
"a.attnum > 0 AND c.relname = '%s'", state->schema, state->table);
+ (void)r;
}
else
{
- asprintf(&query, "SELECT a.attname, a.atttypid, "
+ int r = asprintf(&query, "SELECT a.attname, a.atttypid, "
"a.atttypmod, a.attlen FROM "
"pg_attribute a, pg_class c WHERE "
"a.attrelid = c.oid and a.attnum > 0 AND "
"a.atttypid != 0 AND "
"c.relname = '%s' AND "
"pg_catalog.pg_table_is_visible(c.oid)", state->table);
+ (void)r;
}
LWDEBUGF(3, "query is: %s\n", query);
@@ -1951,7 +1955,7 @@ ShpDumperOpenTable(SHPDUMPERSTATE *state)
state->fetchres = NULL;
/* Generate the fetch query */
- asprintf(&(state->fetch_query), "FETCH %d FROM cur", state->config->fetchsize);
+ tmpint = asprintf(&(state->fetch_query), "FETCH %d FROM cur", state->config->fetchsize);
return SHPDUMPEROK;
}
-----------------------------------------------------------------------
Summary of changes:
loader/pgsql2shp-core.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list