Cleaned up ecpglib and renamed functions that do not need to be exported.

Created export list for ecpglib.

1 files changed, 31 insertions, 31 deletions

diff --git a/src/interfaces/ecpg/ecpglib/data.c b/src/interfaces/ecpg/ecpglib/data.c
index 949e86f5591..07282ffbe28 100644
--- a/src/interfaces/ecpg/ecpglib/data.c
+++ b/src/interfaces/ecpg/ecpglib/data.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/data.c,v 1.38 2007/05/10 14:29:21 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/data.c,v 1.39 2007/10/03 11:11:12 meskes Exp $ */
 
 #define POSTGRES_ECPG_INTERNAL
 #include "postgres_fe.h"
@@ -39,7 +39,7 @@ garbage_left(enum ARRAY_TYPE isarray, char *scan_length, enum COMPAT_MODE compat
 }
 
 bool
-ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
+ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 			 enum ECPGttype type, enum ECPGttype ind_type,
 			 char *var, char *ind, long varcharsize, long offset,
 			 long ind_offset, enum ARRAY_TYPE isarray, enum COMPAT_MODE compat, bool force_indicator)
@@ -60,7 +60,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 	else
 		log_offset = offset;
 
-	ECPGlog("ECPGget_data line %d: RESULT: %s offset: %ld array: %s\n", lineno, pval ? (binary ? "BINARY" : pval) : "EMPTY", log_offset, isarray ? "Yes" : "No");
+	ecpg_log("ecpg_get_data line %d: RESULT: %s offset: %ld array: %s\n", lineno, pval ? (binary ? "BINARY" : pval) : "EMPTY", log_offset, isarray ? "Yes" : "No");
 
 	/* We will have to decode the value */
 
@@ -104,7 +104,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 				}
 				else
 				{
-					ECPGraise(lineno, ECPG_MISSING_INDICATOR,
+					ecpg_raise(lineno, ECPG_MISSING_INDICATOR,
 							  ECPG_SQLSTATE_NULL_VALUE_NO_INDICATOR_PARAMETER,
 							  NULL);
 					return (false);
@@ -112,9 +112,9 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 			}
 			break;
 		default:
-			ECPGraise(lineno, ECPG_UNSUPPORTED,
+			ecpg_raise(lineno, ECPG_UNSUPPORTED,
 					  ECPG_SQLSTATE_ECPG_INTERNAL_ERROR,
-					  ECPGtype_name(ind_type));
+					  ecpg_type_name(ind_type));
 			return (false);
 			break;
 	}
@@ -128,7 +128,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 	{
 		if (!pval || *pval != '{')
 		{
-			ECPGraise(lineno, ECPG_DATA_NOT_ARRAY,
+			ecpg_raise(lineno, ECPG_DATA_NOT_ARRAY,
 					  ECPG_SQLSTATE_DATATYPE_MISMATCH, NULL);
 			return (false);
 		}
@@ -213,7 +213,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 						res = strtol(pval, &scan_length, 10);
 						if (garbage_left(isarray, scan_length, compat))
 						{
-							ECPGraise(lineno, ECPG_INT_FORMAT,
+							ecpg_raise(lineno, ECPG_INT_FORMAT,
 									  ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
 							return (false);
 						}
@@ -247,7 +247,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 						ures = strtoul(pval, &scan_length, 10);
 						if (garbage_left(isarray, scan_length, compat))
 						{
-							ECPGraise(lineno, ECPG_UINT_FORMAT,
+							ecpg_raise(lineno, ECPG_UINT_FORMAT,
 									  ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
 							return (false);
 						}
@@ -281,7 +281,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 						*((long long int *) (var + offset * act_tuple)) = strtoll(pval, &scan_length, 10);
 						if (garbage_left(isarray, scan_length, compat))
 						{
-							ECPGraise(lineno, ECPG_INT_FORMAT, ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
+							ecpg_raise(lineno, ECPG_INT_FORMAT, ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
 							return (false);
 						}
 						pval = scan_length;
@@ -299,7 +299,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 						if ((isarray && *scan_length != ',' && *scan_length != '}')
 							|| (!isarray && !(INFORMIX_MODE(compat) && *scan_length == '.') && *scan_length != '\0' && *scan_length != ' '))	/* Garbage left */
 						{
-							ECPGraise(lineno, ECPG_UINT_FORMAT, ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
+							ecpg_raise(lineno, ECPG_UINT_FORMAT, ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
 							return (false);
 						}
 						pval = scan_length;
@@ -325,7 +325,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 
 						if (garbage_left(isarray, scan_length, compat))
 						{
-							ECPGraise(lineno, ECPG_FLOAT_FORMAT,
+							ecpg_raise(lineno, ECPG_FLOAT_FORMAT,
 									  ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
 							return (false);
 						}
@@ -358,7 +358,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 							else if (offset == sizeof(int))
 								*((int *) (var + offset * act_tuple)) = false;
 							else
-								ECPGraise(lineno, ECPG_CONVERT_BOOL,
+								ecpg_raise(lineno, ECPG_CONVERT_BOOL,
 										  ECPG_SQLSTATE_DATATYPE_MISMATCH,
 										  "different size");
 							break;
@@ -370,7 +370,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 							else if (offset == sizeof(int))
 								*((int *) (var + offset * act_tuple)) = true;
 							else
-								ECPGraise(lineno, ECPG_CONVERT_BOOL,
+								ecpg_raise(lineno, ECPG_CONVERT_BOOL,
 										  ECPG_SQLSTATE_DATATYPE_MISMATCH,
 										  "different size");
 							break;
@@ -382,7 +382,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 						}
 					}
 
-					ECPGraise(lineno, ECPG_CONVERT_BOOL,
+					ecpg_raise(lineno, ECPG_CONVERT_BOOL,
 							  ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
 					return (false);
 					break;
@@ -490,7 +490,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 						/* did we get an error? */
 						if (nres == NULL)
 						{
-							ECPGlog("ECPGget_data line %d: RESULT: %s errno %d\n",
+							ecpg_log("ecpg_get_data line %d: RESULT: %s errno %d\n",
 									lineno, pval ? pval : "", errno);
 
 							if (INFORMIX_MODE(compat))
@@ -504,14 +504,14 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 									ECPGset_noind_null(ECPGt_numeric, nres);
 								else
 								{
-									ECPGraise(lineno, ECPG_OUT_OF_MEMORY,
+									ecpg_raise(lineno, ECPG_OUT_OF_MEMORY,
 									 ECPG_SQLSTATE_ECPG_OUT_OF_MEMORY, NULL);
 									return (false);
 								}
 							}
 							else
 							{
-								ECPGraise(lineno, ECPG_NUMERIC_FORMAT,
+								ecpg_raise(lineno, ECPG_NUMERIC_FORMAT,
 									  ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
 								return (false);
 							}
@@ -524,7 +524,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 							if (garbage_left(isarray, scan_length, compat))
 							{
 								free(nres);
-								ECPGraise(lineno, ECPG_NUMERIC_FORMAT,
+								ecpg_raise(lineno, ECPG_NUMERIC_FORMAT,
 									  ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
 								return (false);
 							}
@@ -553,7 +553,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 						/* did we get an error? */
 						if (ires == NULL)
 						{
-							ECPGlog("ECPGget_data line %d: RESULT: %s errno %d\n",
+							ecpg_log("ecpg_get_data line %d: RESULT: %s errno %d\n",
 									lineno, pval ? pval : "", errno);
 
 							if (INFORMIX_MODE(compat))
@@ -562,7 +562,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 								 * Informix wants its own NULL value here
 								 * instead of an error
 								 */
-								ires = (interval *) ECPGalloc(sizeof(interval), lineno);
+								ires = (interval *) ecpg_alloc(sizeof(interval), lineno);
 								if (!ires)
 									return (false);
 
@@ -570,7 +570,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 							}
 							else
 							{
-								ECPGraise(lineno, ECPG_INTERVAL_FORMAT,
+								ecpg_raise(lineno, ECPG_INTERVAL_FORMAT,
 									  ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
 								return (false);
 							}
@@ -583,7 +583,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 							if (garbage_left(isarray, scan_length, compat))
 							{
 								free(ires);
-								ECPGraise(lineno, ECPG_INTERVAL_FORMAT,
+								ecpg_raise(lineno, ECPG_INTERVAL_FORMAT,
 									  ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
 								return (false);
 							}
@@ -607,7 +607,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 						/* did we get an error? */
 						if (errno != 0)
 						{
-							ECPGlog("ECPGget_data line %d: RESULT: %s errno %d\n",
+							ecpg_log("ecpg_get_data line %d: RESULT: %s errno %d\n",
 									lineno, pval ? pval : "", errno);
 
 							if (INFORMIX_MODE(compat))
@@ -620,7 +620,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 							}
 							else
 							{
-								ECPGraise(lineno, ECPG_DATE_FORMAT,
+								ecpg_raise(lineno, ECPG_DATE_FORMAT,
 									  ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
 								return (false);
 							}
@@ -632,7 +632,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 
 							if (garbage_left(isarray, scan_length, compat))
 							{
-								ECPGraise(lineno, ECPG_DATE_FORMAT,
+								ecpg_raise(lineno, ECPG_DATE_FORMAT,
 									  ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
 								return (false);
 							}
@@ -654,7 +654,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 						/* did we get an error? */
 						if (errno != 0)
 						{
-							ECPGlog("ECPGget_data line %d: RESULT: %s errno %d\n",
+							ecpg_log("ecpg_get_data line %d: RESULT: %s errno %d\n",
 									lineno, pval ? pval : "", errno);
 
 							if (INFORMIX_MODE(compat))
@@ -667,7 +667,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 							}
 							else
 							{
-								ECPGraise(lineno, ECPG_TIMESTAMP_FORMAT,
+								ecpg_raise(lineno, ECPG_TIMESTAMP_FORMAT,
 									  ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
 								return (false);
 							}
@@ -679,7 +679,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 
 							if (garbage_left(isarray, scan_length, compat))
 							{
-								ECPGraise(lineno, ECPG_TIMESTAMP_FORMAT,
+								ecpg_raise(lineno, ECPG_TIMESTAMP_FORMAT,
 									  ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
 								return (false);
 							}
@@ -691,9 +691,9 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 					break;
 
 				default:
-					ECPGraise(lineno, ECPG_UNSUPPORTED,
+					ecpg_raise(lineno, ECPG_UNSUPPORTED,
 							  ECPG_SQLSTATE_ECPG_INTERNAL_ERROR,
-							  ECPGtype_name(type));
+							  ecpg_type_name(type));
 					return (false);
 					break;
 			}