[SCM] PostGIS branch master updated. 3.7.0rc3-14-gd6ec8333c

git at osgeo.org git at osgeo.org
Sat Nov 14 02:16:59 PST 2026


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, master has been updated
       via  d6ec8333c914a8bbd9aa44d03e43beae23c052d7 (commit)
       via  d4fde9a32150658a01e3c5f1ad4429c2ab0ae16e (commit)
       via  2bc7c7d3051225d5f6963659797ba6b4e6d514e9 (commit)
      from  c87677a620f814978f9eb3dced943c2b1241d149 (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 d6ec8333c914a8bbd9aa44d03e43beae23c052d7
Merge: c87677a62 d4fde9a32
Author: Darafei Praliaskouski <me at komzpa.net>
Date:   Sat Nov 14 13:08:57 2026 +0400

    Remove pointer addresses from error and notice messages
    
    Preserve Andrew Kroh's contribution and credit it in NEWS.
    
    Closes https://gitea.osgeo.org/postgis/postgis/pulls/811

diff --cc NEWS
index b9ed897d6,b9ed897d6..26b8eb3eb
--- a/NEWS
+++ b/NEWS
@@@ -1,3 -1,3 +1,12 @@@
++PostGIS 3.8.0dev
++2026/xx/xx
++
++* Enhancements *
++
++ - GT-811, Remove pointer addresses from error and notice messages
++          (Andrew Kroh)
++
++
  PostGIS 3.7.0rc3
  2026/10/20
  

commit d4fde9a32150658a01e3c5f1ad4429c2ab0ae16e
Author: Andrew Kroh <andrew.kroh at clickhouse.com>
Date:   Fri Nov 13 11:30:25 2026 -0500

    Add Andrew Kroh to the contributor credits

diff --git a/doc/credits.xml b/doc/credits.xml
index 70e15cebc..120923a38 100644
--- a/doc/credits.xml
+++ b/doc/credits.xml
@@ -265,6 +265,7 @@
 					<member>Andreas Schild</member>
 					<member>Andrew Gierth</member>
 					<member>Andrew Harvey</member>
+					<member>Andrew Kroh</member>
 					<member>Anne Ghisla</member>
 					<member>Antoine Bajolet</member>
 					<member>Ariel Mashraki</member>

commit 2bc7c7d3051225d5f6963659797ba6b4e6d514e9
Author: Andrew Kroh <andrew.kroh at clickhouse.com>
Date:   Fri Nov 13 11:30:25 2026 -0500

    Remove pointer values from error and notice messages
    
    Some lwerror(), lwnotice(), and elog(ERROR) messages in liblwgeom,
    libpgcommon, and postgis print a pointer value with %p. The value
    is different in each process, and a reader of the message cannot
    use it without a debugger.
    
    Remove the pointer values from the message text. The other words
    of each message do not change. Messages at DEBUG level keep their
    pointer values.

diff --git a/liblwgeom/lwcollection.c b/liblwgeom/lwcollection.c
index 1c2db7cfe..11073682c 100644
--- a/liblwgeom/lwcollection.c
+++ b/liblwgeom/lwcollection.c
@@ -221,7 +221,7 @@ LWCOLLECTION* lwcollection_add_lwgeom(LWCOLLECTION *col, const LWGEOM *geom)
 		{
 			if (col->geoms[i] == geom)
 			{
-				lwerror("%s [%d] found duplicate geometry in collection %p == %p", __FILE__, __LINE__, col->geoms[i], geom);
+				lwerror("%s [%d] found duplicate geometry in collection", __FILE__, __LINE__);
 				return col;
 			}
 		}
diff --git a/liblwgeom/lwgeom.c b/liblwgeom/lwgeom.c
index 4d3b272b1..b9ba2be8e 100644
--- a/liblwgeom/lwgeom.c
+++ b/liblwgeom/lwgeom.c
@@ -731,7 +731,7 @@ lwgeom_to_ewkt(const LWGEOM *lwgeom)
 
 	if ( ! wkt )
 	{
-		lwerror("Error writing geom %p to WKT", (void *)lwgeom);
+		lwerror("Error writing geometry to WKT");
 	}
 
 	return wkt;
diff --git a/liblwgeom/lwgeom_wrapx.c b/liblwgeom/lwgeom_wrapx.c
index 9ebeda8dc..c6cbe89f8 100644
--- a/liblwgeom/lwgeom_wrapx.c
+++ b/liblwgeom/lwgeom_wrapx.c
@@ -142,7 +142,7 @@ lwcollection_wrapx(const LWCOLLECTION* lwcoll_in, double cutx, double amount)
 			lwnotice("Error wrapping geometry, cleaning up");
 			for (j = 0; j < i; j++)
 			{
-				lwnotice("cleaning geometry %d (%p)", j, (void *) wrap_geoms[j]);
+				lwnotice("cleaning geometry %d", j);
 				lwgeom_free(wrap_geoms[j]);
 			}
 			lwfree(wrap_geoms);
diff --git a/liblwgeom/lwin_twkb.c b/liblwgeom/lwin_twkb.c
index dc5ebd6ec..7bab5437e 100644
--- a/liblwgeom/lwin_twkb.c
+++ b/liblwgeom/lwin_twkb.c
@@ -441,7 +441,7 @@ static LWCOLLECTION* lwmultipoint_from_twkb_state(twkb_parse_state *s)
 		geom = lwpoint_as_lwgeom(lwpoint_from_twkb_state(s));
 		if ( lwcollection_add_lwgeom(col, geom) == NULL )
 		{
-			lwerror("Unable to add geometry (%p) to collection (%p)", (void *) geom, (void *) col);
+			lwerror("Unable to add geometry to collection");
 			return NULL;
 		}
 	}
