more house keeping.. and one commit tony forgot to commit from my dev box

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

diff --git a/src/mod/applications/mod_enum/mod_enum.c b/src/mod/applications/mod_enum/mod_enum.c
index 6ac8094ea1f6e8a23a9bed8314fe322e09ba4da8..038ed0560078566245e16ac384446895045f66d4 100644 (file)
--- a/src/mod/applications/mod_enum/mod_enum.c
+++ b/src/mod/applications/mod_enum/mod_enum.c
@@ -733,3 +733,14 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_enum_shutdown)
        switch_core_hash_destroy(&globals.routes);
        return SWITCH_STATUS_SUCCESS;
 }
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c b/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c
index d3f391a0b2471c884561ddf0946ba91b7c5352e8..90f4e40068031f850d11a7c0c5e729f659c2ec2a 100644 (file)
--- a/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c
+++ b/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c
@@ -981,3 +981,14 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_openmrcp_shutdown)
        openmrcp_destroy();
        return SWITCH_STATUS_SUCCESS;
 }
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index d42d208cf2e4742c6377239e74027be48ff5222f..928ca2cbde8896d42a0b55cd82859c941d23cb65 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -2891,3 +2891,14 @@ static void set_variable_sip_param(switch_channel_t *channel, char *header_type,
        }
 
 }
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index ac58ca1a516c88f46cac828f9aeeba97c8b05365..8fc9a51eabbfca4b077eee9c2dcf79858d014357 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -2421,3 +2421,14 @@ int sofia_glue_get_user_host(char *in, char **user, char **host)
 
        return 1;
 }
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/mod/endpoints/mod_sofia/sofia_reg.c b/src/mod/endpoints/mod_sofia/sofia_reg.c
index c5c352b5f0aa42c7385fd2abf6e25cf55b662fd0..8f7735cb2448f7254f09351a6caa7ae69be8a7c5 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_reg.c
+++ b/src/mod/endpoints/mod_sofia/sofia_reg.c
@@ -1132,7 +1132,13 @@ switch_status_t sofia_reg_add_gateway(char *key, sofia_gateway_t *gateway)
        return status;
 }
 
-
-
-
-
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c b/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
index 298ef565e37fced63b9dec4093766f31ad047bd0..e205abb4dee99fac7f57632c6dc244f781307f15 100644 (file)
--- a/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
+++ b/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
@@ -2471,7 +2471,6 @@ static switch_status_t config_wanpipe(int reload)
                set_global_dialplan("XML");
        }
 
-
        globals.configured_spans = 0;
        for(current_span = 1; current_span < MAX_SPANS; current_span++) {
                if (SPANS[current_span]) {
@@ -2496,11 +2495,16 @@ static switch_status_t config_wanpipe(int reload)
                }
        }
 
-
-
        return SWITCH_STATUS_SUCCESS;
-
 }
 
-
-
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/mod/languages/mod_python/mod_python.c b/src/mod/languages/mod_python/mod_python.c
index afae73fdeef8f72e15dc0f71c2acce258b98a5fc..df25eaa8950e11ceb040880615217befa9372662 100644 (file)
--- a/src/mod/languages/mod_python/mod_python.c
+++ b/src/mod/languages/mod_python/mod_python.c
@@ -331,7 +331,15 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_python_shutdown)
 
 }
 
