From 6fc547960dbe0b8bd6cefae5ab7ec3605a5c46fc Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Tue, 27 Dec 2016 12:00:00 -0500 Subject: [PATCH] Rename C symbols for backend lo_ functions Rename the C symbols for lo_* to be_lo_*, so they don't conflict with libpq prototypes. Reviewed-by: Pavel Stehule --- contrib/lo/lo.c | 4 ++-- src/backend/libpq/be-fsstubs.c | 40 ++++++++++++++++---------------- src/include/catalog/catversion.h | 2 +- src/include/catalog/pg_proc.h | 40 ++++++++++++++++---------------- src/include/libpq/be-fsstubs.h | 40 ++++++++++++++++---------------- 5 files changed, 63 insertions(+), 63 deletions(-) diff --git a/contrib/lo/lo.c b/contrib/lo/lo.c index 953659305f..85e67130bb 100644 --- a/contrib/lo/lo.c +++ b/contrib/lo/lo.c @@ -82,7 +82,7 @@ lo_manage(PG_FUNCTION_ARGS) char *newv = SPI_getvalue(newtuple, tupdesc, attnum); if (orig != NULL && (newv == NULL || strcmp(orig, newv) != 0)) - DirectFunctionCall1(lo_unlink, + DirectFunctionCall1(be_lo_unlink, ObjectIdGetDatum(atooid(orig))); if (newv) @@ -102,7 +102,7 @@ lo_manage(PG_FUNCTION_ARGS) if (orig != NULL) { - DirectFunctionCall1(lo_unlink, + DirectFunctionCall1(be_lo_unlink, ObjectIdGetDatum(atooid(orig))); pfree(orig); diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c index 6fae697471..f537affdd9 100644 --- a/src/backend/libpq/be-fsstubs.c +++ b/src/backend/libpq/be-fsstubs.c @@ -93,7 +93,7 @@ static Oid lo_import_internal(text *filename, Oid lobjOid); *****************************************************************************/ Datum -lo_open(PG_FUNCTION_ARGS) +be_lo_open(PG_FUNCTION_ARGS) { Oid lobjId = PG_GETARG_OID(0); int32 mode = PG_GETARG_INT32(1); @@ -122,7 +122,7 @@ lo_open(PG_FUNCTION_ARGS) } Datum -lo_close(PG_FUNCTION_ARGS) +be_lo_close(PG_FUNCTION_ARGS) { int32 fd = PG_GETARG_INT32(0); @@ -224,7 +224,7 @@ lo_write(int fd, const char *buf, int len) } Datum -lo_lseek(PG_FUNCTION_ARGS) +be_lo_lseek(PG_FUNCTION_ARGS) { int32 fd = PG_GETARG_INT32(0); int32 offset = PG_GETARG_INT32(1); @@ -249,7 +249,7 @@ lo_lseek(PG_FUNCTION_ARGS) } Datum -lo_lseek64(PG_FUNCTION_ARGS) +be_lo_lseek64(PG_FUNCTION_ARGS) { int32 fd = PG_GETARG_INT32(0); int64 offset = PG_GETARG_INT64(1); @@ -267,7 +267,7 @@ lo_lseek64(PG_FUNCTION_ARGS) } Datum -lo_creat(PG_FUNCTION_ARGS) +be_lo_creat(PG_FUNCTION_ARGS) { Oid lobjId; @@ -283,7 +283,7 @@ lo_creat(PG_FUNCTION_ARGS) } Datum -lo_create(PG_FUNCTION_ARGS) +be_lo_create(PG_FUNCTION_ARGS) { Oid lobjId = PG_GETARG_OID(0); @@ -299,7 +299,7 @@ lo_create(PG_FUNCTION_ARGS) } Datum -lo_tell(PG_FUNCTION_ARGS) +be_lo_tell(PG_FUNCTION_ARGS) { int32 fd = PG_GETARG_INT32(0); int64 offset; @@ -322,7 +322,7 @@ lo_tell(PG_FUNCTION_ARGS) } Datum -lo_tell64(PG_FUNCTION_ARGS) +be_lo_tell64(PG_FUNCTION_ARGS) { int32 fd = PG_GETARG_INT32(0); int64 offset; @@ -338,7 +338,7 @@ lo_tell64(PG_FUNCTION_ARGS) } Datum -lo_unlink(PG_FUNCTION_ARGS) +be_lo_unlink(PG_FUNCTION_ARGS) { Oid lobjId = PG_GETARG_OID(0); @@ -378,7 +378,7 @@ lo_unlink(PG_FUNCTION_ARGS) *****************************************************************************/ Datum -loread(PG_FUNCTION_ARGS) +be_loread(PG_FUNCTION_ARGS) { int32 fd = PG_GETARG_INT32(0); int32 len = PG_GETARG_INT32(1); @@ -396,7 +396,7 @@ loread(PG_FUNCTION_ARGS) } Datum -lowrite(PG_FUNCTION_ARGS) +be_lowrite(PG_FUNCTION_ARGS) { int32 fd = PG_GETARG_INT32(0); bytea *wbuf = PG_GETARG_BYTEA_P(1); @@ -417,7 +417,7 @@ lowrite(PG_FUNCTION_ARGS) * imports a file as an (inversion) large object. */ Datum -lo_import(PG_FUNCTION_ARGS) +be_lo_import(PG_FUNCTION_ARGS) { text *filename = PG_GETARG_TEXT_PP(0); @@ -429,7 +429,7 @@ lo_import(PG_FUNCTION_ARGS) * imports a file as an (inversion) large object specifying oid. */ Datum -lo_import_with_oid(PG_FUNCTION_ARGS) +be_lo_import_with_oid(PG_FUNCTION_ARGS) { text *filename = PG_GETARG_TEXT_PP(0); Oid oid = PG_GETARG_OID(1); @@ -502,7 +502,7 @@ lo_import_internal(text *filename, Oid lobjOid) * exports an (inversion) large object. */ Datum -lo_export(PG_FUNCTION_ARGS) +be_lo_export(PG_FUNCTION_ARGS) { Oid lobjId = PG_GETARG_OID(0); text *filename = PG_GETARG_TEXT_PP(1); @@ -606,7 +606,7 @@ lo_truncate_internal(int32 fd, int64 len) } Datum -lo_truncate(PG_FUNCTION_ARGS) +be_lo_truncate(PG_FUNCTION_ARGS) { int32 fd = PG_GETARG_INT32(0); int32 len = PG_GETARG_INT32(1); @@ -616,7 +616,7 @@ lo_truncate(PG_FUNCTION_ARGS) } Datum -lo_truncate64(PG_FUNCTION_ARGS) +be_lo_truncate64(PG_FUNCTION_ARGS) { int32 fd = PG_GETARG_INT32(0); int64 len = PG_GETARG_INT64(1); @@ -828,7 +828,7 @@ lo_get_fragment_internal(Oid loOid, int64 offset, int32 nbytes) * Read entire LO */ Datum -lo_get(PG_FUNCTION_ARGS) +be_lo_get(PG_FUNCTION_ARGS) { Oid loOid = PG_GETARG_OID(0); bytea *result; @@ -842,7 +842,7 @@ lo_get(PG_FUNCTION_ARGS) * Read range within LO */ Datum -lo_get_fragment(PG_FUNCTION_ARGS) +be_lo_get_fragment(PG_FUNCTION_ARGS) { Oid loOid = PG_GETARG_OID(0); int64 offset = PG_GETARG_INT64(1); @@ -863,7 +863,7 @@ lo_get_fragment(PG_FUNCTION_ARGS) * Create LO with initial contents given by a bytea argument */ Datum -lo_from_bytea(PG_FUNCTION_ARGS) +be_lo_from_bytea(PG_FUNCTION_ARGS) { Oid loOid = PG_GETARG_OID(0); bytea *str = PG_GETARG_BYTEA_PP(1); @@ -885,7 +885,7 @@ lo_from_bytea(PG_FUNCTION_ARGS) * Update range within LO */ Datum -lo_put(PG_FUNCTION_ARGS) +be_lo_put(PG_FUNCTION_ARGS) { Oid loOid = PG_GETARG_OID(0); int64 offset = PG_GETARG_INT64(1); diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 29604b6f4e..6da1fe9340 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 201701141 +#define CATALOG_VERSION_NO 201701171 #endif diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index 37e022dc0d..7fc0e037b6 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -903,11 +903,11 @@ DESCR("storage manager"); DATA(insert OID = 763 ( smgrne PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 16 "210 210" _null_ _null_ _null_ _null_ _null_ smgrne _null_ _null_ _null_ )); DESCR("storage manager"); -DATA(insert OID = 764 ( lo_import PGNSP PGUID 12 1 0 0 0 f f f f t f v u 1 0 26 "25" _null_ _null_ _null_ _null_ _null_ lo_import _null_ _null_ _null_ )); +DATA(insert OID = 764 ( lo_import PGNSP PGUID 12 1 0 0 0 f f f f t f v u 1 0 26 "25" _null_ _null_ _null_ _null_ _null_ be_lo_import _null_ _null_ _null_ )); DESCR("large object import"); -DATA(insert OID = 767 ( lo_import PGNSP PGUID 12 1 0 0 0 f f f f t f v u 2 0 26 "25 26" _null_ _null_ _null_ _null_ _null_ lo_import_with_oid _null_ _null_ _null_ )); +DATA(insert OID = 767 ( lo_import PGNSP PGUID 12 1 0 0 0 f f f f t f v u 2 0 26 "25 26" _null_ _null_ _null_ _null_ _null_ be_lo_import_with_oid _null_ _null_ _null_ )); DESCR("large object import"); -DATA(insert OID = 765 ( lo_export PGNSP PGUID 12 1 0 0 0 f f f f t f v u 2 0 23 "26 25" _null_ _null_ _null_ _null_ _null_ lo_export _null_ _null_ _null_ )); +DATA(insert OID = 765 ( lo_export PGNSP PGUID 12 1 0 0 0 f f f f t f v u 2 0 23 "26 25" _null_ _null_ _null_ _null_ _null_ be_lo_export _null_ _null_ _null_ )); DESCR("large object export"); DATA(insert OID = 766 ( int4inc PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "23" _null_ _null_ _null_ _null_ _null_ int4inc _null_ _null_ _null_ )); @@ -1011,38 +1011,38 @@ DESCR("convert text to char"); DATA(insert OID = 946 ( text PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 25 "18" _null_ _null_ _null_ _null_ _null_ char_text _null_ _null_ _null_ )); DESCR("convert char to text"); -DATA(insert OID = 952 ( lo_open PGNSP PGUID 12 1 0 0 0 f f f f t f v u 2 0 23 "26 23" _null_ _null_ _null_ _null_ _null_ lo_open _null_ _null_ _null_ )); +DATA(insert OID = 952 ( lo_open PGNSP PGUID 12 1 0 0 0 f f f f t f v u 2 0 23 "26 23" _null_ _null_ _null_ _null_ _null_ be_lo_open _null_ _null_ _null_ )); DESCR("large object open"); -DATA(insert OID = 953 ( lo_close PGNSP PGUID 12 1 0 0 0 f f f f t f v u 1 0 23 "23" _null_ _null_ _null_ _null_ _null_ lo_close _null_ _null_ _null_ )); +DATA(insert OID = 953 ( lo_close PGNSP PGUID 12 1 0 0 0 f f f f t f v u 1 0 23 "23" _null_ _null_ _null_ _null_ _null_ be_lo_close _null_ _null_ _null_ )); DESCR("large object close"); -DATA(insert OID = 954 ( loread PGNSP PGUID 12 1 0 0 0 f f f f t f v u 2 0 17 "23 23" _null_ _null_ _null_ _null_ _null_ loread _null_ _null_ _null_ )); +DATA(insert OID = 954 ( loread PGNSP PGUID 12 1 0 0 0 f f f f t f v u 2 0 17 "23 23" _null_ _null_ _null_ _null_ _null_ be_loread _null_ _null_ _null_ )); DESCR("large object read"); -DATA(insert OID = 955 ( lowrite PGNSP PGUID 12 1 0 0 0 f f f f t f v u 2 0 23 "23 17" _null_ _null_ _null_ _null_ _null_ lowrite _null_ _null_ _null_ )); +DATA(insert OID = 955 ( lowrite PGNSP PGUID 12 1 0 0 0 f f f f t f v u 2 0 23 "23 17" _null_ _null_ _null_ _null_ _null_ be_lowrite _null_ _null_ _null_ )); DESCR("large object write"); -DATA(insert OID = 956 ( lo_lseek PGNSP PGUID 12 1 0 0 0 f f f f t f v u 3 0 23 "23 23 23" _null_ _null_ _null_ _null_ _null_ lo_lseek _null_ _null_ _null_ )); +DATA(insert OID = 956 ( lo_lseek PGNSP PGUID 12 1 0 0 0 f f f f t f v u 3 0 23 "23 23 23" _null_ _null_ _null_ _null_ _null_ be_lo_lseek _null_ _null_ _null_ )); DESCR("large object seek"); -DATA(insert OID = 3170 ( lo_lseek64 PGNSP PGUID 12 1 0 0 0 f f f f t f v u 3 0 20 "23 20 23" _null_ _null_ _null_ _null_ _null_ lo_lseek64 _null_ _null_ _null_ )); +DATA(insert OID = 3170 ( lo_lseek64 PGNSP PGUID 12 1 0 0 0 f f f f t f v u 3 0 20 "23 20 23" _null_ _null_ _null_ _null_ _null_ be_lo_lseek64 _null_ _null_ _null_ )); DESCR("large object seek (64 bit)"); -DATA(insert OID = 957 ( lo_creat PGNSP PGUID 12 1 0 0 0 f f f f t f v u 1 0 26 "23" _null_ _null_ _null_ _null_ _null_ lo_creat _null_ _null_ _null_ )); +DATA(insert OID = 957 ( lo_creat PGNSP PGUID 12 1 0 0 0 f f f f t f v u 1 0 26 "23" _null_ _null_ _null_ _null_ _null_ be_lo_creat _null_ _null_ _null_ )); DESCR("large object create"); -DATA(insert OID = 715 ( lo_create PGNSP PGUID 12 1 0 0 0 f f f f t f v u 1 0 26 "26" _null_ _null_ _null_ _null_ _null_ lo_create _null_ _null_ _null_ )); +DATA(insert OID = 715 ( lo_create PGNSP PGUID 12 1 0 0 0 f f f f t f v u 1 0 26 "26" _null_ _null_ _null_ _null_ _null_ be_lo_create _null_ _null_ _null_ )); DESCR("large object create"); -DATA(insert OID = 958 ( lo_tell PGNSP PGUID 12 1 0 0 0 f f f f t f v u 1 0 23 "23" _null_ _null_ _null_ _null_ _null_ lo_tell _null_ _null_ _null_ )); +DATA(insert OID = 958 ( lo_tell PGNSP PGUID 12 1 0 0 0 f f f f t f v u 1 0 23 "23" _null_ _null_ _null_ _null_ _null_ be_lo_tell _null_ _null_ _null_ )); DESCR("large object position"); -DATA(insert OID = 3171 ( lo_tell64 PGNSP PGUID 12 1 0 0 0 f f f f t f v u 1 0 20 "23" _null_ _null_ _null_ _null_ _null_ lo_tell64 _null_ _null_ _null_ )); +DATA(insert OID = 3171 ( lo_tell64 PGNSP PGUID 12 1 0 0 0 f f f f t f v u 1 0 20 "23" _null_ _null_ _null_ _null_ _null_ be_lo_tell64 _null_ _null_ _null_ )); DESCR("large object position (64 bit)"); -DATA(insert OID = 1004 ( lo_truncate PGNSP PGUID 12 1 0 0 0 f f f f t f v u 2 0 23 "23 23" _null_ _null_ _null_ _null_ _null_ lo_truncate _null_ _null_ _null_ )); +DATA(insert OID = 1004 ( lo_truncate PGNSP PGUID 12 1 0 0 0 f f f f t f v u 2 0 23 "23 23" _null_ _null_ _null_ _null_ _null_ be_lo_truncate _null_ _null_ _null_ )); DESCR("truncate large object"); -DATA(insert OID = 3172 ( lo_truncate64 PGNSP PGUID 12 1 0 0 0 f f f f t f v u 2 0 23 "23 20" _null_ _null_ _null_ _null_ _null_ lo_truncate64 _null_ _null_ _null_ )); +DATA(insert OID = 3172 ( lo_truncate64 PGNSP PGUID 12 1 0 0 0 f f f f t f v u 2 0 23 "23 20" _null_ _null_ _null_ _null_ _null_ be_lo_truncate64 _null_ _null_ _null_ )); DESCR("truncate large object (64 bit)"); -DATA(insert OID = 3457 ( lo_from_bytea PGNSP PGUID 12 1 0 0 0 f f f f t f v u 2 0 26 "26 17" _null_ _null_ _null_ _null_ _null_ lo_from_bytea _null_ _null_ _null_ )); +DATA(insert OID = 3457 ( lo_from_bytea PGNSP PGUID 12 1 0 0 0 f f f f t f v u 2 0 26 "26 17" _null_ _null_ _null_ _null_ _null_ be_lo_from_bytea _null_ _null_ _null_ )); DESCR("create new large object with given content"); -DATA(insert OID = 3458 ( lo_get PGNSP PGUID 12 1 0 0 0 f f f f t f v u 1 0 17 "26" _null_ _null_ _null_ _null_ _null_ lo_get _null_ _null_ _null_ )); +DATA(insert OID = 3458 ( lo_get PGNSP PGUID 12 1 0 0 0 f f f f t f v u 1 0 17 "26" _null_ _null_ _null_ _null_ _null_ be_lo_get _null_ _null_ _null_ )); DESCR("read entire large object"); -DATA(insert OID = 3459 ( lo_get PGNSP PGUID 12 1 0 0 0 f f f f t f v u 3 0 17 "26 20 23" _null_ _null_ _null_ _null_ _null_ lo_get_fragment _null_ _null_ _null_ )); +DATA(insert OID = 3459 ( lo_get PGNSP PGUID 12 1 0 0 0 f f f f t f v u 3 0 17 "26 20 23" _null_ _null_ _null_ _null_ _null_ be_lo_get_fragment _null_ _null_ _null_ )); DESCR("read large object from offset for length"); -DATA(insert OID = 3460 ( lo_put PGNSP PGUID 12 1 0 0 0 f f f f t f v u 3 0 2278 "26 20 17" _null_ _null_ _null_ _null_ _null_ lo_put _null_ _null_ _null_ )); +DATA(insert OID = 3460 ( lo_put PGNSP PGUID 12 1 0 0 0 f f f f t f v u 3 0 2278 "26 20 17" _null_ _null_ _null_ _null_ _null_ be_lo_put _null_ _null_ _null_ )); DESCR("write data at offset"); DATA(insert OID = 959 ( on_pl PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 16 "600 628" _null_ _null_ _null_ _null_ _null_ on_pl _null_ _null_ _null_ )); @@ -1051,7 +1051,7 @@ DATA(insert OID = 961 ( close_pl PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 DATA(insert OID = 962 ( close_sl PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 600 "601 628" _null_ _null_ _null_ _null_ _null_ close_sl _null_ _null_ _null_ )); DATA(insert OID = 963 ( close_lb PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 600 "628 603" _null_ _null_ _null_ _null_ _null_ close_lb _null_ _null_ _null_ )); -DATA(insert OID = 964 ( lo_unlink PGNSP PGUID 12 1 0 0 0 f f f f t f v u 1 0 23 "26" _null_ _null_ _null_ _null_ _null_ lo_unlink _null_ _null_ _null_ )); +DATA(insert OID = 964 ( lo_unlink PGNSP PGUID 12 1 0 0 0 f f f f t f v u 1 0 23 "26" _null_ _null_ _null_ _null_ _null_ be_lo_unlink _null_ _null_ _null_ )); DESCR("large object unlink (delete)"); DATA(insert OID = 973 ( path_inter PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 16 "602 602" _null_ _null_ _null_ _null_ _null_ path_inter _null_ _null_ _null_ )); diff --git a/src/include/libpq/be-fsstubs.h b/src/include/libpq/be-fsstubs.h index 82eb5914ee..e232749f68 100644 --- a/src/include/libpq/be-fsstubs.h +++ b/src/include/libpq/be-fsstubs.h @@ -19,31 +19,31 @@ /* * LO functions available via pg_proc entries */ -extern Datum lo_import(PG_FUNCTION_ARGS); -extern Datum lo_import_with_oid(PG_FUNCTION_ARGS); -extern Datum lo_export(PG_FUNCTION_ARGS); +extern Datum be_lo_import(PG_FUNCTION_ARGS); +extern Datum be_lo_import_with_oid(PG_FUNCTION_ARGS); +extern Datum be_lo_export(PG_FUNCTION_ARGS); -extern Datum lo_creat(PG_FUNCTION_ARGS); -extern Datum lo_create(PG_FUNCTION_ARGS); -extern Datum lo_from_bytea(PG_FUNCTION_ARGS); +extern Datum be_lo_creat(PG_FUNCTION_ARGS); +extern Datum be_lo_create(PG_FUNCTION_ARGS); +extern Datum be_lo_from_bytea(PG_FUNCTION_ARGS); -extern Datum lo_open(PG_FUNCTION_ARGS); -extern Datum lo_close(PG_FUNCTION_ARGS); +extern Datum be_lo_open(PG_FUNCTION_ARGS); +extern Datum be_lo_close(PG_FUNCTION_ARGS); -extern Datum loread(PG_FUNCTION_ARGS); -extern Datum lowrite(PG_FUNCTION_ARGS); +extern Datum be_loread(PG_FUNCTION_ARGS); +extern Datum be_lowrite(PG_FUNCTION_ARGS); -extern Datum lo_get(PG_FUNCTION_ARGS); -extern Datum lo_get_fragment(PG_FUNCTION_ARGS); -extern Datum lo_put(PG_FUNCTION_ARGS); +extern Datum be_lo_get(PG_FUNCTION_ARGS); +extern Datum be_lo_get_fragment(PG_FUNCTION_ARGS); +extern Datum be_lo_put(PG_FUNCTION_ARGS); -extern Datum lo_lseek(PG_FUNCTION_ARGS); -extern Datum lo_tell(PG_FUNCTION_ARGS); -extern Datum lo_lseek64(PG_FUNCTION_ARGS); -extern Datum lo_tell64(PG_FUNCTION_ARGS); -extern Datum lo_unlink(PG_FUNCTION_ARGS); -extern Datum lo_truncate(PG_FUNCTION_ARGS); -extern Datum lo_truncate64(PG_FUNCTION_ARGS); +extern Datum be_lo_lseek(PG_FUNCTION_ARGS); +extern Datum be_lo_tell(PG_FUNCTION_ARGS); +extern Datum be_lo_lseek64(PG_FUNCTION_ARGS); +extern Datum be_lo_tell64(PG_FUNCTION_ARGS); +extern Datum be_lo_unlink(PG_FUNCTION_ARGS); +extern Datum be_lo_truncate(PG_FUNCTION_ARGS); +extern Datum be_lo_truncate64(PG_FUNCTION_ARGS); /* * compatibility option for access control -- 2.40.0