Fix ancient error in large objects usage example: overwrite() subroutine

tglsfdc · tglsfdc · commit 56aa84a69c28 · 2006-03-02T21:49:09.000Z
was opening with INV_READ flag and then writing.  Prior to 8.1 the backend
did not reject this, but now it does.
diff --git a/doc/src/sgml/lobj.sgml b/doc/src/sgml/lobj.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/lobj.sgml,v 1.37 2005/06/13 02:26:46 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/lobj.sgml,v 1.38 2006/03/02 21:49:09 tgl Exp $
 -->
 
  <chapter id="largeObjects">
@@ -527,7 +527,7 @@ overwrite(PGconn *conn, Oid lobjId, int start, int len)
     int         nwritten;
     int         i;
 
-    lobj_fd = lo_open(conn, lobjId, INV_READ);
+    lobj_fd = lo_open(conn, lobjId, INV_WRITE);
     if (lobj_fd &lt; 0)
     {
         fprintf(stderr, &quot;can't open large object %d\n&quot;,
@@ -553,7 +553,8 @@ overwrite(PGconn *conn, Oid lobjId, int start, int len)
 }
 
 /*
- * exportFile *    export large object &quot;lobjOid&quot; to file &quot;out_filename&quot;
+ * exportFile
+ *    export large object &quot;lobjOid&quot; to file &quot;out_filename&quot;
  *
  */
 void
@@ -566,7 +567,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename)
     int         fd;
 
     /*
-     * create an inversion &quot;object&quot;
+     * open the large object
      */
     lobj_fd = lo_open(conn, lobjId, INV_READ);
     if (lobj_fd &lt; 0)
@@ -586,7 +587,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename)
     }
 
     /*
-     * read in from the Unix file and write to the inversion file
+     * read in from the inversion file and write to the Unix file
      */
     while ((nbytes = lo_read(conn, lobj_fd, buf, BUFSIZE)) &gt; 0)
     {
diff --git 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.25 2004/12/31 22:03:58 pgsql Exp $
+ *	  $PostgreSQL: pgsql/src/test/examples/testlo.c,v 1.26 2006/03/02 21:49:09 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -113,7 +113,7 @@ overwrite(PGconn *conn, Oid lobjId, int start, int len)
 	int			nwritten;
 	int			i;
 
-	lobj_fd = lo_open(conn, lobjId, INV_READ);
+	lobj_fd = lo_open(conn, lobjId, INV_WRITE);
 	if (lobj_fd < 0)
 		fprintf(stderr, "can't open large object %u", lobjId);
 
@@ -156,7 +156,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename)
 	int			fd;
 
 	/*
-	 * create an inversion "object"
+	 * open the large object
 	 */
 	lobj_fd = lo_open(conn, lobjId, INV_READ);
 	if (lobj_fd < 0)
@@ -173,7 +173,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename)
 	}
 
 	/*
-	 * read in from the Unix file and write to the inversion file
+	 * read in from the inversion file and write to the Unix file
 	 */
 	while ((nbytes = lo_read(conn, lobj_fd, buf, BUFSIZE)) > 0)
 	{

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.25 2004/12/31 22:03:58 pgsql Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/test/examples/testlo.c,v 1.26 2006/03/02 21:49:09 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -113,7 +113,7 @@ overwrite(PGconn *conn, Oid lobjId, int start, int len)`
`113`	`113`	`int nwritten;`
`114`	`114`	`int i;`
`115`	`115`
`116`		`- lobj_fd = lo_open(conn, lobjId, INV_READ);`
	`116`	`+ lobj_fd = lo_open(conn, lobjId, INV_WRITE);`
`117`	`117`	`if (lobj_fd < 0)`
`118`	`118`	`fprintf(stderr, "can't open large object %u", lobjId);`
`119`	`119`
`@@ -156,7 +156,7 @@ exportFile(PGconn conn, Oid lobjId, char filename)`
`156`	`156`	`int fd;`
`157`	`157`
`158`	`158`	`/*`
`159`		`- * create an inversion "object"`
	`159`	`+ * open the large object`
`160`	`160`	`*/`
`161`	`161`	`lobj_fd = lo_open(conn, lobjId, INV_READ);`
`162`	`162`	`if (lobj_fd < 0)`
`@@ -173,7 +173,7 @@ exportFile(PGconn conn, Oid lobjId, char filename)`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`/*`
`176`		`- * read in from the Unix file and write to the inversion file`
	`176`	`+ * read in from the inversion file and write to the Unix file`
`177`	`177`	`*/`
`178`	`178`	`while ((nbytes = lo_read(conn, lobj_fd, buf, BUFSIZE)) > 0)`
`179`	`179`	`{`