-
-
-
 /* Return the number of arguments of the application command line */
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/mod/say/mod_say_de/mod_say_de.c b/src/mod/say/mod_say_de/mod_say_de.c
index 4f1deebebbf924ab41eb57ed85c06a966f666ea0..fa1dfdee1ccf9e938bb80f09e6c7a6a7b63988f5 100644 (file)
--- a/src/mod/say/mod_say_de/mod_say_de.c
+++ b/src/mod/say/mod_say_de/mod_say_de.c
@@ -536,3 +536,14 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_say_de_load)
        /* indicate that the module should continue to be loaded */
        return SWITCH_STATUS_SUCCESS;
 }
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/mod/say/mod_say_en/mod_say_en.c b/src/mod/say/mod_say_en/mod_say_en.c
index 146eb2542cc703207072adda41e24543e4f3d0e2..beb1cc7790d818046faa30345c539a812085880f 100644 (file)
--- a/src/mod/say/mod_say_en/mod_say_en.c
+++ b/src/mod/say/mod_say_en/mod_say_en.c
@@ -536,3 +536,14 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_say_en_load)
        /* indicate that the module should continue to be loaded */
        return SWITCH_STATUS_SUCCESS;
 }
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/mod/say/mod_say_es/mod_say_es.c b/src/mod/say/mod_say_es/mod_say_es.c
index 18d0c3fe4df4e2f68b81eb86b8e1f624090c46f2..3e17a096e88ab108672da983041cf6c435644930 100644 (file)
--- a/src/mod/say/mod_say_es/mod_say_es.c
+++ b/src/mod/say/mod_say_es/mod_say_es.c
@@ -536,3 +536,14 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_say_es_load)
        /* indicate that the module should continue to be loaded */
        return SWITCH_STATUS_SUCCESS;
 }
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/mod/say/mod_say_fr/mod_say_fr.c b/src/mod/say/mod_say_fr/mod_say_fr.c
index 71b389ff705d1f23ea20697a5632c071395e8ca8..9d26a701475f74c85cb8acc635ae973b6d4f9f6e 100644 (file)
--- a/src/mod/say/mod_say_fr/mod_say_fr.c
+++ b/src/mod/say/mod_say_fr/mod_say_fr.c
@@ -536,3 +536,14 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_say_fr_load)
        /* indicate that the module should continue to be loaded */
        return SWITCH_STATUS_SUCCESS;
 }
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/mod/say/mod_say_it/mod_say_it.c b/src/mod/say/mod_say_it/mod_say_it.c
index 4576e9a86395cb66447e839ca0b373b90ab7aaa7..851dc9a0ad70bca38b106293b040c5a38cd84e2a 100644 (file)
--- a/src/mod/say/mod_say_it/mod_say_it.c
+++ b/src/mod/say/mod_say_it/mod_say_it.c
@@ -536,3 +536,14 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_say_it_load)
        /* indicate that the module should continue to be loaded */
        return SWITCH_STATUS_SUCCESS;
 }
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/mod/say/mod_say_nl/mod_say_nl.c b/src/mod/say/mod_say_nl/mod_say_nl.c
index f2350c992226414b21fd79a256aabb826ec2b5e7..30e9ffcd7e853eb6e51382e9fac165d4b362643b 100644 (file)
--- a/src/mod/say/mod_say_nl/mod_say_nl.c
+++ b/src/mod/say/mod_say_nl/mod_say_nl.c
@@ -536,3 +536,14 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_say_nl_load)
        /* indicate that the module should continue to be loaded */
        return SWITCH_STATUS_SUCCESS;
 }
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/switch_core_asr.c b/src/switch_core_asr.c
index 2498091fdeae16acfd410dfafefa59a5aa436b95..21d846565856448c235d1c82ac1009fed37f5776 100644 (file)
--- a/src/switch_core_asr.c
+++ b/src/switch_core_asr.c
@@ -158,3 +158,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_asr_get_results(switch_asr_handle_t
 
        return ah->asr_interface->asr_get_results(ah, xmlstr, flags);
 }
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/switch_core_directory.c b/src/switch_core_directory.c
index 8ee3d75ee97906bc7fc6ec664fb093a1c749db8d..379f579f52919668a404aad77b58f5a7fcc94b32 100644 (file)
--- a/src/switch_core_directory.c
+++ b/src/switch_core_directory.c
@@ -84,3 +84,13 @@ SWITCH_DECLARE(switch_status_t) switch_core_directory_close(switch_directory_han
        return status;
 }
 
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/switch_core_file.c b/src/switch_core_file.c
index 85f3e79c28627cb011c2351bda22dc73c805c9d9..5a2262483ab56a459ddd8651a9609c710d1825c7 100644 (file)
--- a/src/switch_core_file.c
+++ b/src/switch_core_file.c
@@ -299,3 +299,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_close(switch_file_handle_t *fh)
 
        return status;
 }
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/switch_core_hash.c b/src/switch_core_hash.c
index 38aafd7a717717693ea95c84ce90fa4c356fcce3..0898695cedbc96085d922ddf5ae2e144596f1014 100644 (file)
--- a/src/switch_core_hash.c
+++ b/src/switch_core_hash.c
@@ -153,3 +153,14 @@ SWITCH_DECLARE(void) switch_hash_this(switch_hash_index_t *hi, const void **key,
                *val = sqliteHashData((HashElem *) hi);
        }
 }
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/switch_core_io.c b/src/switch_core_io.c
index cc70dbab00483ea81db1079612f2aed777e14fe1..b27f334b3af15988aa7a1fed7859342f06d35ca7 100644 (file)
--- a/src/switch_core_io.c
+++ b/src/switch_core_io.c
@@ -1010,3 +1010,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_send_dtmf_string(switch_core
 
        return sent ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE;
 }
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/switch_core_media_bug.c b/src/switch_core_media_bug.c
index 07307a33146b3defb7d02d46ccb1e36074b4985d..652620cf9f6eefc54052dcc0978d5c7d5c11a18b 100644 (file)
--- a/src/switch_core_media_bug.c
+++ b/src/switch_core_media_bug.c
@@ -348,3 +348,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove(switch_core_session
 
        return status;
 }
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/switch_core_rwlock.c b/src/switch_core_rwlock.c
index 9278bbb0d04ee0ba9fee5c82e80b4effdc722752..3f683d3d21306e82460c7ab6f8deaad4250c7324 100644 (file)
--- a/src/switch_core_rwlock.c
+++ b/src/switch_core_rwlock.c
@@ -84,3 +84,14 @@ SWITCH_DECLARE(void) switch_core_session_rwunlock(switch_core_session_t *session
        switch_thread_rwlock_unlock(session->rwlock);
 
 }
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/switch_core_speech.c b/src/switch_core_speech.c
index 201dfad774980dfbba20921eb1a575d4cda4b7ed..c074d5c0dc534fdb3a9b4bdc2f865f6f9e4baea0 100644 (file)
--- a/src/switch_core_speech.c
+++ b/src/switch_core_speech.c
@@ -34,7 +34,6 @@
 #include <switch.h>
 #include "private/switch_core_pvt.h"
 
