[SCM] PostGIS branch master updated. 3.5.0alpha2-41-gc58d252fa
git at osgeo.org
git at osgeo.org
Wed Aug 28 04:55:10 PDT 2024
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 c58d252fa72c2dfd035f6b5a3b3a4a60301c2b60 (commit)
from 2260a504389889bbc91cb1293bfc7aae861719fd (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 c58d252fa72c2dfd035f6b5a3b3a4a60301c2b60
Author: Sandro Santilli <strk at kbt.io>
Date: Wed Aug 28 13:54:56 2024 +0200
Fix some -pedantic warnings
diff --git a/liblwgeom/gserialized.c b/liblwgeom/gserialized.c
index e5c41bd0e..29aa67185 100644
--- a/liblwgeom/gserialized.c
+++ b/liblwgeom/gserialized.c
@@ -50,7 +50,7 @@ lwflags_t gserialized_get_lwflags(const GSERIALIZED *g)
return gserialized2_get_lwflags(g);
else
return gserialized1_get_lwflags(g);
-};
+}
/**
* Copy a new bounding box into an existing gserialized.
@@ -167,9 +167,9 @@ int32_t gserialized_get_srid(const GSERIALIZED *g)
void gserialized_set_srid(GSERIALIZED *g, int32_t srid)
{
if (GFLAGS_GET_VERSION(g->gflags))
- return gserialized2_set_srid(g, srid);
+ gserialized2_set_srid(g, srid);
else
- return gserialized1_set_srid(g, srid);
+ gserialized1_set_srid(g, srid);
}
/**
diff --git a/liblwgeom/lwgeom.c b/liblwgeom/lwgeom.c
index 2fa56aa6c..86bd54143 100644
--- a/liblwgeom/lwgeom.c
+++ b/liblwgeom/lwgeom.c
@@ -571,7 +571,7 @@ lwgeom_to_ewkt(const LWGEOM *lwgeom)
if ( ! wkt )
{
- lwerror("Error writing geom %p to WKT", lwgeom);
+ lwerror("Error writing geom %p to WKT", (void *)lwgeom);
}
return wkt;
diff --git a/liblwgeom/lwgeom_wrapx.c b/liblwgeom/lwgeom_wrapx.c
index 0f50ae2b6..593905cc0 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, wrap_geoms[j]);
+ lwnotice("cleaning geometry %d (%p)", j, (void *) wrap_geoms[j]);
lwgeom_free(wrap_geoms[j]);
}
lwfree(wrap_geoms);
diff --git a/liblwgeom/lwin_twkb.c b/liblwgeom/lwin_twkb.c
index 445b4a9b0..72fc53306 100644
--- a/liblwgeom/lwin_twkb.c
+++ b/liblwgeom/lwin_twkb.c
@@ -360,7 +360,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)", geom, col);
+ lwerror("Unable to add geometry (%p) to collection (%p)", (void *) geom, (void *) col);
return NULL;
}
}
@@ -399,7 +399,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)", geom, col);
+ lwerror("Unable to add geometry (%p) to collection (%p)", (void *) geom, (void *) col);
return NULL;
}
}
@@ -437,7 +437,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)", geom, col);
+ lwerror("Unable to add geometry (%p) to collection (%p)", (void *) geom, (void *) col);
return NULL;
}
}
@@ -477,7 +477,7 @@ static LWCOLLECTION* lwcollection_from_twkb_state(twkb_parse_state *s)
geom = lwgeom_from_twkb_state(s);
if ( lwcollection_add_lwgeom(col, geom) == NULL )
{
- lwerror("Unable to add geometry (%p) to collection (%p)", geom, col);
+ lwerror("Unable to add geometry (%p) to collection (%p)", (void *) geom, (void *) col);
return NULL;
}
}
diff --git a/liblwgeom/lwin_wkb.c b/liblwgeom/lwin_wkb.c
index 3e1d5f0ff..476ff8ee2 100644
--- a/liblwgeom/lwin_wkb.c
+++ b/liblwgeom/lwin_wkb.c
@@ -672,7 +672,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)", geom, cp);
+ lwerror("Unable to add geometry (%p) to curvepoly (%p)", (void *) geom, (void *) cp);
return NULL;
}
}
@@ -723,7 +723,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)", geom, col);
+ lwerror("Unable to add geometry (%p) to collection (%p)", (void *) geom, (void *) col);
return NULL;
}
}
-----------------------------------------------------------------------
Summary of changes:
liblwgeom/gserialized.c | 6 +++---
liblwgeom/lwgeom.c | 2 +-
liblwgeom/lwgeom_wrapx.c | 2 +-
liblwgeom/lwin_twkb.c | 8 ++++----
liblwgeom/lwin_wkb.c | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list