@@ -486,7 +486,7 @@ static LWCOLLECTION* lwmultiline_from_twkb_state(twkb_parse_state *s)
 		geom = lwline_as_lwgeom(lwline_from_twkb_state(s));
 		if ( lwcollection_add_lwgeom(col, geom) == NULL )
 		{
-			lwerror("Unable to add geometry (%p) to collection (%p)", (void *) geom, (void *) col);
+			lwerror("Unable to add geometry to collection");
 			return NULL;
 		}
 	}
@@ -530,7 +530,7 @@ static LWCOLLECTION* lwmultipoly_from_twkb_state(twkb_parse_state *s)
 		geom = lwpoly_as_lwgeom(lwpoly_from_twkb_state(s));
 		if ( lwcollection_add_lwgeom(col, geom) == NULL )
 		{
-			lwerror("Unable to add geometry (%p) to collection (%p)", (void *) geom, (void *) col);
+			lwerror("Unable to add geometry to collection");
 			return NULL;
 		}
 	}
diff --git a/liblwgeom/lwin_wkb.c b/liblwgeom/lwin_wkb.c
index 02a7ad90d..bbe8bc87d 100644
--- a/liblwgeom/lwin_wkb.c
+++ b/liblwgeom/lwin_wkb.c
@@ -760,7 +760,7 @@ static LWCURVEPOLY* lwcurvepoly_from_wkb_state(wkb_parse_state *s)
 		{
 			lwgeom_free(geom);
 			lwgeom_free((LWGEOM *)cp);
-			lwerror("Unable to add geometry (%p) to curvepoly (%p)", (void *) geom, (void *) cp);
+			lwerror("Unable to add geometry to curvepoly");
 			return NULL;
 		}
 	}
