Commitb84788d

Neil Conway

committed

Minor cleanup of libpq/LO examples: fix some memory leaks, update a comment

or two.

1 parenta94edb4 commitb84788dCopy full SHA for b84788d

File tree

+11

-9

lines changed

+11

-9

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* testlibpq.c`
`3`	`3`	`*`
`4`		`- *Test the C version ofLIBPQ, thePOSTGRES frontend library.`
	`4`	`+ *Test the C version oflibpq, thePostgreSQL frontend library.`
`5`	`5`	`*/`
`6`	`6`	`#include<stdio.h>`
`7`	`7`	`#include<stdlib.h>`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,8 @@ main(int argc, char **argv)`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`/*`
`95`		`- *shouldPQclearPGresult whenever it is no longer needed to avoid`
`96`		`- * memory leaks`
	`95`	`+ *make sure toPQclear() aPGresult whenever it is no longer`
	`96`	`+ *needed to avoidmemory leaks`
`97`	`97`	`*/`
`98`	`98`	`PQclear(res1);`
`99`	`99`
`@@ -106,7 +106,7 @@ main(int argc, char **argv)`
`106`	`106`	`{`
`107`	`107`	`fprintf(stderr,"DECLARE CURSOR command failed\n");`
`108`	`108`	`PQclear(res1);`
`109`		`-exit_nicely(conn1,NULL);`
	`109`	`+exit_nicely(conn1,conn2);`
`110`	`110`	`}`
`111`	`111`	`PQclear(res1);`
`112`	`112`
`@@ -115,7 +115,7 @@ main(int argc, char **argv)`
`115`	`115`	`{`
`116`	`116`	`fprintf(stderr,"FETCH ALL command didn't return tuples properly\n");`
`117`	`117`	`PQclear(res1);`
`118`		`-exit_nicely(conn1,NULL);`
	`118`	`+exit_nicely(conn1,conn2);`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`/* first, print out the attribute names */`
`@@ -142,10 +142,10 @@ main(int argc, char **argv)`
`142`	`142`	`res1=PQexec(conn1,"END");`
`143`	`143`	`PQclear(res1);`
`144`	`144`
`145`		`-/* close theconnection to the database and cleanup */`
	`145`	`+/* close theconnections to the database and cleanup */`
`146`	`146`	`PQfinish(conn1);`
	`147`	`+PQfinish(conn2);`
`147`	`148`
`148`	`149`	`/* fclose(debug); */`
`149`		`-return0;/* Though PQfinish(conn1) has called`
`150`		`- * exit(1) */`
	`150`	`+return0;`
`151`	`151`	`}`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/test/examples/testlo.c,v 1.22 2004/08/29 04:13:12 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/test/examples/testlo.c,v 1.23 2004/09/22 05:12:45 neilc Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -99,6 +99,7 @@ pickout(PGconn *conn, Oid lobjId, int start, int len)`
`99`	`99`	`if (nbytes <=0)`
`100`	`100`	`break;/* no more data? */`
`101`	`101`	`}`
	`102`	`+free(buf);`
`102`	`103`	`fprintf(stderr,"\n");`
`103`	`104`	`lo_close(conn,lobj_fd);`
`104`	`105`	`}`
`@@ -134,6 +135,7 @@ overwrite(PGconn *conn, Oid lobjId, int start, int len)`
`134`	`135`	`break;`
`135`	`136`	`}`
`136`	`137`	`}`
	`138`	`+free(buf);`
`137`	`139`	`fprintf(stderr,"\n");`
`138`	`140`	`lo_close(conn,lobj_fd);`
`139`	`141`	`}`

Comments

(0)