mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-29 18:19:30 +00:00
bring over all the fixes for the warnings found by gcc 4.3.x from the 1.4 branch, and add the ones needed for all the new code here too
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@153616 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
12
main/http.c
12
main/http.c
@@ -219,7 +219,9 @@ static struct ast_str *static_callback(struct ast_tcptls_session_instance *ser,
|
||||
ast_get_version(), buf, (int) st.st_size, mtype);
|
||||
|
||||
while ((len = read(fd, buf, sizeof(buf))) > 0) {
|
||||
fwrite(buf, 1, len, ser->f);
|
||||
if (fwrite(buf, 1, len, ser->f) != len) {
|
||||
ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
|
||||
}
|
||||
}
|
||||
|
||||
close(fd);
|
||||
@@ -760,8 +762,12 @@ static void *httpd_helper_thread(void *data)
|
||||
if (tmp) {
|
||||
fprintf(ser->f, "Content-length: %d\r\n", contentlength);
|
||||
/* first write the header, then the body */
|
||||
fwrite(out->str, 1, (tmp + 4 - out->str), ser->f);
|
||||
fwrite(tmp + 4, 1, contentlength, ser->f);
|
||||
if (fwrite(out->str, 1, (tmp + 4 - out->str), ser->f) != tmp + 4 - out->str) {
|
||||
ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
|
||||
}
|
||||
if (fwrite(tmp + 4, 1, contentlength, ser->f) != contentlength ) {
|
||||
ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
|
||||
}
|
||||
}
|
||||
}
|
||||
ast_free(out);
|
||||
|
Reference in New Issue
Block a user