summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Munro2020-06-16 05:23:36 +0000
committerThomas Munro2020-06-16 05:33:04 +0000
commitf5d18862bbb327b67cd0f33f3d11351096080665 (patch)
tree0aae0634164a5ec7dbca8c1cbf7a4647aee10f81
parent7897e3bb902c557412645b82120f4d95f7474906 (diff)
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
-rw-r--r--src/backend/storage/file/buffile.c4
-rw-r--r--src/include/storage/buffile.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c
index 298b10b543..b402f064bb 100644
--- a/src/backend/storage/file/buffile.c
+++ b/src/backend/storage/file/buffile.c
@@ -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
* ereport().
*/
-size_t
+void
BufFileWrite(BufFile *file, void *ptr, size_t size)
{
size_t nwritten = 0;
@@ -617,8 +617,6 @@ BufFileWrite(BufFile *file, void *ptr, size_t size)
size -= nthistime;
nwritten += nthistime;
}
-
- return nwritten;
}
/*
diff --git a/src/include/storage/buffile.h b/src/include/storage/buffile.h
index 60433f35b4..f4752bab0d 100644
--- a/src/include/storage/buffile.h
+++ b/src/include/storage/buffile.h
@@ -39,7 +39,7 @@ typedef struct BufFile BufFile;
extern BufFile *BufFileCreateTemp(bool interXact);
extern void BufFileClose(BufFile *file);
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 void BufFileTell(BufFile *file, int *fileno, off_t *offset);
extern int BufFileSeekBlock(BufFile *file, long blknum);