mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-29 18:19:30 +00:00
Allow Asterisk to compile under GCC 4.10
This resolves a large number of compiler warnings from GCC 4.10 which cause the build to fail under dev mode. The vast majority are signed/unsigned mismatches in printf-style format strings. ........ Merged revisions 413586 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 413587 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@413588 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -291,7 +291,7 @@ static int stat_read(struct ast_channel *chan, const char *cmd, char *data,
|
||||
strcpy(buf, "1");
|
||||
break;
|
||||
case 's':
|
||||
snprintf(buf, len, "%d", (unsigned int) s.st_size);
|
||||
snprintf(buf, len, "%u", (unsigned int) s.st_size);
|
||||
break;
|
||||
case 'f':
|
||||
snprintf(buf, len, "%d", S_ISREG(s.st_mode) ? 1 : 0);
|
||||
@@ -309,7 +309,7 @@ static int stat_read(struct ast_channel *chan, const char *cmd, char *data,
|
||||
snprintf(buf, len, "%d", (int) s.st_ctime);
|
||||
break;
|
||||
case 'm':
|
||||
snprintf(buf, len, "%o", (int) s.st_mode);
|
||||
snprintf(buf, len, "%o", s.st_mode);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -699,7 +699,7 @@ static int file_read(struct ast_channel *chan, const char *cmd, char *data, stru
|
||||
if (fread(fbuf, 1, i + sizeof(fbuf) > flength ? flength - i : sizeof(fbuf), ff) < (i + sizeof(fbuf) > flength ? flength - i : sizeof(fbuf))) {
|
||||
ast_log(LOG_ERROR, "Short read?!!\n");
|
||||
}
|
||||
ast_debug(3, "Appending first %" PRId64" bytes of fbuf=%s\n", i + sizeof(fbuf) > length_offset ? length_offset - i : sizeof(fbuf), fbuf);
|
||||
ast_debug(3, "Appending first %" PRId64" bytes of fbuf=%s\n", (long)(i + sizeof(fbuf) > length_offset ? length_offset - i : sizeof(fbuf)), fbuf);
|
||||
ast_str_append_substr(buf, len, fbuf, i + sizeof(fbuf) > length_offset ? length_offset - i : sizeof(fbuf));
|
||||
}
|
||||
} else if (length == 0) {
|
||||
|
Reference in New Issue
Block a user