From fdae048185aaecba0143bd6ccb964fe06166ad35 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 29 Jun 2026 13:37:54 +0200 Subject: [PATCH v1 13/15] Clean up pg_pwrite() return type analogous to the previous changes for write() --- src/backend/access/heap/rewriteheap.c | 2 +- src/backend/replication/walreceiver.c | 2 +- src/backend/utils/init/miscinit.c | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c index 5a5398a76ae..ee7d853c1b8 100644 --- a/src/backend/access/heap/rewriteheap.c +++ b/src/backend/access/heap/rewriteheap.c @@ -1078,7 +1078,7 @@ heap_xlog_logical_rewrite(XLogReaderState *r) char path[MAXPGPATH]; int fd; xl_heap_rewrite_mapping *xlrec; - uint32 len; + size_t len; char *data; xlrec = (xl_heap_rewrite_mapping *) XLogRecGetData(r); diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c index bb4c2ae0a12..429a1b2d96d 100644 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@ -913,7 +913,7 @@ static void XLogWalRcvWrite(char *buf, Size nbytes, XLogRecPtr recptr, TimeLineID tli) { int startoff; - int byteswritten; + ssize_t byteswritten; instr_time start; Assert(tli != 0); diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index 263ae7b8d86..eddce1ce33f 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -1522,7 +1522,8 @@ void AddToDataDirLockFile(int target_line, const char *str) { int fd; - ssize_t len; + ssize_t nread; + size_t len; int lineno; char *srcptr; char *destptr; @@ -1539,9 +1540,9 @@ AddToDataDirLockFile(int target_line, const char *str) return; } pgstat_report_wait_start(WAIT_EVENT_LOCK_FILE_ADDTODATADIR_READ); - len = read(fd, srcbuffer, sizeof(srcbuffer) - 1); + nread = read(fd, srcbuffer, sizeof(srcbuffer) - 1); pgstat_report_wait_end(); - if (len < 0) + if (nread < 0) { ereport(LOG, (errcode_for_file_access(), @@ -1550,7 +1551,7 @@ AddToDataDirLockFile(int target_line, const char *str) close(fd); return; } - srcbuffer[len] = '\0'; + srcbuffer[nread] = '\0'; /* * Advance over lines we are not supposed to rewrite, then copy them to -- 2.54.0