# # patch "ChangeLog" # from [922ee6988aad6e53ef9a504c7b0b43a7471b07cd] # to [e51357408eb2964c5392b354b7e3e4eb9738c39d] # # patch "lua.cc" # from [99980ee71d865a747089c3cddfe9b2baa29aca03] # to [882a8da44c61cc9ef4dd68a298900d42a73292b8] # ======================================================================== --- ChangeLog 922ee6988aad6e53ef9a504c7b0b43a7471b07cd +++ ChangeLog e51357408eb2964c5392b354b7e3e4eb9738c39d @@ -1,3 +1,8 @@ +2005-09-25 Benoît Dejean + + * lua.cc (monotone_guess_binary_file_contents_for_lua): + Fixed signednes warning and istream usage. + 2005-09-25 Matt Johnston * ui.cc: fallback to the default locale if locale("") fails. ======================================================================== --- lua.cc 99980ee71d865a747089c3cddfe9b2baa29aca03 +++ lua.cc 882a8da44c61cc9ef4dd68a298900d42a73292b8 @@ -535,10 +535,9 @@ const int bufsize = 8192; char tmpbuf[bufsize]; string buf; - while(file.good()) + while (file.read(tmpbuf, sizeof tmpbuf)) { - file.read(tmpbuf, sizeof(tmpbuf)); - I(file.gcount() <= sizeof(tmpbuf)); + I(file.gcount() <= static_cast(sizeof tmpbuf)); buf.assign(tmpbuf, file.gcount()); if (guess_binary(buf)) {