
> Actually this isn't even working for me. I just compiled the libpq dll with 
> /MT (multithreaded), and I still get corruption in my app. I even tried 
> libpq compiled with multithreaded-debug (/MTd), which my app is using now, 
> and still same problem.

No, you need to use multithreaded DLL (/MD in VC6) for both the dll and your program, 
then it works.
But since that is not optimal (can't use debug runtime unless you have a second 
debug dll (/MDd)), I also think a callback function would be good to have in addition 
to linking libpq.dll with /MD.

Informix e.g. supplies SqlFreeMem( void * MemAddr, int FreeType ); 

Andreas

Wed, 19 Mar 2003 12:32:01 +0100
"Zeugswetter Andreas SB SD" <ZeugswetterA@spardat.at>
Re: PQescapeBytea on Win32
I have modified the patch to call it PQfreemem(), in case there are other
cases we need to free libpq memory.

Patch attached and applied.

---------------------------------------------------------------------------

Zeugswetter Andreas SB SD wrote:
> 
> > Actually this isn't even working for me. I just compiled the libpq dll with 
> > /MT (multithreaded), and I still get corruption in my app. I even tried 
> > libpq compiled with multithreaded-debug (/MTd), which my app is using now, 
> > and still same problem.
> 
> No, you need to use multithreaded DLL (/MD in VC6) for both the dll and your program, 
> then it works.
> But since that is not optimal (can't use debug runtime unless you have a second 
> debug dll (/MDd)), I also think a callback function would be good to have in addition 
> to linking libpq.dll with /MD.
> 
> Informix e.g. supplies SqlFreeMem( void * MemAddr, int FreeType ); 
> 
> Andreas
> 
> ---------------------------(end of broadcast)---------------------------
> TIP 3: if posting/reading through Usenet, please send an appropriate
> subscribe-nomail command to majordomo@postgresql.org so that your
> message can get through to the mailing list cleanly
> 

-- 
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073

Index: doc/src/sgml/libpq.sgml
===================================================================
RCS file: /cvsroot/pgsql-server/doc/src/sgml/libpq.sgml,v
retrieving revision 1.113
diff -c -c -r1.113 libpq.sgml
*** doc/src/sgml/libpq.sgml	20 Mar 2003 06:23:30 -0000	1.113
--- doc/src/sgml/libpq.sgml	22 Mar 2003 03:27:47 -0000
***************
*** 1151,1156 ****
--- 1151,1175 ----
    </para>
    </listitem>
    </varlistentry>
+ 
+   <varlistentry>
+   <term><function>PQfreemem</function></term>
+   <listitem>
+   <para>
+    Frees memory allocated by <application>libpq</>
+ <synopsis>
+ void PQfreemem(void *ptr);
+ </synopsis>
+ </para>
+ 
+ <para>
+    Frees memory allocated by <application>libpq</>, particularly
+    <function>PQescapeBytea</function> and <function>PQunescapeBytea</function>.
+    It is needed by Win32, which can not free memory across
+    DLL's, unless multithreaded DLL's (/MD in VC6) are used.
+   </para>
+   </listitem>
+   </varlistentry>
    </variablelist>
     
   </sect2>
Index: src/interfaces/libpq/fe-exec.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/interfaces/libpq/fe-exec.c,v
retrieving revision 1.126
diff -c -c -r1.126 fe-exec.c
*** src/interfaces/libpq/fe-exec.c	10 Mar 2003 22:28:21 -0000	1.126
--- src/interfaces/libpq/fe-exec.c	22 Mar 2003 03:27:53 -0000
***************
*** 284,289 ****
--- 284,302 ----
  	return buffer;
  }
  
+ 
+ /*
+  *		PQfreemem - safely frees memory allocated
+  *
+  * Needed mostly by Win32, unless multithreaded DLL (/MD in VC6)
+  * Used for freeing memory from PQescapeByte()a/PQunescapeBytea()
+  */
+ void PQfreemem(void *ptr)
+ {
+ 	free(ptr);
+ }
+ 
+ 
  /* ----------------
   * Space management for PGresult.
   *
Index: src/interfaces/libpq/libpq-fe.h
===================================================================
RCS file: /cvsroot/pgsql-server/src/interfaces/libpq/libpq-fe.h,v
retrieving revision 1.89
diff -c -c -r1.89 libpq-fe.h
*** src/interfaces/libpq/libpq-fe.h	20 Mar 2003 06:23:30 -0000	1.89
--- src/interfaces/libpq/libpq-fe.h	22 Mar 2003 03:27:54 -0000
***************
*** 254,259 ****
--- 254,260 ----
  			  size_t *bytealen);
  extern unsigned char *PQunescapeBytea(const unsigned char *strtext,
  				size_t *retbuflen);
+ extern void PQfreemem(void *ptr);
  
  
  /* Simple synchronous query */
Fri, 21 Mar 2003 22:30:20 -0500 (EST)
Bruce Momjian <pgman@candle.pha.pa.us>
Re: PQescapeBytea on Win32
Bruce Momjian <pgman@candle.pha.pa.us> writes:
> I have modified the patch to call it PQfreemem(), in case there are other
> cases we need to free libpq memory.

Doesn't this duplicate a function that we already invented for PQnotify
structs?

			regards, tom lane


Sat, 22 Mar 2003 00:26:04 -0500
Tom Lane <tgl@sss.pgh.pa.us>
Re: PQescapeBytea on Win32 
Tom Lane wrote:
> Bruce Momjian <pgman@candle.pha.pa.us> writes:
> > I have modified the patch to call it PQfreemem(), in case there are other
> > cases we need to free libpq memory.
> 
> Doesn't this duplicate a function that we already invented for PQnotify
> structs?

Yep, I see it now:
	
	/*
	 * PQfreeNotify - free's the memory associated with a PGnotify
	 *
	 * This function is needed on Windows when using libpq.dll and
	 * for example libpgtcl.dll: All memory allocated inside a dll
	 * should be freed in the context of the same dll.
	 *
	 */
	void
	PQfreeNotify(PGnotify *notify)
	{
	    free(notify);
	}

What do you recommend?  Do we depricate PQfreeNotify?

-- 
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073


Sat, 22 Mar 2003 13:16:42 -0500 (EST)
Bruce Momjian <pgman@candle.pha.pa.us>
Re: PQescapeBytea on Win32
Bruce Momjian <pgman@candle.pha.pa.us> writes:
> Tom Lane wrote:
>> Doesn't this duplicate a function that we already invented for PQnotify
>> structs?

> What do you recommend?  Do we depricate PQfreeNotify?

I dunno.  In hindsight it was shortsightedly named.  But I don't suppose
we want to tell people to use "PQfreeNotify" to free the result of
PQescapeBytea ... so deprecation seems to be the order of the day.

Do we really want "PQfreemem" either?  Maybe it should be "PQfree"?

			regards, tom lane


Sat, 22 Mar 2003 13:21:19 -0500
Tom Lane <tgl@sss.pgh.pa.us>
Re: PQescapeBytea on Win32 
Tom Lane wrote:
> Bruce Momjian <pgman@candle.pha.pa.us> writes:
> > Tom Lane wrote:
> >> Doesn't this duplicate a function that we already invented for PQnotify
> >> structs?
> 
> > What do you recommend?  Do we depricate PQfreeNotify?
> 
> I dunno.  In hindsight it was shortsightedly named.  But I don't suppose
> we want to tell people to use "PQfreeNotify" to free the result of
> PQescapeBytea ... so deprecation seems to be the order of the day.
> 
> Do we really want "PQfreemem" either?  Maybe it should be "PQfree"?

I am a little concerned that PQfree would be confused with PQclear.

Could we have PQfreeNotify() be a macro to PQfreemem in 7.4?

-- 
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073


Sat, 22 Mar 2003 13:49:39 -0500 (EST)
Bruce Momjian <pgman@candle.pha.pa.us>
Re: PQescapeBytea on Win32
Bruce Momjian wrote:
> Tom Lane wrote:
> > Bruce Momjian <pgman@candle.pha.pa.us> writes:
> > > Tom Lane wrote:
> > >> Doesn't this duplicate a function that we already invented for PQnotify
> > >> structs?
> > 
> > > What do you recommend?  Do we depricate PQfreeNotify?
> > 
> > I dunno.  In hindsight it was shortsightedly named.  But I don't suppose
> > we want to tell people to use "PQfreeNotify" to free the result of
> > PQescapeBytea ... so deprecation seems to be the order of the day.
> > 
> > Do we really want "PQfreemem" either?  Maybe it should be "PQfree"?
> 
> I am a little concerned that PQfree would be confused with PQclear.
> 
> Could we have PQfreeNotify() be a macro to PQfreemem in 7.4?

The only place I see PQfreeNotify() used in our code is libpgtcl, aside
from libpq, and a macro would work fine.

-- 
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073


Sat, 22 Mar 2003 13:54:18 -0500 (EST)
Bruce Momjian <pgman@candle.pha.pa.us>
Re: PQescapeBytea on Win32
Bruce Momjian <pgman@candle.pha.pa.us> writes:
>> Do we really want "PQfreemem" either?  Maybe it should be "PQfree"?

> I am a little concerned that PQfree would be confused with PQclear.

Good point --- nevermind that suggestion.

> Could we have PQfreeNotify() be a macro to PQfreemem in 7.4?

I'd like to do that but I doubt we can get away with it; it'd be
an incompatible change at the binary API level, forcing a major
version bump on libpq.so.  (On the other hand, we might wind up
doing one anyway; not sure.)

You could do it the other way: PQfreemem a macro for PQfreeNotify.
That would stay binary-compatible with existing clients.  We could
switch which one is a macro at the next occasion for a major
version bump on the shlib, and then eventually remove PQfreeNotify
when we feel it's been deprecated for long enough.

			regards, tom lane


Sat, 22 Mar 2003 14:09:30 -0500
Tom Lane <tgl@sss.pgh.pa.us>
Re: PQescapeBytea on Win32 
Tom Lane wrote:
> Bruce Momjian <pgman@candle.pha.pa.us> writes:
> >> Do we really want "PQfreemem" either?  Maybe it should be "PQfree"?
> 
> > I am a little concerned that PQfree would be confused with PQclear.
> 
> Good point --- nevermind that suggestion.
> 
> > Could we have PQfreeNotify() be a macro to PQfreemem in 7.4?
> 
> I'd like to do that but I doubt we can get away with it; it'd be
> an incompatible change at the binary API level, forcing a major
> version bump on libpq.so.  (On the other hand, we might wind up
> doing one anyway; not sure.)

Right.  We changed the Notify internal structure and got bitten on that
in 7.3 -- don't want that to happen again.

> You could do it the other way: PQfreemem a macro for PQfreeNotify.
> That would stay binary-compatible with existing clients.  We could
> switch which one is a macro at the next occasion for a major
> version bump on the shlib, and then eventually remove PQfreeNotify
> when we feel it's been deprecated for long enough.

The problem with that is the new versions are still going to reference
PQfreeNotify, and then we still can't remove it. I think we need the
macro for PQfreeNotify pointing to PQfreemem, but keep the PQfreeNotify
function around for a release or two, then remove it, and remove all
documentation about it in 7.4.

I now see that psql doesn't use that call, though it should if it is
running on Win32:
	
	static void
	PrintNotifications(void)
	{
	    PGnotify   *notify;
	
	    while ((notify = PQnotifies(pset.db)))
	    {
	        fprintf(pset.queryFout, gettext("Asynchronous NOTIFY '%s' from backend w
	ith pid %d received.\n"),
	                notify->relname, notify->be_pid);
	        free(notify);
	        fflush(pset.queryFout);
	    }
	}

I will clean that up too, and check any other interfaces/apps.

-- 
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073


Sat, 22 Mar 2003 14:48:56 -0500 (EST)
Bruce Momjian <pgman@candle.pha.pa.us>
Re: PQescapeBytea on Win32
Bruce Momjian <pgman@candle.pha.pa.us> writes:
> The problem with that is the new versions are still going to reference
> PQfreeNotify, and then we still can't remove it. I think we need the
> macro for PQfreeNotify pointing to PQfreemem, but keep the PQfreeNotify
> function around for a release or two, then remove it, and remove all
> documentation about it in 7.4.

Hm.  You could possibly do that with some judicious #undef'ing ...

			regards, tom lane


Sat, 22 Mar 2003 15:06:54 -0500
Tom Lane <tgl@sss.pgh.pa.us>
Re: PQescapeBytea on Win32 
Tom Lane wrote:
> Bruce Momjian <pgman@candle.pha.pa.us> writes:
> > The problem with that is the new versions are still going to reference
> > PQfreeNotify, and then we still can't remove it. I think we need the
> > macro for PQfreeNotify pointing to PQfreemem, but keep the PQfreeNotify
> > function around for a release or two, then remove it, and remove all
> > documentation about it in 7.4.
> 
> Hm.  You could possibly do that with some judicious #undef'ing ...

Exactly!

-- 
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073


Sat, 22 Mar 2003 18:35:59 -0500 (EST)
Bruce Momjian <pgman@candle.pha.pa.us>
Re: PQescapeBytea on Win32
Bruce Momjian writes:

> The problem with that is the new versions are still going to reference
> PQfreeNotify, and then we still can't remove it. I think we need the
> macro for PQfreeNotify pointing to PQfreemem, but keep the PQfreeNotify
> function around for a release or two, then remove it, and remove all
> documentation about it in 7.4.

Too complicated.  Just implement PQfreemem independently and tell people
to use it.  Please don't remove documentation just because a feature is
deprecated.  How are people supposed to do the conversion if they can't
find information about what they are supposed to convert from?

-- 
Peter Eisentraut   peter_e@gmx.net


Mon, 24 Mar 2003 09:45:55 +0100 (CET)
Peter Eisentraut <peter_e@gmx.net>
Re: PQescapeBytea on Win32
Peter Eisentraut wrote:
> Bruce Momjian writes:
> 
> > The problem with that is the new versions are still going to reference
> > PQfreeNotify, and then we still can't remove it. I think we need the
> > macro for PQfreeNotify pointing to PQfreemem, but keep the PQfreeNotify
> > function around for a release or two, then remove it, and remove all
> > documentation about it in 7.4.
> 
> Too complicated.  Just implement PQfreemem independently and tell people
> to use it.  Please don't remove documentation just because a feature is
> deprecated.  How are people supposed to do the conversion if they can't
> find information about what they are supposed to convert from?

OK, I will keep the docs around and point to PGfreemem.

-- 
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073


Mon, 24 Mar 2003 11:28:15 -0500 (EST)
Bruce Momjian <pgman@candle.pha.pa.us>
Re: PQescapeBytea on Win32
OK, patch applied to document PQfreemem() for notify.

PQfreeNotify wasn't even documented, but I kept it in for binary
compatibility, and added a #define to map it to PQfreemem().

I updated various interfaces to use PQfreemem() rather than free().

---------------------------------------------------------------------------

Peter Eisentraut wrote:
> Bruce Momjian writes:
> 
> > The problem with that is the new versions are still going to reference
> > PQfreeNotify, and then we still can't remove it. I think we need the
> > macro for PQfreeNotify pointing to PQfreemem, but keep the PQfreeNotify
> > function around for a release or two, then remove it, and remove all
> > documentation about it in 7.4.
> 
> Too complicated.  Just implement PQfreemem independently and tell people
> to use it.  Please don't remove documentation just because a feature is
> deprecated.  How are people supposed to do the conversion if they can't
> find information about what they are supposed to convert from?
> 
> -- 
> Peter Eisentraut   peter_e@gmx.net
> 
> 
> ---------------------------(end of broadcast)---------------------------
> TIP 4: Don't 'kill -9' the postmaster
> 

-- 
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073

Index: doc/src/sgml/libpq.sgml
===================================================================
RCS file: /cvsroot/pgsql-server/doc/src/sgml/libpq.sgml,v
retrieving revision 1.115
diff -c -c -r1.115 libpq.sgml
*** doc/src/sgml/libpq.sgml	24 Mar 2003 18:33:52 -0000	1.115
--- doc/src/sgml/libpq.sgml	25 Mar 2003 02:40:07 -0000
***************
*** 1049,1056 ****
  <function>PQescapeString</> performs this operation.
  </para>
  <para>
! The
! parameter <parameter>from</> points to the first character of the string that
  is to be escaped, and the <parameter>length</> parameter counts the
  number of characters in this string.  (A terminating zero byte is
  neither necessary nor counted.)  <parameter>to</> shall point to a
--- 1049,1055 ----
  <function>PQescapeString</> performs this operation.
  </para>
  <para>
! The parameter <parameter>from</> points to the first character of the string that
  is to be escaped, and the <parameter>length</> parameter counts the
  number of characters in this string.  (A terminating zero byte is
  neither necessary nor counted.)  <parameter>to</> shall point to a
***************
*** 1117,1123 ****
  
    <para>
     <function>PQescapeBytea</> returns an escaped version of the
!    <parameter>from</parameter> parameter binary string in memory allocated with <function>malloc()</>.
     The return string has all special characters replaced
     so that they can be properly processed by the PostgreSQL string literal
     parser, and the <type>bytea</type> input function. A terminating zero
--- 1116,1124 ----
  
    <para>
     <function>PQescapeBytea</> returns an escaped version of the
!    <parameter>from</parameter> parameter binary string in memory
!    allocated with <function>malloc()</>, and must be freed using
!    <function>PQfreemem()</>.
     The return string has all special characters replaced
     so that they can be properly processed by the PostgreSQL string literal
     parser, and the <type>bytea</type> input function. A terminating zero
***************
*** 1143,1150 ****
     such as might be returned by <function>PQgetvalue</function> when applied to a
     <type>bytea</type> column. <function>PQunescapeBytea</function> converts
     this string representation into its binary representation.
!    It returns a pointer to a buffer allocated with <function>malloc()</function>, or null on error, and puts the size
!    of the buffer in <parameter>to_length</parameter>.
    </para>
    </listitem>
    </varlistentry>
--- 1144,1154 ----
     such as might be returned by <function>PQgetvalue</function> when applied to a
     <type>bytea</type> column. <function>PQunescapeBytea</function> converts
     this string representation into its binary representation.
!    It returns a pointer to a buffer allocated with
!    <function>malloc()</function>, or null on error, and puts the size of
!    the buffer in <parameter>to_length</parameter>. The memory must be
!    freed using <function>PQfreemem()</>.
! 
    </para>
    </listitem>
    </varlistentry>
***************
*** 1161,1167 ****
  
  <para>
     Frees memory allocated by <application>libpq</>, particularly
!    <function>PQescapeBytea</function> and <function>PQunescapeBytea</function>.
     It is needed by Win32, which can not free memory across
     DLL's, unless multithreaded DLL's (/MD in VC6) are used.
    </para>
--- 1165,1173 ----
  
  <para>
     Frees memory allocated by <application>libpq</>, particularly
!    <function>PQescapeBytea</function>,
!    <function>PQunescapeBytea</function>,
!    and <function>PQnotifies</function>.
     It is needed by Win32, which can not free memory across
     DLL's, unless multithreaded DLL's (/MD in VC6) are used.
    </para>
***************
*** 1926,1932 ****
  } PGnotify;
  </synopsis>
  After processing a <structname>PGnotify</structname> object returned by <function>PQnotifies</function>,
! be sure to free it with <function>free()</function> to avoid a memory leak.
  </para>
  
  <note>
--- 1932,1938 ----
  } PGnotify;
  </synopsis>
  After processing a <structname>PGnotify</structname> object returned by <function>PQnotifies</function>,
! be sure to free it with <function>PQfreemem()</function>.
  </para>
  
  <note>
***************
*** 2867,2873 ****
              fprintf(stderr,
                   "ASYNC NOTIFY of '%s' from backend pid '%d' received\n",
                      notify-&gt;relname, notify-&gt;be_pid);
!             free(notify);
          }
      }
  
--- 2873,2879 ----
              fprintf(stderr,
                   "ASYNC NOTIFY of '%s' from backend pid '%d' received\n",
                      notify-&gt;relname, notify-&gt;be_pid);
!             PQfreemem(notify);
          }
      }
  
Index: src/bin/psql/common.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/bin/psql/common.c,v
retrieving revision 1.61
diff -c -c -r1.61 common.c
*** src/bin/psql/common.c	20 Mar 2003 15:39:52 -0000	1.61
--- src/bin/psql/common.c	25 Mar 2003 02:40:08 -0000
***************
*** 441,447 ****
  	{
  		fprintf(pset.queryFout, gettext("Asynchronous NOTIFY '%s' from backend with pid %d received.\n"),
  				notify->relname, notify->be_pid);
! 		free(notify);
  		fflush(pset.queryFout);
  	}
  }
--- 441,447 ----
  	{
  		fprintf(pset.queryFout, gettext("Asynchronous NOTIFY '%s' from backend with pid %d received.\n"),
  				notify->relname, notify->be_pid);
! 		PQfreemem(notify);
  		fflush(pset.queryFout);
  	}
  }
Index: src/interfaces/ecpg/ecpglib/execute.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/interfaces/ecpg/ecpglib/execute.c,v
retrieving revision 1.4
diff -c -c -r1.4 execute.c
*** src/interfaces/ecpg/ecpglib/execute.c	20 Mar 2003 15:56:50 -0000	1.4
--- src/interfaces/ecpg/ecpglib/execute.c	25 Mar 2003 02:40:10 -0000
***************
*** 1197,1203 ****
  	{
  		ECPGlog("ECPGexecute line %d: ASYNC NOTIFY of '%s' from backend pid '%d' received\n",
  				stmt->lineno, notify->relname, notify->be_pid);
! 		ECPGfree(notify);
  	}
  
  	return status;
--- 1197,1203 ----
  	{
  		ECPGlog("ECPGexecute line %d: ASYNC NOTIFY of '%s' from backend pid '%d' received\n",
  				stmt->lineno, notify->relname, notify->be_pid);
! 		PQfreemem(notify);
  	}
  
  	return status;
Index: src/interfaces/libpgtcl/pgtclId.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/interfaces/libpgtcl/pgtclId.c,v
retrieving revision 1.40
diff -c -c -r1.40 pgtclId.c
*** src/interfaces/libpgtcl/pgtclId.c	1 Feb 2003 00:22:12 -0000	1.40
--- src/interfaces/libpgtcl/pgtclId.c	25 Mar 2003 02:40:11 -0000
***************
*** 554,560 ****
  	if (event->connid == NULL)
  	{
  		if (event->notify)
! 			PQfreeNotify(event->notify);
  		return 1;
  	}
  
--- 554,560 ----
  	if (event->connid == NULL)
  	{
  		if (event->notify)
! 			PQfreemem(event->notify);
  		return 1;
  	}
  
***************
*** 634,640 ****
  	Tcl_Release((ClientData) event->connid);
  
  	if (event->notify)
! 		PQfreeNotify(event->notify);
  
  	return 1;
  }
--- 634,640 ----
  	Tcl_Release((ClientData) event->connid);
  
  	if (event->notify)
! 		PQfreemem(event->notify);
  
  	return 1;
  }
