PGRES_POLLING_ACTIVE is unused, keep for backward compatibility.

bmomjian · bmomjian · commit 44aba2802077 · 2003-03-20T06:23:30.000Z
Lennert Buytenhek
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/libpq.sgml,v 1.112 2003/03/13 01:30:28 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/libpq.sgml,v 1.113 2003/03/20 06:23:30 momjian Exp $
 -->
 
  <chapter id="libpq">
@@ -342,9 +342,7 @@ PostgresPollingStatusType PQconnectPoll(PGconn *conn);
   </para>
   <para>
    If <function>PQconnectStart</> succeeds, the next stage is to poll <application>libpq</> so that it may
-   proceed with the connection sequence.  Loop thus: Consider a connection
-   <quote>inactive</quote> by default. If <function>PQconnectPoll</function> last returned <symbol>PGRES_POLLING_ACTIVE</>,
-   consider it <quote>active</quote> instead. If <function>PQconnectPoll(conn)</function> last returned
+   proceed with the connection sequence.  Loop thus: If <function>PQconnectPoll(conn)</function> last returned
    <symbol>PGRES_POLLING_READING</symbol>, perform a <function>select()</> for reading on the socket determined using <function>PQsocket(conn)</function>. If
    it last returned <symbol>PGRES_POLLING_WRITING</symbol>, perform a <function>select()</> for writing on
    that same socket. If you have yet to call <function>PQconnectPoll</function>, i.e., after the call
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.227 2003/03/18 22:11:48 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.228 2003/03/20 06:23:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1206,9 +1206,6 @@ connectDBComplete(PGconn *conn)
 		 */
 		switch (flag)
 		{
-			case PGRES_POLLING_ACTIVE:
-				break;
-
 			case PGRES_POLLING_OK:
 				return 1;		/* success! */
 
@@ -1926,9 +1923,6 @@ PQsetenv(PGconn *conn)
 		 */
 		switch (flag)
 		{
-			case PGRES_POLLING_ACTIVE:
-				break;
-
 			case PGRES_POLLING_OK:
 				return true;	/* success! */
 
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-fe.h,v 1.88 2003/03/10 22:28:22 tgl Exp $
+ * $Id: libpq-fe.h,v 1.89 2003/03/20 06:23:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -65,7 +65,8 @@ typedef enum
 	PGRES_POLLING_READING,		/* These two indicate that one may	  */
 	PGRES_POLLING_WRITING,		/* use select before polling again.   */
 	PGRES_POLLING_OK,
-	PGRES_POLLING_ACTIVE		/* Can call poll function immediately. */
+	PGRES_POLLING_ACTIVE		/*  unused; keep for awhile for
+                                 *  backwards compatibility */
 } PostgresPollingStatusType;
 
 typedef enum

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.227 2003/03/18 22:11:48 petere Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.228 2003/03/20 06:23:30 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1206,9 +1206,6 @@ connectDBComplete(PGconn *conn)`
`1206`	`1206`	`*/`
`1207`	`1207`	`switch (flag)`
`1208`	`1208`	`{`
`1209`		`- case PGRES_POLLING_ACTIVE:`
`1210`		`- break;`
`1211`		`-`
`1212`	`1209`	`case PGRES_POLLING_OK:`
`1213`	`1210`	`return 1; /* success! */`
`1214`	`1211`
`@@ -1926,9 +1923,6 @@ PQsetenv(PGconn *conn)`
`1926`	`1923`	`*/`
`1927`	`1924`	`switch (flag)`
`1928`	`1925`	`{`
`1929`		`- case PGRES_POLLING_ACTIVE:`
`1930`		`- break;`
`1931`		`-`
`1932`	`1926`	`case PGRES_POLLING_OK:`
`1933`	`1927`	`return true; /* success! */`
`1934`	`1928`