From a0e87ad7a507274d385340a8a2cc8cde39b2c220 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Thu, 7 Sep 2006 15:37:25 +0000 Subject: [PATCH] Specify lo_write() to take a _const_ buffer, to match documentation. --- src/backend/libpq/be-fsstubs.c | 4 ++-- src/backend/storage/large_object/inv_api.c | 4 ++-- src/include/libpq/be-fsstubs.h | 4 ++-- src/include/storage/large_object.h | 4 ++-- src/interfaces/libpq/fe-lobj.c | 4 ++-- src/interfaces/libpq/libpq-fe.h | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c index 4571798ff3..775ec8d4e4 100644 --- a/src/backend/libpq/be-fsstubs.c +++ b/src/backend/libpq/be-fsstubs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/libpq/be-fsstubs.c,v 1.82 2006/04/26 00:34:57 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/libpq/be-fsstubs.c,v 1.83 2006/09/07 15:37:25 momjian Exp $ * * NOTES * This should be moved to a more appropriate place. It is here @@ -165,7 +165,7 @@ lo_read(int fd, char *buf, int len) } int -lo_write(int fd, char *buf, int len) +lo_write(int fd, const char *buf, int len) { int status; diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c index 582eabdb2a..1575db6a94 100644 --- a/src/backend/storage/large_object/inv_api.c +++ b/src/backend/storage/large_object/inv_api.c @@ -17,7 +17,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/large_object/inv_api.c,v 1.119 2006/07/31 20:09:05 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/storage/large_object/inv_api.c,v 1.120 2006/09/07 15:37:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -488,7 +488,7 @@ inv_read(LargeObjectDesc *obj_desc, char *buf, int nbytes) } int -inv_write(LargeObjectDesc *obj_desc, char *buf, int nbytes) +inv_write(LargeObjectDesc *obj_desc, const char *buf, int nbytes) { int nwritten = 0; int n; diff --git a/src/include/libpq/be-fsstubs.h b/src/include/libpq/be-fsstubs.h index 9703dc5cc1..961bfb6c68 100644 --- a/src/include/libpq/be-fsstubs.h +++ b/src/include/libpq/be-fsstubs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/libpq/be-fsstubs.h,v 1.26 2006/03/05 15:58:56 momjian Exp $ + * $PostgreSQL: pgsql/src/include/libpq/be-fsstubs.h,v 1.27 2006/09/07 15:37:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,7 +41,7 @@ extern Datum lo_unlink(PG_FUNCTION_ARGS); * but too late now... */ extern int lo_read(int fd, char *buf, int len); -extern int lo_write(int fd, char *buf, int len); +extern int lo_write(int fd, const char *buf, int len); /* * Cleanup LOs at xact commit/abort diff --git a/src/include/storage/large_object.h b/src/include/storage/large_object.h index ce37e83345..ebb7be8136 100644 --- a/src/include/storage/large_object.h +++ b/src/include/storage/large_object.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/large_object.h,v 1.34 2006/04/26 00:34:57 tgl Exp $ + * $PostgreSQL: pgsql/src/include/storage/large_object.h,v 1.35 2006/09/07 15:37:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -77,6 +77,6 @@ extern int inv_drop(Oid lobjId); extern int inv_seek(LargeObjectDesc *obj_desc, int offset, int whence); extern int inv_tell(LargeObjectDesc *obj_desc); extern int inv_read(LargeObjectDesc *obj_desc, char *buf, int nbytes); -extern int inv_write(LargeObjectDesc *obj_desc, char *buf, int nbytes); +extern int inv_write(LargeObjectDesc *obj_desc, const char *buf, int nbytes); #endif /* LARGE_OBJECT_H */ diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index f8859ca32d..998a564899 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-lobj.c,v 1.58 2006/06/14 17:49:25 tgl Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/fe-lobj.c,v 1.59 2006/09/07 15:37:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -172,7 +172,7 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) * returns the number of bytes written, or -1 on failure. */ int -lo_write(PGconn *conn, int fd, char *buf, size_t len) +lo_write(PGconn *conn, int fd, const char *buf, size_t len) { PQArgBlock argv[2]; PGresult *res; diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index 26c0a104fb..135791a4f1 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-fe.h,v 1.132 2006/08/18 19:52:39 tgl Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-fe.h,v 1.133 2006/09/07 15:37:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -483,7 +483,7 @@ PQprintTuples(const PGresult *res, extern int lo_open(PGconn *conn, Oid lobjId, int mode); extern int lo_close(PGconn *conn, int fd); extern int lo_read(PGconn *conn, int fd, char *buf, size_t len); -extern int lo_write(PGconn *conn, int fd, char *buf, size_t len); +extern int lo_write(PGconn *conn, int fd, const char *buf, size_t len); extern int lo_lseek(PGconn *conn, int fd, int offset, int whence); extern Oid lo_creat(PGconn *conn, int mode); extern Oid lo_create(PGconn *conn, Oid lobjId); -- 2.40.0