diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2018-09-26 12:35:57 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2018-09-26 12:35:57 -0400 |
| commit | 758ce9b7794845f95473c569155d29fcf0e2751b (patch) | |
| tree | 9110f776f5f665b4cfff55223c7e0f2da47ffaaf /src/interfaces/libpq/fe-lobj.c | |
| parent | 26e9d4d4ef16b5e2be96319f89ea6ba7f63a4d73 (diff) | |
| download | postgresql-758ce9b7794845f95473c569155d29fcf0e2751b.tar.gz | |
Incorporate strerror_r() into src/port/snprintf.c, too.
This provides the features that used to exist in useful_strerror()
for users of strerror_r(), too. Also, standardize on the GNU convention
that strerror_r returns a char pointer that may not be NULL.
I notice that libpq's win32.c contains a variant version of strerror_r
that probably ought to be folded into strerror.c. But lacking a
Windows environment, I should leave that to somebody else.
Discussion: https://postgr.es/m/2975.1526862605@sss.pgh.pa.us
Diffstat (limited to 'src/interfaces/libpq/fe-lobj.c')
| -rw-r--r-- | src/interfaces/libpq/fe-lobj.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index a5ad3af258..b9caa22966 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -694,7 +694,7 @@ lo_import_internal(PGconn *conn, const char *filename, Oid oid) char buf[LO_BUFSIZE]; Oid lobjOid; int lobj; - char sebuf[256]; + char sebuf[PG_STRERROR_R_BUFLEN]; /* * open the file to be read in @@ -704,7 +704,7 @@ lo_import_internal(PGconn *conn, const char *filename, Oid oid) { /* error */ printfPQExpBuffer(&conn->errorMessage, libpq_gettext("could not open file \"%s\": %s\n"), - filename, pqStrerror(errno, sebuf, sizeof(sebuf))); + filename, strerror_r(errno, sebuf, sizeof(sebuf))); return InvalidOid; } @@ -760,7 +760,7 @@ lo_import_internal(PGconn *conn, const char *filename, Oid oid) printfPQExpBuffer(&conn->errorMessage, libpq_gettext("could not read from file \"%s\": %s\n"), filename, - pqStrerror(save_errno, sebuf, sizeof(sebuf))); + strerror_r(save_errno, sebuf, sizeof(sebuf))); return InvalidOid; } @@ -789,7 +789,7 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename) tmp; char buf[LO_BUFSIZE]; int lobj; - char sebuf[256]; + char sebuf[PG_STRERROR_R_BUFLEN]; /* * open the large object. @@ -814,7 +814,7 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename) printfPQExpBuffer(&conn->errorMessage, libpq_gettext("could not open file \"%s\": %s\n"), filename, - pqStrerror(save_errno, sebuf, sizeof(sebuf))); + strerror_r(save_errno, sebuf, sizeof(sebuf))); return -1; } @@ -834,7 +834,7 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename) printfPQExpBuffer(&conn->errorMessage, libpq_gettext("could not write to file \"%s\": %s\n"), filename, - pqStrerror(save_errno, sebuf, sizeof(sebuf))); + strerror_r(save_errno, sebuf, sizeof(sebuf))); return -1; } } @@ -857,7 +857,7 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename) { printfPQExpBuffer(&conn->errorMessage, libpq_gettext("could not write to file \"%s\": %s\n"), - filename, pqStrerror(errno, sebuf, sizeof(sebuf))); + filename, strerror_r(errno, sebuf, sizeof(sebuf))); result = -1; } |