[Pypgsql-checkins] CVS: pypgsql pgversion.c,1.16,1.17

[Gerhard H?r. <gha...@us...>]

Update of /cvsroot/pypgsql/pypgsql
In directory usw-pr-cvs1:/tmp/cvs-serv11701

Modified Files:
	pgversion.c 
Log Message:
16SEP2002 gh  Reflect the change to the unconditionally included
              pg_strtok_r.


Index: pgversion.c
===================================================================
RCS file: /cvsroot/pypgsql/pypgsql/pgversion.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** pgversion.c	5 Jun 2002 09:17:35 -0000	1.16
--- pgversion.c	16 Sep 2002 05:45:29 -0000	1.17
***************
*** 32,35 ****
--- 32,37 ----
  | Date      Ini Description						|
  | --------- --- ------------------------------------------------------- |
+ | 16SEP2002 gh  Reflect the change to the unconditionally included	|
+ |		pg_strtok_r.						|
  | 16APR2002 gh  Replace _tolower with the standard C tolower function,	|
  |               to make this file compile on FreeBSD.			|
***************
*** 123,127 ****
  static int pgstricmp(char *s1, char *s2)
  {
!     int c1, c2;
  
      for (;(*s1 != 0) && (*s2 != 0); s1++, s2++)
--- 125,129 ----
  static int pgstricmp(char *s1, char *s2)
  {
!     int c1 = 0, c2 = 0;
  
      for (;(*s1 != 0) && (*s2 != 0); s1++, s2++)
***************
*** 206,210 ****
      char *vstr;		    /* The version number from the version string */
      char *token;	    /* parsed token */
!     char *save_ptr;	    /* saves strtok_r state for subsequent calls */
      long major, minor, patch, value;
  
--- 208,212 ----
      char *vstr;		    /* The version number from the version string */
      char *token;	    /* parsed token */
!     char *save_ptr;	    /* saves pg_strtok_r state for subsequent calls */
      long major, minor, patch, value;
  
***************
*** 242,252 ****
  
  
! 	token = strtok_r(s, " \t", &save_ptr);
  	if (strcmp(token, "PostgreSQL") != 0)
  	    goto new_error;
  
! 	vstr = strtok_r((char *)NULL, " \t", &save_ptr);
  
! 	token = strtok_r((char *)NULL, " \t", &save_ptr);
  	if (strcmp(token, "on") != 0)
  	    goto new_error;
--- 244,254 ----
  
  
! 	token = pg_strtok_r(s, " \t", &save_ptr);
  	if (strcmp(token, "PostgreSQL") != 0)
  	    goto new_error;
  
! 	vstr = pg_strtok_r((char *)NULL, " \t", &save_ptr);
  
! 	token = pg_strtok_r((char *)NULL, " \t", &save_ptr);
  	if (strcmp(token, "on") != 0)
  	    goto new_error;
***************
*** 257,261 ****
  	\***************************************************************/
  
! 	token = strtok_r((char *)NULL, " \t", &save_ptr);
  	if (strcmp(token, "on") == 0)
  	    goto new_error;
--- 259,263 ----
  	\***************************************************************/
  
! 	token = pg_strtok_r((char *)NULL, " \t", &save_ptr);
  	if (strcmp(token, "on") == 0)
  	    goto new_error;
***************
*** 268,281 ****
  	save_ptr = (char *)NULL;
  
! 	token = strtok_r(vstr, ".", &save_ptr);
  	if (parseToken(token, &major))
  	    goto new_error;
  
! 	token = strtok_r((char *)NULL, ".", &save_ptr);
  	if ((token != (char *)NULL) && (*token != '\0') &&
  						(parseToken(token, &minor)))
  	    goto new_error;
  
! 	token = strtok_r((char *)NULL, ".", &save_ptr);
  	if ((token != (char *)NULL) && (*token != '\0') &&
  						(parseToken(token, &patch)))
--- 270,283 ----
  	save_ptr = (char *)NULL;
  
! 	token = pg_strtok_r(vstr, ".", &save_ptr);
  	if (parseToken(token, &major))
  	    goto new_error;
  
! 	token = pg_strtok_r((char *)NULL, ".", &save_ptr);
  	if ((token != (char *)NULL) && (*token != '\0') &&
  						(parseToken(token, &minor)))
  	    goto new_error;
  
! 	token = pg_strtok_r((char *)NULL, ".", &save_ptr);
  	if ((token != (char *)NULL) && (*token != '\0') &&
  						(parseToken(token, &patch)))