[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] pdumper b7da1a5 6/6: Avoid -Wconversion error in dump_read
From: |
Daniel Colascione |
Subject: |
[Emacs-diffs] pdumper b7da1a5 6/6: Avoid -Wconversion error in dump_read_all under MS-Windows |
Date: |
Mon, 19 Feb 2018 12:02:50 -0500 (EST) |
branch: pdumper
commit b7da1a5af8f189705ca596bcec6597a59b1aff9b
Author: Daniel Colascione <address@hidden>
Commit: Daniel Colascione <address@hidden>
Avoid -Wconversion error in dump_read_all under MS-Windows
---
src/pdumper.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/pdumper.c b/src/pdumper.c
index efccafb..f66f3fe 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -4884,8 +4884,12 @@ dump_read_all (int fd, void *buf, size_t bytes_to_read)
size_t bytes_read = 0;
while (bytes_read < bytes_to_read)
{
+ /* Some platforms accept only int-sized values to read. */
+ unsigned chunk_to_read = UINT_MAX;
+ if (bytes_to_read - bytes_read < chunk_to_read)
+ chunk_to_read = (unsigned)(bytes_to_read - bytes_read);
ssize_t chunk =
- read (fd, (char*) buf + bytes_read, bytes_to_read - bytes_read);
+ read (fd, (char*) buf + bytes_read, chunk_to_read);
if (chunk < 0)
return chunk;
if (chunk == 0)
- [Emacs-diffs] pdumper updated (4eb06e3 -> b7da1a5), Daniel Colascione, 2018/02/19
- [Emacs-diffs] pdumper 131d65b 2/6: Use mmap retry on Cygwin too, Daniel Colascione, 2018/02/19
- [Emacs-diffs] pdumper 1de3fa3 4/6: Remove obsolete todo comment, Daniel Colascione, 2018/02/19
- [Emacs-diffs] pdumper b7da1a5 6/6: Avoid -Wconversion error in dump_read_all under MS-Windows,
Daniel Colascione <=
- [Emacs-diffs] pdumper d9dcb3f 3/6: Limit -Wconversion to GCC >= 4.7, Daniel Colascione, 2018/02/19
- [Emacs-diffs] pdumper 2971d13 5/6: Move unblock_input out of catch handler, Daniel Colascione, 2018/02/19
- [Emacs-diffs] pdumper 11976b6 1/6: Verify hashes of lisp structures during compilation, Daniel Colascione, 2018/02/19