From a94aded8c179c278066c3d86f8878b0c1f3e8f73 Mon Sep 17 00:00:00 2001 From: Jovi Zhang Date: Tue, 29 Nov 2011 02:04:04 +0800 Subject: erts: change SENDFILE_CHUNK_SIZE from signed to unsigned It's reasonable to use UL in SENDFILE_CHUNK_SIZE --- erts/emulator/drivers/unix/unix_efile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erts/emulator/drivers/unix/unix_efile.c b/erts/emulator/drivers/unix/unix_efile.c index 72911641d3..eb2c5f58a5 100644 --- a/erts/emulator/drivers/unix/unix_efile.c +++ b/erts/emulator/drivers/unix/unix_efile.c @@ -1469,7 +1469,7 @@ efile_fadvise(Efile_error* errInfo, int fd, Sint64 offset, } #ifdef HAVE_SENDFILE -#define SENDFILE_CHUNK_SIZE ((1 << 30) -1) +#define SENDFILE_CHUNK_SIZE ((1UL << 30) -1) /* * sendfile: The implementation of the sendfile system call varies -- cgit v1.2.3 From 6581e8bbef00ee093fec63c59cb87c913615340a Mon Sep 17 00:00:00 2001 From: Jovi Zhang Date: Tue, 29 Nov 2011 05:23:56 +0800 Subject: erts: minor fix for unnecessary condition In "while (retval != -1 && retval == SENDFILE_CHUNK_SIZE)", "retval != -1" is pointless. --- erts/emulator/drivers/unix/unix_efile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erts/emulator/drivers/unix/unix_efile.c b/erts/emulator/drivers/unix/unix_efile.c index 72911641d3..e005690d78 100644 --- a/erts/emulator/drivers/unix/unix_efile.c +++ b/erts/emulator/drivers/unix/unix_efile.c @@ -1500,7 +1500,7 @@ efile_sendfile(Efile_error* errInfo, int in_fd, int out_fd, written += retval; *nbytes -= retval; } - } while (retval != -1 && retval == SENDFILE_CHUNK_SIZE); + } while (retval == SENDFILE_CHUNK_SIZE); *nbytes = written; return check_error(retval == -1 ? -1 : 0, errInfo); #elif defined(DARWIN) -- cgit v1.2.3 From 216bcfc4dacce62b8b8aa838d866b66433d746db Mon Sep 17 00:00:00 2001 From: Henrik Nord Date: Tue, 3 Jan 2012 16:24:14 +0100 Subject: Change the name of generated pdf file for documentation consistency --- lib/wx/doc/src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/wx/doc/src/Makefile b/lib/wx/doc/src/Makefile index c8eb6174c4..03e9f1e1bb 100644 --- a/lib/wx/doc/src/Makefile +++ b/lib/wx/doc/src/Makefile @@ -22,7 +22,7 @@ # ---------------------------------------------------- include ../../vsn.mk include ../../config.mk -APPLICATION=wxErlang +APPLICATION=wx ErlMods = wx.erl wx_object.erl -- cgit v1.2.3