[SCM] PostGIS branch master updated. 3.4.0rc1-967-g19b34383b

[git at osgeo.org]

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  19b34383bc2bb5b824a8c970d8acf8984688ab3e (commit)
       via  3395dd4e97080ab361d1514efe9ce4c1a948eb2f (commit)
      from  5030132559cd8504b0343efa903752f38c59bcee (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 19b34383bc2bb5b824a8c970d8acf8984688ab3e
Author: Sandro Santilli <strk at kbt.io>
Date:   Mon Mar 4 17:44:17 2024 +0100

    Do not compare signed and unsigned
    
    See 07a73c0f2c5cb07e33fd64dadd24fac35efdc0a5

diff --git a/loader/shpcommon.c b/loader/shpcommon.c
index ec7946778..38e90e460 100644
--- a/loader/shpcommon.c
+++ b/loader/shpcommon.c
@@ -268,13 +268,20 @@ colmap_read(const char *filename, colmap *map, char *errbuf, size_t errbuflen)
 
     /* Error out if the dbffieldname is > 10 chars */
     if (strlen(map->dbffieldnames[curmapsize]) > 10)
-    {
-      if ( errbuflen <= snprintf(errbuf, errbuflen,
+    {{
+      int ret = snprintf(errbuf, errbuflen,
         _("ERROR: column map file specifies a DBF field name \"%s\" which is longer than 10 characters"),
-        map->dbffieldnames[curmapsize])
-      ) errbuf[errbuflen-1] = '\0';
+        map->dbffieldnames[curmapsize]);
+      if ( ret < 0 ) {
+        /* output error - TODO: report via perror? */
+        return 0;
+      }
+      if ( errbuflen <= (size_t)ret ) {
+        /* output truncated */
+        errbuf[errbuflen-1] = '\0';
+      }
       return 0;
-    }
+    }}
 
     ++curmapsize;
   }

commit 3395dd4e97080ab361d1514efe9ce4c1a948eb2f
Author: Sandro Santilli <strk at kbt.io>
Date:   Mon Mar 4 17:00:04 2024 +0100

    Do not debug-print geometries in debug level 1

diff --git a/liblwgeom/topo/lwgeom_topo.c b/liblwgeom/topo/lwgeom_topo.c
index c3da57c02..630cace9f 100644
--- a/liblwgeom/topo/lwgeom_topo.c
+++ b/liblwgeom/topo/lwgeom_topo.c
@@ -5532,7 +5532,7 @@ _lwt_AddLineEdge( LWT_TOPOLOGY* topo, LWLINE* edge, double tol,
   if ( tol )
   {{
     tmp2 = lwline_remove_repeated_points(edge, tol);
-    LWDEBUGG(1, tmp2, "Repeated-point removed");
+    LWDEBUGG(2, tmp2, "Repeated-point removed");
     edge = lwgeom_as_lwline(tmp2);
     if ( tmp ) lwgeom_free(tmp);
     tmp = tmp2;
@@ -5896,7 +5896,7 @@ _lwt_AddLine(LWT_TOPOLOGY* topo, LWLINE* line, double tol, int* nedges,
   if ( nodes ) _lwt_release_nodes(nodes, numnodes);
   if ( edges ) _lwt_release_edges(edges, numedges);
 
-  LWDEBUGG(1, noded, "Finally-noded");
+  LWDEBUGG(2, noded, "Finally-noded");
 
   /* 3. For each (now-noded) segment, insert an edge */
   col = lwgeom_as_lwcollection(noded);
@@ -5956,7 +5956,7 @@ _lwt_AddLine(LWT_TOPOLOGY* topo, LWLINE* line, double tol, int* nedges,
     ids[num++] = forward ? id : -id; /* TODO: skip duplicates */
   }
 
-  LWDEBUGG(1, noded, "Noded before free");
+  LWDEBUGG(2, noded, "Noded before free");
   lwgeom_free(noded);
 
   /* TODO: XXX remove duplicated ids if not done before */

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

Summary of changes:
 liblwgeom/topo/lwgeom_topo.c |  6 +++---
 loader/shpcommon.c           | 17 ++++++++++++-----
 2 files changed, 15 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
PostGIS