From 0dbc6515d26c00862feeab4a3a64cdbe50f70ae7 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Wed, 28 Nov 2007 22:27:33 +0000 Subject: [PATCH] fix windows build git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6421 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/include/switch_console.h | 5 +++-- src/include/switch_utils.h | 2 +- src/mod/applications/mod_voicemail/mod_voicemail.c | 4 +++- src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c | 4 ++-- src/switch_console.c | 4 ++-- src/switch_utils.c | 6 +++--- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/include/switch_console.h b/src/include/switch_console.h index 7725a12050..2a7e54dbb7 100644 --- a/src/include/switch_console.h +++ b/src/include/switch_console.h @@ -64,12 +64,13 @@ SWITCH_DECLARE(void) switch_console_loop(void); SWITCH_DECLARE(void) switch_console_printf(switch_text_channel_t channel, const char *file, const char *func, int line, const char *fmt, ...) PRINTF_FUNCTION(5, 6); -SWITCH_DECLARE(switch_status_t) switch_console_stream_raw_write(switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen); +SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_raw_write(switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen); /*! \brief A method akin to printf for dealing with api streams */ -SWITCH_DECLARE(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, const char *fmt, ...) PRINTF_FUNCTION(2, 3); +SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, const char *fmt, ...) PRINTF_FUNCTION(2, 3); + SWITCH_END_EXTERN_C #endif /* For Emacs: diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h index 528aff9e35..cdea67b889 100644 --- a/src/include/switch_utils.h +++ b/src/include/switch_utils.h @@ -70,7 +70,7 @@ static inline switch_bool_t switch_is_digit_string(const char *s) { return SWITCH_TRUE; } -switch_size_t switch_fd_read_line(int fd, char *buf, switch_size_t len); +SWITCH_DECLARE(switch_size_t) switch_fd_read_line(int fd, char *buf, switch_size_t len); /*! \brief Evaluate the truthfullness of a string expression diff --git a/src/mod/applications/mod_voicemail/mod_voicemail.c b/src/mod/applications/mod_voicemail/mod_voicemail.c index eb3ed2bdb3..2d492952bf 100644 --- a/src/mod/applications/mod_voicemail/mod_voicemail.c +++ b/src/mod/applications/mod_voicemail/mod_voicemail.c @@ -2494,7 +2494,9 @@ SWITCH_STANDARD_API(voicemail_api_function) for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); profile = (vm_profile_t *) val; - break; + if (profile) { + break; + } } } diff --git a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c index 9eea40771f..5c54bcc3b6 100644 --- a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c +++ b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c @@ -552,9 +552,9 @@ abyss_bool handler_hook(TSession * r) for (i=0;iresponse_headers.size;i++) { ti=&r->response_headers.item[i]; - ConnWrite(r->conn,ti->name,strlen(ti->name)); + ConnWrite(r->conn, ti->name, (uint32_t)strlen(ti->name)); ConnWrite(r->conn,": ",2); - ConnWrite(r->conn,ti->value,strlen(ti->value)); + ConnWrite(r->conn, ti->value, (uint32_t)strlen(ti->value)); ConnWrite(r->conn,CRLF,2); } diff --git a/src/switch_console.c b/src/switch_console.c index c03b5bc8c7..a2f4ac8e57 100644 --- a/src/switch_console.c +++ b/src/switch_console.c @@ -34,7 +34,7 @@ #include #define CMD_BUFLEN 1024; -SWITCH_DECLARE(switch_status_t) switch_console_stream_raw_write(switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen) +SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_raw_write(switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen) { FILE *out = switch_core_get_console(); @@ -46,7 +46,7 @@ SWITCH_DECLARE(switch_status_t) switch_console_stream_raw_write(switch_stream_ha return SWITCH_STATUS_FALSE; } -SWITCH_DECLARE(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, const char *fmt, ...) +SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, const char *fmt, ...) { va_list ap; char *buf = handle->data; diff --git a/src/switch_utils.c b/src/switch_utils.c index 9df0dcc15b..69bf362e67 100644 --- a/src/switch_utils.c +++ b/src/switch_utils.c @@ -36,7 +36,7 @@ #include "private/switch_core_pvt.h" -switch_size_t switch_fd_read_line(int fd, char *buf, switch_size_t len) +SWITCH_DECLARE(switch_size_t) switch_fd_read_line(int fd, char *buf, switch_size_t len) { char c, *p; int cur; @@ -104,7 +104,7 @@ SWITCH_DECLARE(switch_status_t) switch_b64_decode(char *in, char *out, switch_si } for (i=0; i<64; i++) { - l64[(int)switch_b64_table[i]] = i; + l64[(int)switch_b64_table[i]] = (char)i; } for (ip = in; ip && *ip; ip++) { @@ -117,7 +117,7 @@ SWITCH_DECLARE(switch_status_t) switch_b64_decode(char *in, char *out, switch_si l += 6; while (l >= 8) { - op[ol++] = (b >> (l -= 8)) % 256; + op[ol++] = (char)((b >> (l -= 8)) % 256); if (ol >= olen -2) { goto end; }