Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-14 05:53:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use long instead of int in read_in_chunks()

Browse source 
Fixes warnings about narrowing conversions
This commit is contained in:
ridiculousfish 2017-01-21 11:53:49 -08:00
parent 4c56c89afc
commit f7c133da00
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/builtin.cpp
View file

@ -2008,6 +2008,7 @@ static int read_interactive(wcstring &buff, int nchars, bool shell, const wchar_
/// Read from the fd in chunks until we see newline or null, as appropriate, is seen. This is only /// Read from the fd in chunks until we see newline or null, as appropriate, is seen. This is only
/// used when the fd is seekable (so not from a tty or pipe) and we're not reading a specific number /// used when the fd is seekable (so not from a tty or pipe) and we're not reading a specific number
/// of chars. /// of chars.
/// Returns an exit status
static int read_in_chunks(int fd, wcstring &buff, bool split_null) { static int read_in_chunks(int fd, wcstring &buff, bool split_null) {
int exit_res = STATUS_BUILTIN_OK; int exit_res = STATUS_BUILTIN_OK;
std::string str; std::string str;
@ -2016,14 +2017,14 @@ static int read_in_chunks(int fd, wcstring &buff, bool split_null) {
while (!finished) { while (!finished) {
char inbuf[READ_CHUNK_SIZE]; char inbuf[READ_CHUNK_SIZE];
int bytes_read = read_blocked(fd, inbuf, READ_CHUNK_SIZE); long bytes_read = read_blocked(fd, inbuf, READ_CHUNK_SIZE);
if (bytes_read <= 0) { if (bytes_read <= 0) {
eof = true; eof = true;
break; break;
} }
int i; long i;
for (i = 0; i < bytes_read && !finished; i++) { for (i = 0; i < bytes_read && !finished; i++) {
if ((!split_null && inbuf[i] == L'\n') || (split_null && inbuf[i] == L'\0')) { if ((!split_null && inbuf[i] == L'\n') || (split_null && inbuf[i] == L'\0')) {
finished = true; finished = true;