@@ -835,7 +835,7 @@ static LWCOLLECTION* lwcollection_from_wkb_state(wkb_parse_state *s)
 		{
 			lwgeom_free(geom);
 			lwgeom_free((LWGEOM *)col);
-			lwerror("Unable to add geometry (%p) to collection (%p)", (void *) geom, (void *) col);
+			lwerror("Unable to add geometry to collection");
 			s->check = prev_check;
 			s->depth = start_depth;
 			return NULL;
diff --git a/libpgcommon/lwgeom_pg.c b/libpgcommon/lwgeom_pg.c
index d2e2fd061..c53d5eeba 100644
--- a/libpgcommon/lwgeom_pg.c
+++ b/libpgcommon/lwgeom_pg.c
@@ -603,7 +603,7 @@ CallerFInfoFunctionCall3(PGFunction func, FmgrInfo *flinfo, Oid collation, Datum
 
     /* Check for null result, since caller is clearly not expecting one */
     if (fcinfo->isnull)
-        elog(ERROR, "function %p returned NULL", (void *)&func);
+	    elog(ERROR, "function returned NULL");
 
     return result;
 }
diff --git a/libpgcommon/lwgeom_transform.c b/libpgcommon/lwgeom_transform.c
index 305bebaa1..39a63fb4b 100644
--- a/libpgcommon/lwgeom_transform.c
+++ b/libpgcommon/lwgeom_transform.c
@@ -111,7 +111,7 @@ GetPROJSRSCache(void)
 		cache = MemoryContextAllocZero(context, sizeof(PROJSRSCache));
 
 		if (!cache)
-			elog(ERROR, "Unable to allocate space for PROJSRSCache in context %p", (void *)context);
+			elog(ERROR, "Unable to allocate space for PROJSRSCache");
 
 		cache->PROJSRSCacheCount = 0;
 		cache->PROJSRSCacheContext = context;
diff --git a/postgis/lwgeom_geos_prepared.c b/postgis/lwgeom_geos_prepared.c
index 79dafad7e..fbe636251 100644
--- a/postgis/lwgeom_geos_prepared.c
+++ b/postgis/lwgeom_geos_prepared.c
@@ -106,7 +106,8 @@ PreparedCacheDelete(void *ptr)
 	pghe = GetPrepGeomHashEntry(context);
 
 	if (!pghe)
-		elog(ERROR, "PreparedCacheDelete: Trying to delete non-existent hash entry object with MemoryContext key (%p)", (void *)context);
+		elog(ERROR,
+		     "PreparedCacheDelete: Trying to delete non-existent hash entry object with MemoryContext key");
 
 	POSTGIS_DEBUGF(3, "deleting geom object (%p) and prepared geom object (%p) with MemoryContext key (%p)", pghe->geom, pghe->prepared_geom, context);
 
@@ -167,7 +168,7 @@ AddPrepGeomHashEntry(PrepGeomHashEntry pghe)
 	}
 	else
 	{
-		elog(ERROR, "AddPrepGeomHashEntry: This memory context is already in use! (%p)", (void *)pghe.context);
+		elog(ERROR, "AddPrepGeomHashEntry: This memory context is already in use!");
 	}
 }
 
@@ -201,7 +202,9 @@ DeletePrepGeomHashEntry(MemoryContext mcxt)
 
 	if (!he)
 	{
-		elog(ERROR, "DeletePrepGeomHashEntry: There was an error removing the geometry object from this MemoryContext (%p)", (void *)mcxt);
+		elog(
+		    ERROR,
+		    "DeletePrepGeomHashEntry: There was an error removing the geometry object from this MemoryContext");
 	}
 
 	he->prepared_geom = NULL;
@@ -280,7 +283,7 @@ PrepGeomCacheBuilder(const LWGEOM *lwgeom, GeomCache *cache)
 	pghe = GetPrepGeomHashEntry(prepcache->context_callback);
 	if ( ! pghe )
 	{
-		lwpgerror("PrepGeomCacheBuilder failed to find hash entry for context %p", (void *)prepcache->context_callback);
+		lwpgerror("PrepGeomCacheBuilder failed to find hash entry for context");
 		return LW_FAILURE;
 	}
 
@@ -316,7 +319,7 @@ PrepGeomCacheCleaner(GeomCache *cache)
 	pghe = GetPrepGeomHashEntry(prepcache->context_callback);
 	if ( ! pghe )
 	{
-		lwpgerror("PrepGeomCacheCleaner failed to find hash entry for context %p", prepcache->context_callback);
+		lwpgerror("PrepGeomCacheCleaner failed to find hash entry for context");
 		return LW_FAILURE;
 	}
 	pghe->geom = 0;

-----------------------------------------------------------------------

Summary of changes:
 NEWS                           |  9 +++++++++
 doc/credits.xml                |  1 +
 liblwgeom/lwcollection.c       |  2 +-
 liblwgeom/lwgeom.c             |  2 +-
 liblwgeom/lwgeom_wrapx.c       |  2 +-
 liblwgeom/lwin_twkb.c          |  6 +++---
 liblwgeom/lwin_wkb.c           |  4 ++--
 libpgcommon/lwgeom_pg.c        |  2 +-
 libpgcommon/lwgeom_transform.c |  2 +-
 postgis/lwgeom_geos_prepared.c | 13 ++++++++-----
 10 files changed, 28 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list