Suppressed many integer size warnings by a mix of type adjustments and casts,
none of which should have a real effect. --HG-- branch : WINDOWSPORT
This commit is contained in:
@@ -108,7 +108,7 @@ namespace Dijon
|
||||
*/
|
||||
virtual bool set_document_data(const std::string& mtype,
|
||||
const char *data_ptr,
|
||||
unsigned int data_length) = 0;
|
||||
size_t data_length) = 0;
|
||||
|
||||
/** (Re)initializes the filter with the given data.
|
||||
* Call next_document() to position the filter onto the first document.
|
||||
|
||||
@@ -629,7 +629,7 @@ void FileInterner::popHandler()
|
||||
{
|
||||
if (m_handlers.empty())
|
||||
return;
|
||||
int i = m_handlers.size() - 1;
|
||||
size_t i = m_handlers.size() - 1;
|
||||
if (m_tmpflgs[i]) {
|
||||
m_tempfiles.pop_back();
|
||||
m_tmpflgs[i] = false;
|
||||
|
||||
@@ -128,7 +128,7 @@ public:
|
||||
return -1;
|
||||
}
|
||||
mbhoff_type offset = -1;
|
||||
int ret;
|
||||
size_t ret;
|
||||
if ((ret = fread(&offset, 1, sizeof(mbhoff_type), fp))
|
||||
!= sizeof(mbhoff_type)) {
|
||||
LOGDEB0(("MboxCache::get_offsets: read ret %d errno %d\n",
|
||||
@@ -318,7 +318,7 @@ bool MimeHandlerMbox::set_document_file(const string& mt, const string &fn)
|
||||
typedef char line_type[LL+10];
|
||||
static inline void stripendnl(line_type& line, int& ll)
|
||||
{
|
||||
ll = strlen(line);
|
||||
ll = int(strlen(line));
|
||||
while (ll > 0) {
|
||||
if (line[ll-1] == '\n' || line[ll-1] == '\r') {
|
||||
line[ll-1] = 0;
|
||||
|
||||
@@ -86,7 +86,7 @@ public:
|
||||
return false;
|
||||
}
|
||||
virtual bool set_document_data(const std::string& mtype,
|
||||
const char *cp, unsigned int sz)
|
||||
const char *cp, size_t sz)
|
||||
{
|
||||
return set_document_string(mtype, std::string(cp, sz));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user