[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0alpha1-90-g223a9904e

[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  223a9904eeb0f82a88c9d039c3bdabf0824e1034 (commit)
       via  4879d97f16df8a00791fbddd9522fd9b750012fc (commit)
       via  de6d9c824dda4996ec96893cb132741d9eff5a5f (commit)
       via  5b89c1ff82bc4be2f82b5f3f5cad794f795936f0 (commit)
      from  6cd8406b516bdb5dc16170342abdca3efa1f6246 (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 223a9904eeb0f82a88c9d039c3bdabf0824e1034
Merge: 6cd8406b5 4879d97f1
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Jun 17 12:11:19 2022 -0700

    Merge branch 'lbartoletti-gserialized_fix_always_true_condition'


commit 4879d97f16df8a00791fbddd9522fd9b750012fc
Merge: 6cd8406b5 de6d9c824
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Jun 17 12:11:03 2022 -0700

    Merge branch 'gserialized_fix_always_true_condition' of github.com:lbartoletti/postgis into lbartoletti-gserialized_fix_always_true_condition


commit de6d9c824dda4996ec96893cb132741d9eff5a5f
Author: Loïc Bartoletti <loic.bartoletti at oslandia.com>
Date:   Thu Jun 16 13:01:17 2022 +0200

    apply astyle

diff --git a/liblwgeom/gserialized.c b/liblwgeom/gserialized.c
index 9387dbc80..2badbfd5c 100644
--- a/liblwgeom/gserialized.c
+++ b/liblwgeom/gserialized.c
@@ -367,7 +367,7 @@ int gserialized_cmp(const GSERIALIZED *g1, const GSERIALIZED *g2)
 		{
 			if (bsz1 < bsz2)
 				return -1;
-                        return 1;
+			return 1;
 		}
 
 		/* If SRID is not equal, sort on it */

commit 5b89c1ff82bc4be2f82b5f3f5cad794f795936f0
Author: Loïc Bartoletti <loic.bartoletti at oslandia.com>
Date:   Thu Jun 16 12:55:27 2022 +0200

    gserialized.c: Fix an always true condition
    
    At line 366 we always check that bsz1 is different than bsz2. So, if
    bsz1 is not inferior to bsz2, it always true than bsz1 is superior to
    bsz2.
    We could remove the else if part and return 1.

diff --git a/liblwgeom/gserialized.c b/liblwgeom/gserialized.c
index 1a66023bf..9387dbc80 100644
--- a/liblwgeom/gserialized.c
+++ b/liblwgeom/gserialized.c
@@ -367,8 +367,7 @@ int gserialized_cmp(const GSERIALIZED *g1, const GSERIALIZED *g2)
 		{
 			if (bsz1 < bsz2)
 				return -1;
-			else if (bsz1 > bsz2)
-				return 1;
+                        return 1;
 		}
 
 		/* If SRID is not equal, sort on it */

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

Summary of changes:
 liblwgeom/gserialized.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
PostGIS