From b55193f5c376c0941549da2bdbaf8f46866a8fe5 Mon Sep 17 00:00:00 2001 From: Paul Ramsey Date: Wed, 9 Apr 2014 20:10:13 +0000 Subject: [PATCH] Quiet LLVM warnings and remove old ignores from properties git-svn-id: http://svn.osgeo.org/postgis/trunk@12448 b70326c6-7e19-0410-871a-916f4a2858ee --- liblwgeom/lwgeodetic.c | 10 ++++++---- liblwgeom/lwout_twkb.c | 2 +- loader/pgsql2shp-core.c | 2 +- postgis/lwgeom_sqlmm.c | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/liblwgeom/lwgeodetic.c b/liblwgeom/lwgeodetic.c index 93cce9ab0..84cc3f4b7 100644 --- a/liblwgeom/lwgeodetic.c +++ b/liblwgeom/lwgeodetic.c @@ -443,10 +443,12 @@ static void vector_scale(POINT3D *n, double scale) return; } -static inline double vector_magnitude(const POINT3D* v) -{ - return sqrt(v->x*v->x + v->y*v->y + v->z*v->z); -} +/* +* static inline double vector_magnitude(const POINT3D* v) +* { +* return sqrt(v->x*v->x + v->y*v->y + v->z*v->z); +* } +*/ /** * Angle between two unit vectors diff --git a/liblwgeom/lwout_twkb.c b/liblwgeom/lwout_twkb.c index 484576bb6..8593d280c 100644 --- a/liblwgeom/lwout_twkb.c +++ b/liblwgeom/lwout_twkb.c @@ -130,7 +130,7 @@ int u_getvarint_size(uint64_t val) { LWDEBUGF(2, "Entered u_getvarint_size",0); - if(val<0||val>max_varint) + if(val>max_varint) lwerror("Value is out of range for unsigned varint (0 to %ld)", max_varint); uint64_t q; int n=0; diff --git a/loader/pgsql2shp-core.c b/loader/pgsql2shp-core.c index 807d9d1f3..6ec71887f 100644 --- a/loader/pgsql2shp-core.c +++ b/loader/pgsql2shp-core.c @@ -1207,7 +1207,7 @@ read_column_map(SHPDUMPERSTATE *state) state->column_map_pgfieldnames[curmapsize][fieldnamesize] = '\0'; /* Now swallow up any whitespace */ - for (tmpstr = tmpptr; *tmpptr == '\t' || *tmpptr == '\n' || *tmpptr == ' '; tmpptr++); + for (tmpstr = tmpptr; *tmpptr == '\t' || *tmpptr == '\n' || *tmpptr == ' '; tmpptr++) {} /* Finally locate end of second column (dbffieldname) */ for (tmpstr = tmpptr; *tmpptr != '\t' && *tmpptr != '\n' && *tmpptr != ' ' && *tmpptr != '\0'; tmpptr++); diff --git a/postgis/lwgeom_sqlmm.c b/postgis/lwgeom_sqlmm.c index abb5e68cb..62b882d47 100644 --- a/postgis/lwgeom_sqlmm.c +++ b/postgis/lwgeom_sqlmm.c @@ -54,7 +54,7 @@ PG_FUNCTION_INFO_V1(LWGEOM_curve_segmentize); Datum LWGEOM_curve_segmentize(PG_FUNCTION_ARGS) { GSERIALIZED *geom = (GSERIALIZED *)PG_DETOAST_DATUM(PG_GETARG_DATUM(0)); - uint32 perQuad = PG_GETARG_INT32(1); + int32 perQuad = PG_GETARG_INT32(1); GSERIALIZED *ret; LWGEOM *igeom = NULL, *ogeom = NULL; -- 2.40.0