diff options
| author | Kinsey Moore <kmoore@digium.com> | 2014-05-09 22:49:26 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2014-05-09 22:49:26 +0000 |
| commit | abd3e4040bd76058d0148884879858894258fb9f (patch) | |
| tree | c5695a0880c4928731b1aa864f862c6cffa57428 /res/res_http_websocket.c | |
| parent | f3b55da1b855b12a59f84fd9bf6768eb101cd910 (diff) | |
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
........
Merged revisions 413588 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@413589 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_http_websocket.c')
| -rw-r--r-- | res/res_http_websocket.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/res/res_http_websocket.c b/res/res_http_websocket.c index d344340c7..cdb639f48 100644 --- a/res/res_http_websocket.c +++ b/res/res_http_websocket.c @@ -483,7 +483,7 @@ int AST_OPTIONAL_API_NAME(ast_websocket_read)(struct ast_websocket *session, cha *payload = &buf[frame_size]; /* payload will start here, at the end of the options, if any */ frame_size = frame_size + (*payload_len); /* final frame size is header + optional headers + payload data */ if (frame_size > MAXIMUM_FRAME_SIZE) { - ast_log(LOG_WARNING, "Cannot fit huge websocket frame of %zd bytes\n", frame_size); + ast_log(LOG_WARNING, "Cannot fit huge websocket frame of %zu bytes\n", frame_size); /* The frame won't fit :-( */ ast_websocket_close(session, 1009); return -1; @@ -502,7 +502,7 @@ int AST_OPTIONAL_API_NAME(ast_websocket_read)(struct ast_websocket *session, cha } if (!(new_payload = ast_realloc(session->payload, (session->payload_len + *payload_len)))) { - ast_log(LOG_WARNING, "Failed allocation: %p, %zd, %"PRIu64"\n", + ast_log(LOG_WARNING, "Failed allocation: %p, %zu, %"PRIu64"\n", session->payload, session->payload_len, *payload_len); *payload_len = 0; ast_websocket_close(session, 1009); @@ -554,7 +554,7 @@ int AST_OPTIONAL_API_NAME(ast_websocket_read)(struct ast_websocket *session, cha session->closing = 1; } else { - ast_log(LOG_WARNING, "WebSocket unknown opcode %d\n", *opcode); + ast_log(LOG_WARNING, "WebSocket unknown opcode %u\n", *opcode); /* We received an opcode that we don't understand, the RFC states that 1003 is for a type of data that can't be accepted... opcodes * fit that, I think. */ ast_websocket_close(session, 1003); @@ -799,7 +799,7 @@ static void websocket_echo_callback(struct ast_websocket *session, struct ast_va } else if (opcode == AST_WEBSOCKET_OPCODE_CLOSE) { break; } else { - ast_debug(1, "Ignored WebSocket opcode %d\n", opcode); + ast_debug(1, "Ignored WebSocket opcode %u\n", opcode); } } |