From: Paul Ramsey <pramsey@cleverelephant.ca>
Date: Mon, 27 Apr 2015 16:43:05 +0000 (+0000)
Subject: #2335, rename internal LWGEOMWKB to be a bit more clear it is for EWKB
X-Git-Tag: 2.2.0rc1~545
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3accb5ffbd1e81d6bc491fc3f89f0f862423e1f5;p=postgis

#2335, rename internal LWGEOMWKB to be a bit more clear it is for EWKB


git-svn-id: http://svn.osgeo.org/postgis/trunk@13451 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/libpgcommon/lwgeom_pg.h b/libpgcommon/lwgeom_pg.h
index 88f2c4c86..46f6ba9da 100644
--- a/libpgcommon/lwgeom_pg.h
+++ b/libpgcommon/lwgeom_pg.h
@@ -162,7 +162,7 @@ Datum LWGEOM_force_collection(PG_FUNCTION_ARGS);
 Datum LWGEOM_force_multi(PG_FUNCTION_ARGS);
 Datum LWGEOM_force_curve(PG_FUNCTION_ARGS);
 
-Datum LWGEOMFromWKB(PG_FUNCTION_ARGS);
+Datum LWGEOMFromEWKB(PG_FUNCTION_ARGS);
 Datum LWGEOMFromTWKB(PG_FUNCTION_ARGS);
 Datum WKBFromLWGEOM(PG_FUNCTION_ARGS);
 Datum TWKBFromLWGEOM(PG_FUNCTION_ARGS);
diff --git a/postgis/lwgeom_inout.c b/postgis/lwgeom_inout.c
index bf0daa40d..8d2b85824 100644
--- a/postgis/lwgeom_inout.c
+++ b/postgis/lwgeom_inout.c
@@ -323,14 +323,14 @@ Datum LWGEOM_to_text(PG_FUNCTION_ARGS)
 }
 
 /*
- * LWGEOMFromWKB(wkb,  [SRID] )
+ * LWGEOMFromEWKB(wkb,  [SRID] )
  * NOTE: wkb is in *binary* not hex form.
  *
  * NOTE: this function parses EWKB (extended form)
  *       which also contains SRID info. 
  */
-PG_FUNCTION_INFO_V1(LWGEOMFromWKB);
-Datum LWGEOMFromWKB(PG_FUNCTION_ARGS)
+PG_FUNCTION_INFO_V1(LWGEOMFromEWKB);
+Datum LWGEOMFromEWKB(PG_FUNCTION_ARGS)
 {
 	bytea *bytea_wkb = (bytea*)PG_GETARG_BYTEA_P(0);
 	int32 srid = 0;
@@ -638,7 +638,7 @@ Datum LWGEOM_from_bytea(PG_FUNCTION_ARGS)
 	POSTGIS_DEBUG(2, "LWGEOM_from_bytea start");
 
 	result = (GSERIALIZED *)DatumGetPointer(DirectFunctionCall1(
-	                                          LWGEOMFromWKB, PG_GETARG_DATUM(0)));
+	                                          LWGEOMFromEWKB, PG_GETARG_DATUM(0)));
 
 	PG_RETURN_POINTER(result);
 }
diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in
index b6ff9739c..cd6c7e885 100644
--- a/postgis/postgis.sql.in
+++ b/postgis/postgis.sql.in
@@ -1535,13 +1535,13 @@ CREATE OR REPLACE FUNCTION ST_AsLatLonText(geometry)
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION GeomFromEWKB(bytea)
 	RETURNS geometry
-	AS 'MODULE_PATHNAME','LWGEOMFromWKB'
+	AS 'MODULE_PATHNAME','LWGEOMFromEWKB'
 	LANGUAGE 'c' IMMUTABLE STRICT;
 
 -- Availability: 1.2.2
 CREATE OR REPLACE FUNCTION ST_GeomFromEWKB(bytea)
 	RETURNS geometry
-	AS 'MODULE_PATHNAME','LWGEOMFromWKB'
+	AS 'MODULE_PATHNAME','LWGEOMFromEWKB'
 	LANGUAGE 'c' IMMUTABLE STRICT;
 
 -- Availability: 2.2