Commit f5d18862 authored by Thomas Munro's avatar Thomas Munro

Make BufFileWrite() void.

It now either returns after it wrote all the data you gave it, or raises
an error.  Not done in back-branches, because it might cause problems
for external code.

Discussion: https://postgr.es/m/CA%2BhUKGJE04G%3D8TLK0DLypT_27D9dR8F1RQgNp0jK6qR0tZGWOw%40mail.gmail.com
parent 7897e3bb
...@@ -578,7 +578,7 @@ BufFileRead(BufFile *file, void *ptr, size_t size) ...@@ -578,7 +578,7 @@ BufFileRead(BufFile *file, void *ptr, size_t size)
* Like fwrite() except we assume 1-byte element size and report errors via * Like fwrite() except we assume 1-byte element size and report errors via
* ereport(). * ereport().
*/ */
size_t void
BufFileWrite(BufFile *file, void *ptr, size_t size) BufFileWrite(BufFile *file, void *ptr, size_t size)
{ {
size_t nwritten = 0; size_t nwritten = 0;
...@@ -617,8 +617,6 @@ BufFileWrite(BufFile *file, void *ptr, size_t size) ...@@ -617,8 +617,6 @@ BufFileWrite(BufFile *file, void *ptr, size_t size)
size -= nthistime; size -= nthistime;
nwritten += nthistime; nwritten += nthistime;
} }
return nwritten;
} }
/* /*
......
...@@ -39,7 +39,7 @@ typedef struct BufFile BufFile; ...@@ -39,7 +39,7 @@ typedef struct BufFile BufFile;
extern BufFile *BufFileCreateTemp(bool interXact); extern BufFile *BufFileCreateTemp(bool interXact);
extern void BufFileClose(BufFile *file); extern void BufFileClose(BufFile *file);
extern size_t BufFileRead(BufFile *file, void *ptr, size_t size); extern size_t BufFileRead(BufFile *file, void *ptr, size_t size);
extern size_t BufFileWrite(BufFile *file, void *ptr, size_t size); extern void BufFileWrite(BufFile *file, void *ptr, size_t size);
extern int BufFileSeek(BufFile *file, int fileno, off_t offset, int whence); extern int BufFileSeek(BufFile *file, int fileno, off_t offset, int whence);
extern void BufFileTell(BufFile *file, int *fileno, off_t *offset); extern void BufFileTell(BufFile *file, int *fileno, off_t *offset);
extern int BufFileSeekBlock(BufFile *file, long blknum); extern int BufFileSeekBlock(BufFile *file, long blknum);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment