Add PQfreemem() call for Win32.

bmomjian · bmomjian · commit 23ecb8855d40 · 2003-03-22T03:29:06.000Z
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.113 2003/03/20 06:23:30 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/libpq.sgml,v 1.114 2003/03/22 03:29:05 momjian Exp $
 -->
 
  <chapter id="libpq">
@@ -1151,6 +1151,25 @@ unsigned char *PQunescapeBytea(const unsigned char *from, size_t *to_length);
   </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>
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.126 2003/03/10 22:28:21 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.127 2003/03/22 03:29:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -284,6 +284,19 @@ PQunescapeBytea(const unsigned char *strtext, size_t *retbuflen)
 	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.
  *
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.89 2003/03/20 06:23:30 momjian Exp $
+ * $Id: libpq-fe.h,v 1.90 2003/03/22 03:29:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -254,6 +254,7 @@ extern unsigned char *PQescapeBytea(const unsigned char *bintext, size_t binlen,
 			  size_t *bytealen);
 extern unsigned char *PQunescapeBytea(const unsigned char *strtext,
 				size_t *retbuflen);
+extern void PQfreemem(void *ptr);
 
 
 /* Simple synchronous query */

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-exec.c,v 1.126 2003/03/10 22:28:21 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.127 2003/03/22 03:29:06 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -284,6 +284,19 @@ PQunescapeBytea(const unsigned char strtext, size_t retbuflen)`
`284`	`284`	`return buffer;`
`285`	`285`	`}`
`286`	`286`
	`287`	`+`
	`288`	`+/*`
	`289`	`+ * PQfreemem - safely frees memory allocated`
	`290`	`+ *`
	`291`	`+ * Needed mostly by Win32, unless multithreaded DLL (/MD in VC6)`
	`292`	`+ * Used for freeing memory from PQescapeByte()a/PQunescapeBytea()`
	`293`	`+ */`
	`294`	`+void PQfreemem(void *ptr)`
	`295`	`+{`
	`296`	`+ free(ptr);`
	`297`	`+}`
	`298`	`+`
	`299`	`+`
`287`	`300`	`/* ----------------`
`288`	`301`	`* Space management for PGresult.`
`289`	`302`	`*`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $Id: libpq-fe.h,v 1.89 2003/03/20 06:23:30 momjian Exp $`
	`10`	`+ * $Id: libpq-fe.h,v 1.90 2003/03/22 03:29:06 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -254,6 +254,7 @@ extern unsigned char PQescapeBytea(const unsigned char bintext, size_t binlen,`
`254`	`254`	`size_t *bytealen);`
`255`	`255`	`extern unsigned char PQunescapeBytea(const unsigned char strtext,`
`256`	`256`	`size_t *retbuflen);`
	`257`	`+extern void PQfreemem(void *ptr);`
`257`	`258`
`258`	`259`
`259`	`260`	`/* Simple synchronous query */`