Index: src/interfaces/libpq/fe-exec.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/interfaces/libpq/fe-exec.c,v
retrieving revision 1.127
diff -c -c -r1.127 fe-exec.c
*** src/interfaces/libpq/fe-exec.c	22 Mar 2003 03:29:06 -0000	1.127
--- src/interfaces/libpq/fe-exec.c	25 Mar 2003 02:40:15 -0000
***************
*** 1578,1597 ****
  }
  
  /*
-  * PQfreeNotify - free's the memory associated with a PGnotify
-  *
-  * This function is needed on Windows when using libpq.dll and
-  * for example libpgtcl.dll: All memory allocated inside a dll
-  * should be freed in the context of the same dll.
-  *
-  */
- void
- PQfreeNotify(PGnotify *notify)
- {
- 	free(notify);
- }
- 
- /*
   * PQgetline - gets a newline-terminated string from the backend.
   *
   * Chiefly here so that applications can use "COPY <rel> to stdout"
--- 1578,1583 ----
***************
*** 2470,2472 ****
--- 2456,2477 ----
  {
  	return pqSendSome(conn);
  }
+ 
+ /*
+  * PQfreeNotify - free's the memory associated with a PGnotify
+  *
+  * This function is here only for binary backward compatibility.
+  * New code should use PQfreemem().  A macro will automatically map
+  * calls to PQfreemem.  It should be removed in the future.  bjm 2003-03-24
+  */
+ 
+ #undef PQfreeNotify
+ void PQfreeNotify(PGnotify *notify);
+ 
+ void
+ PQfreeNotify(PGnotify *notify)
+ {
+ 	PQfreemem(notify);
+ }
+ 
+ 
Index: src/interfaces/libpq/libpq-fe.h
===================================================================
RCS file: /cvsroot/pgsql-server/src/interfaces/libpq/libpq-fe.h,v
retrieving revision 1.90
diff -c -c -r1.90 libpq-fe.h
*** src/interfaces/libpq/libpq-fe.h	22 Mar 2003 03:29:06 -0000	1.90
--- src/interfaces/libpq/libpq-fe.h	25 Mar 2003 02:40:16 -0000
***************
*** 260,266 ****
  /* Simple synchronous query */
  extern PGresult *PQexec(PGconn *conn, const char *query);
  extern PGnotify *PQnotifies(PGconn *conn);
! extern void PQfreeNotify(PGnotify *notify);
  
  /* Interface for multiple-result or asynchronous queries */
  extern int	PQsendQuery(PGconn *conn, const char *query);
--- 260,267 ----
  /* Simple synchronous query */
  extern PGresult *PQexec(PGconn *conn, const char *query);
  extern PGnotify *PQnotifies(PGconn *conn);
! /* Exists for backward compatibility.  bjm 2003-03-24 */
! #define PQfreeNotify(ptr) PQfreemem(ptr)
  
  /* Interface for multiple-result or asynchronous queries */
  extern int	PQsendQuery(PGconn *conn, const char *query);
Index: src/interfaces/python/pgmodule.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/interfaces/python/pgmodule.c,v
retrieving revision 1.44
diff -c -c -r1.44 pgmodule.c
*** src/interfaces/python/pgmodule.c	10 Mar 2003 22:28:22 -0000	1.44
--- src/interfaces/python/pgmodule.c	25 Mar 2003 02:40:18 -0000
***************
*** 2066,2072 ****
  		}
  
  		PyTuple_SET_ITEM(notify_result, 1, temp);
! 		free(notify);
  	}
  	else
  	{
--- 2066,2072 ----
  		}
  
  		PyTuple_SET_ITEM(notify_result, 1, temp);
! 		PQfreemem(notify);
  	}
  	else
  	{
Index: src/test/examples/testlibpq2.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/test/examples/testlibpq2.c,v
retrieving revision 1.7
diff -c -c -r1.7 testlibpq2.c
*** src/test/examples/testlibpq2.c	7 Feb 1999 22:08:54 -0000	1.7
--- src/test/examples/testlibpq2.c	25 Mar 2003 02:40:18 -0000
***************
*** 98,104 ****
  			fprintf(stderr,
  				 "ASYNC NOTIFY of '%s' from backend pid '%d' received\n",
  					notify->relname, notify->be_pid);
! 			free(notify);
  			break;
  		}
  		PQclear(res);
--- 98,104 ----
  			fprintf(stderr,
  				 "ASYNC NOTIFY of '%s' from backend pid '%d' received\n",
  					notify->relname, notify->be_pid);
! 			PQfreemem(notify);
  			break;
  		}
  		PQclear(res);
Mon, 24 Mar 2003 21:46:18 -0500 (EST)
Bruce Momjian <pgman@candle.pha.pa.us>
Re: PQescapeBytea on Win32