These are two minor corrections to libpq's PQsetNoticeProcessor function.

bmomjian · bmomjian · commit 724bf74693ae · 1999-10-26T04:49:00.000Z
One, it now returns the previous hook. That way people don't have to dig
around in libpq-int.h for that information anymore. It previously
returned void, so there should be no incompatibilities.

Second, you cannot set the callback to NULL anymore. (Of course you can
still call it with NULL just to get the current hook.) The way libpq uses
the callback pointer, having a NULL there wasn't very healthy.

Peter Eisentraut
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.103 1999/09/27 03:13:16 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.104 1999/10/26 04:49:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1575,13 +1575,19 @@ PQuntrace(PGconn *conn)
 	}
 }
 
-void
+PQnoticeProcessor
 PQsetNoticeProcessor(PGconn *conn, PQnoticeProcessor proc, void *arg)
 {
+	PQnoticeProcessor old;
 	if (conn == NULL)
-		return;
+		return NULL;
+
+	old = conn->noticeHook;
+	if (proc) {
 	conn->noticeHook = proc;
 	conn->noticeArg = arg;
+	}
+	return old;
 }
 
 /*
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-fe.h,v 1.50 1999/05/25 16:15:13 momjian Exp $
+ * $Id: libpq-fe.h,v 1.51 1999/10/26 04:49:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -193,9 +193,7 @@ extern		"C"
 	extern void PQuntrace(PGconn *conn);
 
 	/* Override default notice processor */
-	extern void PQsetNoticeProcessor(PGconn *conn,
-												 PQnoticeProcessor proc,
-												 void *arg);
+	extern PQnoticeProcessor PQsetNoticeProcessor(PGconn *conn, PQnoticeProcessor proc, void *arg);
 
 /* === in fe-exec.c === */
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.103 1999/09/27 03:13:16 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.104 1999/10/26 04:49:00 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1575,13 +1575,19 @@ PQuntrace(PGconn *conn)`
`1575`	`1575`	`}`
`1576`	`1576`	`}`
`1577`	`1577`
`1578`		`-void`
	`1578`	`+PQnoticeProcessor`
`1579`	`1579`	`PQsetNoticeProcessor(PGconn conn, PQnoticeProcessor proc, void arg)`
`1580`	`1580`	`{`
	`1581`	`+ PQnoticeProcessor old;`
`1581`	`1582`	`if (conn == NULL)`
`1582`		`- return;`
	`1583`	`+ return NULL;`
	`1584`	`+`
	`1585`	`+ old = conn->noticeHook;`
	`1586`	`+ if (proc) {`
`1583`	`1587`	`conn->noticeHook = proc;`
`1584`	`1588`	`conn->noticeArg = arg;`
	`1589`	`+ }`
	`1590`	`+ return old;`
`1585`	`1591`	`}`
`1586`	`1592`
`1587`	`1593`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: libpq-fe.h,v 1.50 1999/05/25 16:15:13 momjian Exp $`
	`9`	`+ * $Id: libpq-fe.h,v 1.51 1999/10/26 04:49:00 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -193,9 +193,7 @@ extern "C"`
`193`	`193`	`extern void PQuntrace(PGconn *conn);`
`194`	`194`
`195`	`195`	`/* Override default notice processor */`
`196`		`- extern void PQsetNoticeProcessor(PGconn *conn,`
`197`		`- PQnoticeProcessor proc,`
`198`		`- void *arg);`
	`196`	`+ extern PQnoticeProcessor PQsetNoticeProcessor(PGconn conn, PQnoticeProcessor proc, void arg);`
`199`	`197`
`200`	`198`	`/* === in fe-exec.c === */`
`201`	`199`