-
 SWITCH_DECLARE(switch_status_t) switch_core_speech_open(switch_speech_handle_t *sh,
                                                                                                                const char *module_name,
                                                                                                                const char *voice_name, 
@@ -151,3 +150,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_speech_close(switch_speech_handle_t
 
        return status;
 }
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/switch_core_timer.c b/src/switch_core_timer.c
index 8bfaff00c8a1d6c4ea796cb28eb60161c8d14699..c226ac86941eb9d245287ba532e175f91852a1d9 100644 (file)
--- a/src/switch_core_timer.c
+++ b/src/switch_core_timer.c
@@ -114,3 +114,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_timer_destroy(switch_timer_t *timer)
 
        return SWITCH_STATUS_SUCCESS;
 }
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/switch_ivr_bridge.c b/src/switch_ivr_bridge.c
index 88abe4be24f7553772f868079c85a6c00a0a3378..a0a4f58651d32fd2e858431e9977a705a203f74c 100644 (file)
--- a/src/switch_ivr_bridge.c
+++ b/src/switch_ivr_bridge.c
@@ -882,3 +882,14 @@ SWITCH_DECLARE(void) switch_ivr_intercept_session(switch_core_session_t *session
 
        switch_ivr_uuid_bridge(switch_core_session_get_uuid(session), uuid);
 }
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/switch_ivr_menu.c b/src/switch_ivr_menu.c
index 060971cd9411e1ae88ce425fe91df489af5cce5e..086642dc5cd147b843a0f15ece63e10d5adcd8b1 100644 (file)
--- a/src/switch_ivr_menu.c
+++ b/src/switch_ivr_menu.c
@@ -676,3 +676,14 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_xml_build(switch_ivr_menu_
 
        return status;
 }
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
index 3e735fb673cde3b5db0b9ce725daddff5cf6b30f..567f12492ceb63dfa901287059351e94d3657f24 100644 (file)
--- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c
@@ -1280,3 +1280,14 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
 
        return status;
 }
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */

diff --git a/src/switch_ivr_play_say.c b/src/switch_ivr_play_say.c
index 282591410b3fd33b3c6a943b43c13c9745283d5b..658470b3a796a584a9b8c2dbadce2ecedad0d74e 100644 (file)
--- a/src/switch_ivr_play_say.c
+++ b/src/switch_ivr_play_say.c
@@ -688,7 +688,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
        int stream_id = 0;
        switch_status_t status = SWITCH_STATUS_SUCCESS;
        switch_file_handle_t lfh;
-       switch_codec_t *read_codec = switch_core_session_get_read_codec(session);
+       switch_codec_t *read_codec = NULL;
        const char *p;
        char *title = "", *copyright = "", *software = "", *artist = "", *comment = "", *date = "";
        uint8_t asis = 0;
@@ -707,8 +707,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
        prefix = switch_channel_get_variable(channel, "sound_prefix");
        timer_name = switch_channel_get_variable(channel, "timer_name");
 
+       read_codec = switch_core_session_get_read_codec(session);
 
-       if (switch_strlen_zero(file)) {
+       if (switch_strlen_zero(file) || !read_codec) {
                status = SWITCH_STATUS_FALSE;
                goto end;
        }
@@ -1662,3 +1663,14 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text(switch_core_session_t *ses
        switch_core_session_reset(session, SWITCH_TRUE);
        return status;
 }
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */