- Corrected error handling in PGTYPEStimestamp_from_asc.

Michael Meskes · Michael Meskes · commit 1f87d79142b1 · 2004-02-24T16:07:49.000Z
- Set pgtypeslib version to 1.2.
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -1746,5 +1746,10 @@ Mon Feb 16 08:17:19 CET 2004
 	- Cleaned up parser a little bit. It does not make sense to allow a
 	  typename to be typedef'ed that cannot be parsed as variable type.
 	- Allowed some SQL keywords to be used as C variable names.
+
+Tue Feb 24 16:48:57 CET 2004
+
+	- Corrected error handling in PGTYPEStimestamp_from_asc.
+	- Set pgtypeslib version to 1.2.
 	- Set ecpg version to 3.1.1.
 
diff --git a/src/interfaces/ecpg/pgtypeslib/Makefile b/src/interfaces/ecpg/pgtypeslib/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.15 2003/11/30 06:09:46 momjian Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.16 2004/02/24 16:07:49 meskes Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global
 
 NAME= pgtypes
 SO_MAJOR_VERSION= 1
-SO_MINOR_VERSION= 1
+SO_MINOR_VERSION= 2
 
 override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(top_srcdir)/src/include/utils -I$(libpq_srcdir) $(CPPFLAGS) $(THREAD_CPPFLAGS)
 SHLIB_LINK += -lm
diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c
@@ -291,7 +291,6 @@ PGTYPEStimestamp_from_asc(char *str, char **endptr)
 	char	   *realptr;
 	char	  **ptr = (endptr != NULL) ? endptr : &realptr;
 
-	errno = 0;
 	if (strlen(str) >= sizeof(lowstr))
 	{
 		errno = PGTYPES_TS_BAD_TIMESTAMP;
@@ -338,6 +337,8 @@ PGTYPEStimestamp_from_asc(char *str, char **endptr)
 
 	/* AdjustTimestampForTypmod(&result, typmod); */
 
+	/* Since it's difficult to test for noresult, make sure errno is 0 if no error occured. */
+	errno = 0;
 	return result;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1994, Regents of the University of California`
`6`	`6`	`#`
`7`		`-# $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.15 2003/11/30 06:09:46 momjian Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.16 2004/02/24 16:07:49 meskes Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global`
`14`	`14`
`15`	`15`	`NAME= pgtypes`
`16`	`16`	`SO_MAJOR_VERSION= 1`
`17`		`-SO_MINOR_VERSION= 1`
	`17`	`+SO_MINOR_VERSION= 2`
`18`	`18`
`19`	`19`	`override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(top_srcdir)/src/include/utils -I$(libpq_srcdir) $(CPPFLAGS) $(THREAD_CPPFLAGS)`
`20`	`20`	`SHLIB_LINK += -lm`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,6 @@ PGTYPEStimestamp_from_asc(char str, char *endptr)`
`291`	`291`	`char *realptr;`
`292`	`292`	`char **ptr = (endptr != NULL) ? endptr : &realptr;`
`293`	`293`
`294`		`- errno = 0;`
`295`	`294`	`if (strlen(str) >= sizeof(lowstr))`
`296`	`295`	`{`
`297`	`296`	`errno = PGTYPES_TS_BAD_TIMESTAMP;`
`@@ -338,6 +337,8 @@ PGTYPEStimestamp_from_asc(char str, char *endptr)`
`338`	`337`
`339`	`338`	`/* AdjustTimestampForTypmod(&result, typmod); */`
`340`	`339`
	`340`	`+ /* Since it's difficult to test for noresult, make sure errno is 0 if no error occured. */`
	`341`	`+ errno = 0;`
`341`	`342`	`return result;`
`342`	`343`	`}`
`343`	`344`