aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Conway <neilc@samurai.com>2004-09-22 05:12:45 +0000
committerNeil Conway <neilc@samurai.com>2004-09-22 05:12:45 +0000
commitb84788debc08f64a0cb75cbb1059a6b222c51490 (patch)
tree49d6cafca4700c3efc214f45d0932309c76be641
parenta94edb4c7b9daa655b53c10b32bbb3dd69a6ccc1 (diff)
downloadpostgresql-b84788debc08f64a0cb75cbb1059a6b222c51490.tar.gz
postgresql-b84788debc08f64a0cb75cbb1059a6b222c51490.zip
Minor cleanup of libpq/LO examples: fix some memory leaks, update a comment
or two.
-rw-r--r--src/test/examples/testlibpq.c2
-rw-r--r--src/test/examples/testlibpq4.c14
-rw-r--r--src/test/examples/testlo.c4
3 files changed, 11 insertions, 9 deletions
diff --git a/src/test/examples/testlibpq.c b/src/test/examples/testlibpq.c
index 1f447b33c39..f650118a29e 100644
--- a/src/test/examples/testlibpq.c
+++ b/src/test/examples/testlibpq.c
@@ -1,7 +1,7 @@
/*
* testlibpq.c
*
- * Test the C version of LIBPQ, the POSTGRES frontend library.
+ * Test the C version of libpq, the PostgreSQL frontend library.
*/
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/test/examples/testlibpq4.c b/src/test/examples/testlibpq4.c
index 57b5f56ff51..0eda55352ed 100644
--- a/src/test/examples/testlibpq4.c
+++ b/src/test/examples/testlibpq4.c
@@ -92,8 +92,8 @@ main(int argc, char **argv)
}
/*
- * should PQclear PGresult whenever it is no longer needed to avoid
- * memory leaks
+ * make sure to PQclear() a PGresult whenever it is no longer
+ * needed to avoid memory leaks
*/
PQclear(res1);
@@ -106,7 +106,7 @@ main(int argc, char **argv)
{
fprintf(stderr, "DECLARE CURSOR command failed\n");
PQclear(res1);
- exit_nicely(conn1, NULL);
+ exit_nicely(conn1, conn2);
}
PQclear(res1);
@@ -115,7 +115,7 @@ main(int argc, char **argv)
{
fprintf(stderr, "FETCH ALL command didn't return tuples properly\n");
PQclear(res1);
- exit_nicely(conn1, NULL);
+ exit_nicely(conn1, conn2);
}
/* first, print out the attribute names */
@@ -142,10 +142,10 @@ main(int argc, char **argv)
res1 = PQexec(conn1, "END");
PQclear(res1);
- /* close the connection to the database and cleanup */
+ /* close the connections to the database and cleanup */
PQfinish(conn1);
+ PQfinish(conn2);
/* fclose(debug); */
- return 0; /* Though PQfinish(conn1) has called
- * exit(1) */
+ return 0;
}
diff --git a/src/test/examples/testlo.c b/src/test/examples/testlo.c
index 2d5db3a5c2c..988b51171a9 100644
--- a/src/test/examples/testlo.c
+++ b/src/test/examples/testlo.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/test/examples/testlo.c,v 1.22 2004/08/29 04:13:12 momjian Exp $
+ * $PostgreSQL: pgsql/src/test/examples/testlo.c,v 1.23 2004/09/22 05:12:45 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -99,6 +99,7 @@ pickout(PGconn *conn, Oid lobjId, int start, int len)
if (nbytes <= 0)
break; /* no more data? */
}
+ free(buf);
fprintf(stderr, "\n");
lo_close(conn, lobj_fd);
}
@@ -134,6 +135,7 @@ overwrite(PGconn *conn, Oid lobjId, int start, int len)
break;
}
}
+ free(buf);
fprintf(stderr, "\n");
lo_close(conn, lobj_fd);
}