small fixes

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5221 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/include/switch.h b/src/include/switch.h
index 611d4bd669f967ba3686fcf60a728f24eeceb6bd..08432552f8cd1651ca6dd1b2d721ebe17930a3ee 100644 (file)
--- a/src/include/switch.h
+++ b/src/include/switch.h
@@ -52,8 +52,10 @@
 #define FREESWITCH_ITAD "543"
 #define __EXTENSIONS__ 1
 #ifndef MACOSX
+#ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 600
 #endif
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>

diff --git a/src/switch_buffer.c b/src/switch_buffer.c
index 5e5889bb7488df63b6c6a944b8da8b8c8b3035ca..e928a0489d13a29e71546358cdfedb60af042c68 100644 (file)
--- a/src/switch_buffer.c
+++ b/src/switch_buffer.c
@@ -260,6 +260,7 @@ SWITCH_DECLARE(void) switch_buffer_zero(switch_buffer_t *buffer)
        assert(buffer->data != NULL);
 
        buffer->used = 0;
+       buffer->actually_used = 0;
        buffer->head = buffer->data;
 }
 

diff --git a/src/switch_ivr_play_say.c b/src/switch_ivr_play_say.c
index 683718bfdaba1917d8b5ac93d95c6f873c990d3e..339e7fa592827e9078ead237120b99ab8982a1ab 100644 (file)
--- a/src/switch_ivr_play_say.c
+++ b/src/switch_ivr_play_say.c
@@ -830,7 +830,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
                        status = SWITCH_STATUS_SUCCESS;
                        continue;
                } else if (status != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Bad Write\n");
                        done = 1;
                        break;
                }
@@ -851,6 +850,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
                                switch_yield(10000);
                        }
                        status = switch_core_session_read_frame(session, &read_frame, -1, 0);
+
                        if (!SWITCH_READ_ACCEPTABLE(status)) {
                                break;
                        }
@@ -1042,7 +1042,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text_handle(switch_core_session
                        write_frame.timestamp = timer->samplecount;
                }
                if (switch_core_session_write_frame(session, &write_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Bad Write\n");
                        done = 1;
                        break;
                }
@@ -1124,7 +1123,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text_handle(switch_core_session
                                        write_frame.timestamp = timer->samplecount;
                                }
                                if (switch_core_session_write_frame(session, &write_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Bad Write\n");
                                        done = 1;
                                        break;
                                }
@@ -1145,7 +1143,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text_handle(switch_core_session
                        write_frame.timestamp = timer->samplecount;
                }
                if (switch_core_session_write_frame(session, &write_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Bad Write\n");
                        done = 1;
                        break;
                }