]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
code formating cleanup, More when I land at PHX
authorBrian West <brian@freeswitch.org>
Sun, 27 Jan 2008 17:36:53 +0000 (17:36 +0000)
committerBrian West <brian@freeswitch.org>
Sun, 27 Jan 2008 17:36:53 +0000 (17:36 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7392 d0543943-73ff-0310-b7d9-9358b9ac24b2

31 files changed:
src/switch_apr.c
src/switch_buffer.c
src/switch_caller.c
src/switch_channel.c
src/switch_config.c
src/switch_console.c
src/switch_core.c
src/switch_core_asr.c
src/switch_core_codec.c
src/switch_core_db.c
src/switch_core_directory.c
src/switch_core_event_hook.c
src/switch_core_file.c
src/switch_core_hash.c
src/switch_core_io.c
src/switch_core_media_bug.c
src/switch_core_memory.c
src/switch_core_port_allocator.c
src/switch_core_rwlock.c
src/switch_core_session.c
src/switch_core_speech.c
src/switch_core_sqldb.c
src/switch_core_state_machine.c
src/switch_core_timer.c
src/switch_cpp.cpp
src/switch_event.c
src/switch_ivr.c
src/switch_ivr_async.c
src/switch_ivr_bridge.c
src/switch_ivr_menu.c
src/switch_ivr_originate.c

index 208f8a8a525f1c6d05f67b3f5cf2b9b2fdf72a10..39bca828f0bfd40badf7f30fda8a8a2bf8dbded2 100644 (file)
@@ -97,7 +97,6 @@ SWITCH_DECLARE(void) switch_hash_this(switch_hash_index_t * hi, const void **key
        apr_hash_this(hi, key, klen, val);
 }
 
-
 SWITCH_DECLARE(switch_memory_pool_t *) switch_hash_pool_get(switch_hash_t * ht)
 {
        return apr_hash_pool_get(ht);
@@ -109,7 +108,6 @@ SWITCH_DECLARE(unsigned int) switch_hashfunc_default(const char *key, switch_ssi
        return apr_hashfunc_default(key, klen);
 }
 
-
 /* DSO functions */
 
 SWITCH_DECLARE(switch_status_t) switch_dso_load(switch_dso_handle_t ** res_handle, const char *path, switch_memory_pool_t *ctx)
@@ -132,7 +130,6 @@ SWITCH_DECLARE(const char *) switch_dso_error(switch_dso_handle_t * dso, char *b
        return apr_dso_error(dso, buf, bufsize);
 }
 
-
 /* string functions */
 
 SWITCH_DECLARE(switch_status_t) switch_strftime(char *s, switch_size_t *retsize, switch_size_t max, const char *format, switch_time_exp_t * tm)
@@ -273,7 +270,6 @@ SWITCH_DECLARE(switch_time_t) switch_time_make(switch_time_t sec, int32_t usec)
        return ((switch_time_t) (sec) * APR_USEC_PER_SEC + (switch_time_t) (usec));
 }
 
-
 /* Thread condition locks */
 
 SWITCH_DECLARE(switch_status_t) switch_thread_cond_create(switch_thread_cond_t ** cond, switch_memory_pool_t *pool)
@@ -438,7 +434,6 @@ SWITCH_DECLARE(switch_status_t) switch_file_exists(const char *filename, switch_
 
 /* #define SWITCH_FPROT_OS_DEFAULT  0x0FFF /\**< use OS's default permissions *\/ */
 
-
 /**
  * Create a new directory on the file system.
  * @param path the path for the directory to be created. (use / on all systems)
@@ -465,7 +460,6 @@ SWITCH_DECLARE(switch_status_t) switch_dir_make_recursive(const char *path,
        return apr_dir_make_recursive(path, perm, pool);
 }
 
-
 struct switch_dir {
        apr_dir_t *dir_handle;
        apr_finfo_t finfo;
@@ -531,10 +525,8 @@ SWITCH_DECLARE(const char *) switch_dir_next_file(switch_dir_t *thedir, char *bu
        return fname;
 }
 
-
 /* thread stubs */
 
-
 SWITCH_DECLARE(switch_status_t) switch_threadattr_create(switch_threadattr_t ** new_attr, switch_memory_pool_t *pool)
 {
        return apr_threadattr_create(new_attr, pool);
@@ -593,7 +585,6 @@ SWITCH_DECLARE(switch_status_t) switch_socket_connect(switch_socket_t * sock, sw
        return apr_socket_connect(sock, sa);
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_socket_send(switch_socket_t * sock, const char *buf, switch_size_t *len)
 {
        switch_status_t status = SWITCH_STATUS_SUCCESS;
@@ -742,15 +733,10 @@ SWITCH_DECLARE(switch_status_t) switch_socket_create_pollfd(switch_pollfd_t ** p
        return SWITCH_STATUS_SUCCESS;
 }
 
-
-
-
-
 /* apr-util stubs */
 
 /* UUID Handling (apr-util) */
 
-
 SWITCH_DECLARE(void) switch_uuid_format(char *buffer, const switch_uuid_t * uuid)
 {
        apr_uuid_format(buffer, (const apr_uuid_t *) uuid);
@@ -766,7 +752,6 @@ SWITCH_DECLARE(switch_status_t) switch_uuid_parse(switch_uuid_t * uuid, const ch
        return apr_uuid_parse((apr_uuid_t *) uuid, uuid_str);
 }
 
-
 /* FIFO queues (apr-util) */
 
 SWITCH_DECLARE(switch_status_t) switch_queue_create(switch_queue_t ** queue, unsigned int queue_capacity, switch_memory_pool_t *pool)
@@ -852,7 +837,6 @@ SWITCH_DECLARE(switch_status_t) switch_match_glob(const char *pattern, switch_ar
 {
        return apr_match_glob(pattern, (apr_array_header_t **)result, p);
 }
-
                                                                                                        
 /* For Emacs:
  * Local Variables:
index de162e652d47a6727c4784618fec341571885f59..d3a0ee9909f581980c459ce1c5716146664a3c8a 100644 (file)
@@ -29,6 +29,7 @@
  * switch_buffer.c -- Data Buffering Code
  *
  */
+
 #include <switch.h>
 #include <switch_buffer.h>
 
@@ -132,7 +133,6 @@ SWITCH_DECLARE(switch_size_t) switch_buffer_len(switch_buffer_t *buffer)
 
 }
 
-
 SWITCH_DECLARE(switch_size_t) switch_buffer_freespace(switch_buffer_t *buffer)
 {
        switch_assert(buffer != NULL);
index cbe44d9f4ddf8995ebf4699e2aaec70abcccc61d..d319bcfb09660fd497dcff62981c79971c38f066 100644 (file)
  * switch_caller.c -- Caller Identification
  *
  */
+
 #include <switch.h>
 #include <switch_caller.h>
 
-
 #define profile_dup(a,b,p) if (!switch_strlen_zero(a)) { b = switch_core_strdup(p, a); } else { b = SWITCH_BLANK_STRING; }
 #define profile_dup_clean(a,b,p) if (!switch_strlen_zero(a)) { b = switch_clean_string(switch_core_strdup(p, a)); } else { b = SWITCH_BLANK_STRING; }
 
@@ -49,8 +49,6 @@ SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_new(switch_memor
                                                                                                                                        const char *context,
                                                                                                                                        const char *destination_number)
 {
-
-
        switch_caller_profile_t *profile = NULL;
 
        profile = switch_core_alloc(pool, sizeof(*profile));
@@ -79,7 +77,6 @@ SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_new(switch_memor
        return profile;
 }
 
-
 SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_dup(switch_memory_pool_t *pool, switch_caller_profile_t *tocopy)
 {
        switch_caller_profile_t *profile = NULL;
@@ -115,7 +112,6 @@ SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_dup(switch_memor
        return profile;
 }
 
-
 SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_clone(switch_core_session_t *session, switch_caller_profile_t *tocopy)
 {
        switch_memory_pool_t *pool;
@@ -125,7 +121,6 @@ SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_clone(switch_cor
        return switch_caller_profile_dup(pool, tocopy);
 }
 
-
 SWITCH_DECLARE(const char *) switch_caller_get_field_by_name(switch_caller_profile_t *caller_profile, const char *name)
 {
        if (!strcasecmp(name, "dialplan")) {
@@ -198,7 +193,6 @@ SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_
 {
        char header_name[1024];
 
-
        if (!switch_strlen_zero(caller_profile->username)) {
                switch_snprintf(header_name, sizeof(header_name), "%s-Username", prefix);
                switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->username);
@@ -270,9 +264,6 @@ SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_
 
        switch_snprintf(header_name, sizeof(header_name), "%s-Privacy-Hide-Number", prefix);
        switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER) ? "yes" : "no");
-
-       
-
 }
 
 SWITCH_DECLARE(switch_caller_extension_t *) switch_caller_extension_new(switch_core_session_t *session, const char *extension_name, const char *extension_number)
@@ -288,7 +279,6 @@ SWITCH_DECLARE(switch_caller_extension_t *) switch_caller_extension_new(switch_c
        return caller_extension;
 }
 
-
 SWITCH_DECLARE(void) switch_caller_extension_add_application(switch_core_session_t *session,
                                                                                                                         switch_caller_extension_t *caller_extension, const char *application_name, const char *application_data)
 {
index bf169a935bb87184e88f81c86c4d3784ea488802..1e9a7abb7e683c9df3ef7c731ec11f200ffda535 100644 (file)
@@ -30,6 +30,7 @@
  * switch_channel.c -- Media Channel Interface
  *
  */
+
 #include <switch.h>
 #include <switch_channel.h>
 
@@ -123,7 +124,6 @@ struct switch_channel {
        int event_count;
 };
 
-
 SWITCH_DECLARE(const char *) switch_channel_cause2str(switch_call_cause_t cause)
 {
        uint8_t x;
@@ -238,7 +238,6 @@ SWITCH_DECLARE(switch_status_t) switch_channel_queue_dtmf(switch_channel_t *chan
                }
        }
        
-
        status = SWITCH_STATUS_SUCCESS;
 
  done:
@@ -248,7 +247,6 @@ SWITCH_DECLARE(switch_status_t) switch_channel_queue_dtmf(switch_channel_t *chan
        return status;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_channel_queue_dtmf_string(switch_channel_t *channel, const char *dtmf_string)
 {
        char *p;
@@ -321,7 +319,6 @@ SWITCH_DECLARE(switch_status_t) switch_channel_dequeue_dtmf(switch_channel_t *ch
        }
 
        return status;
-
 }
 
 SWITCH_DECLARE(switch_size_t) switch_channel_dequeue_dtmf_string(switch_channel_t *channel, char *dtmf_str, switch_size_t len)
@@ -398,10 +395,8 @@ SWITCH_DECLARE(void) switch_channel_presence(switch_channel_t *channel, const ch
                switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", channel->event_count++);
                switch_event_fire(&event);
        }
-
 }
 
-
 SWITCH_DECLARE(const char *) switch_channel_get_variable(switch_channel_t *channel, const char *varname)
 {
        const char *v = NULL;
@@ -454,7 +449,6 @@ SWITCH_DECLARE(switch_event_header_t *) switch_channel_variable_first(switch_cha
        }
 
        return hi;
-
 }
 
 SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *channel, const char *key, const void *private_info)
@@ -485,7 +479,6 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_name(switch_channel_t *channe
        return SWITCH_STATUS_SUCCESS;
 }
 
-
 SWITCH_DECLARE(char *) switch_channel_get_name(switch_channel_t *channel)
 {
        switch_assert(channel != NULL);
@@ -758,7 +751,6 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_running_state(
                }
        }
 
-
        switch_mutex_unlock(channel->flag_mutex);
 
        return SWITCH_STATUS_SUCCESS;
@@ -770,7 +762,6 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_c
        switch_channel_state_t last_state;
        int ok = 0;
 
-
        switch_assert(channel != NULL);
        switch_assert(state <= CS_DONE);
        switch_mutex_lock(channel->flag_mutex);
@@ -950,7 +941,6 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_c
 
        }
 
-
        if (ok) {
                switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG, "%s State Change %s -> %s\n",
                                                  channel->name, state_names[last_state], state_names[state]);
@@ -965,7 +955,6 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_c
                if (state < CS_DONE) {
                        switch_core_session_signal_state_change(channel->session);
                }
-
        } else {
                switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_WARNING,
                                                  "%s Invalid State Change %s -> %s\n", channel->name, state_names[last_state], state_names[state]);
@@ -1025,7 +1014,6 @@ SWITCH_DECLARE(void) switch_channel_event_set_data(switch_channel_t *channel, sw
        if (caller_profile) {
                switch_caller_profile_event_set_data(caller_profile, "Caller", event);
        }
-
        
        if (originator_caller_profile && originatee_caller_profile) {
                /* Index Originator's Profile */
@@ -1058,7 +1046,6 @@ SWITCH_DECLARE(void) switch_channel_event_set_data(switch_channel_t *channel, sw
        }
 
        switch_mutex_unlock(channel->profile_mutex);
-
 }
 
 SWITCH_DECLARE(void) switch_channel_set_caller_profile(switch_channel_t *channel, switch_caller_profile_t *caller_profile)
@@ -1144,8 +1131,7 @@ SWITCH_DECLARE(void) switch_channel_set_originatee_caller_profile(switch_channel
                channel->caller_profile->originatee_caller_profile = caller_profile;
        }
        switch_assert(channel->caller_profile->originatee_caller_profile->next != channel->caller_profile->originatee_caller_profile);
-       switch_mutex_unlock(channel->profile_mutex);
-               
+       switch_mutex_unlock(channel->profile_mutex);            
 }
 
 SWITCH_DECLARE(switch_caller_profile_t *) switch_channel_get_originator_caller_profile(switch_channel_t *channel)
@@ -1255,7 +1241,6 @@ SWITCH_DECLARE(void) switch_channel_clear_state_handler(switch_channel_t *channe
        }
 
        switch_mutex_unlock(channel->flag_mutex);
-
 }
 
 SWITCH_DECLARE(void) switch_channel_set_caller_extension(switch_channel_t *channel, switch_caller_extension_t *caller_extension)
@@ -1324,7 +1309,6 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_hangup(switch_chan
        return channel->state;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_ring_ready(switch_channel_t *channel, const char *file, const char *func, int line)
 {
        if (!switch_channel_test_flag(channel, CF_RING_READY)) {
@@ -1336,8 +1320,6 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_ring_ready(switch_ch
        return SWITCH_STATUS_FALSE;
 }
 
-
-
 SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_pre_answered(switch_channel_t *channel, const char *file, const char *func, int line)
 {
        switch_event_t *event;
@@ -1957,8 +1939,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_timestamps(switch_channel_t *
                        legbillusec = caller_profile->times->hungup - caller_profile->times->profile_created;
                }
        }
-       
-       
+
        switch_channel_set_variable(channel, "last_app", last_app);
        switch_channel_set_variable(channel, "last_arg", last_arg);
        switch_channel_set_variable(channel, "caller_id", cid_buf);
index cb9db9de456043a3d391a795384936d656ef63c2..868a50b422e9768a8ee45a9e14960288d522d12a 100644 (file)
@@ -29,6 +29,7 @@
  * switch_config.c -- Configuration File Parser
  *
  */
+
 #include <switch.h>
 #include <switch_config.h>
 
@@ -87,7 +88,6 @@ SWITCH_DECLARE(int) switch_config_open_file(switch_config_t * cfg, char *file_pa
        }
 }
 
-
 SWITCH_DECLARE(void) switch_config_close_file(switch_config_t * cfg)
 {
 
@@ -98,8 +98,6 @@ SWITCH_DECLARE(void) switch_config_close_file(switch_config_t * cfg)
        memset(cfg, 0, sizeof(*cfg));
 }
 
-
-
 SWITCH_DECLARE(int) switch_config_next_pair(switch_config_t * cfg, char **var, char **val)
 {
        int ret = 0;
@@ -143,8 +141,6 @@ SWITCH_DECLARE(int) switch_config_next_pair(switch_config_t * cfg, char **var, c
                        continue;
                }
 
-
-
                if (**var == '#' || **var == ';' || **var == '\n' || **var == '\r') {
                        continue;
                }
@@ -153,7 +149,6 @@ SWITCH_DECLARE(int) switch_config_next_pair(switch_config_t * cfg, char **var, c
                        break;
                }
 
-
                if ((end = strchr(*var, '#')) != 0 || (end = strchr(*var, ';')) != 0) {
                        *end = '\0';
                        end--;
@@ -171,7 +166,6 @@ SWITCH_DECLARE(int) switch_config_next_pair(switch_config_t * cfg, char **var, c
                }
                *var = p;
 
-
                if ((*val = strchr(*var, '=')) == 0) {
                        ret = -1;
                        /* log_printf(0, server.log, "Invalid syntax on %s: line %d\n", cfg->path, cfg->lineno); */
@@ -201,9 +195,7 @@ SWITCH_DECLARE(int) switch_config_next_pair(switch_config_t * cfg, char **var, c
                }
        }
 
-
        return ret;
-
 }
 
 /* For Emacs:
index b48dc4c78c440328fec26bd1c0be9b844fead1b4..bb416434d14bdb013d14d2a7992c0b07881069ab 100644 (file)
@@ -29,6 +29,7 @@
  * switch_console.c -- Simple Console
  *
  */
+
 #include <switch.h>
 #include <switch_console.h>
 #include <switch_version.h>
@@ -70,7 +71,6 @@ SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_write(switch_stream
                switch_size_t remaining = handle->data_size - handle->data_len;
                switch_size_t need = strlen(data) + 1;
 
-
                if ((remaining < need) && handle->alloc_len) {
                        switch_size_t new_len;
                        void *new_data;
@@ -104,7 +104,6 @@ SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_write(switch_stream
        return ret ? SWITCH_STATUS_FALSE : SWITCH_STATUS_SUCCESS;
 }
 
-
 static int switch_console_process(char *cmd)
 {
        char *arg = NULL;
@@ -186,7 +185,6 @@ SWITCH_DECLARE(void) switch_console_printf(switch_text_channel_t channel, const
                switch_event_fire(&event);
        }
 
-
 done:
        if (data) {
                free(data);
@@ -208,7 +206,6 @@ char * prompt(EditLine *e) {
        }       
 
        return prompt_str;
-       
 }
 
 static EditLine *el;
@@ -283,7 +280,6 @@ SWITCH_DECLARE(void) switch_console_loop(void)
        el_set(el, EL_HIST, history, myhistory);
        history(myhistory, &ev, H_LOAD, hfile);
 
-
        switch_threadattr_create(&thd_attr, pool);
        switch_threadattr_detach_set(thd_attr, 1);
        switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
@@ -304,8 +300,6 @@ SWITCH_DECLARE(void) switch_console_loop(void)
        /* Clean up our memory */
        history_end(myhistory);
        el_end(el);
-
-
 }
 
 #else
@@ -355,8 +349,6 @@ SWITCH_DECLARE(void) switch_console_loop(void)
                        continue;
                }
 #endif
-
-
                memset(&cmd, 0, sizeof(cmd));
                for (x = 0; x < (sizeof(cmd) - 1); x++) {
                        int c = getchar();
@@ -378,8 +370,6 @@ SWITCH_DECLARE(void) switch_console_loop(void)
                        running = switch_console_process(cmd);
                }
        }
-
-
 }
 #endif
 
index d76c8b79a1bf59f8031a8d6ed421702aecf9cfeb..a043d2805a504565a3d4d411712fbde455d92904 100644 (file)
@@ -138,7 +138,6 @@ SWITCH_DECLARE(const switch_state_handler_table_t *) switch_core_get_state_handl
        return runtime.state_handlers[index];
 }
 
-
 SWITCH_DECLARE(char *) switch_core_get_variable(const char *varname)
 {
        char *val;
@@ -225,7 +224,6 @@ SWITCH_DECLARE(void) switch_core_service_session(switch_core_session_t *session,
        switch_core_session_launch_thread(session, switch_core_service_thread, thread_session);
 }
 
-
 /* This function abstracts the thread creation for modules by allowing you to pass a function ptr and
    a void object and trust that that the function will be run in a thread with arg  This lets
    you request and activate a thread without giving up any knowledge about what is in the thread
@@ -267,7 +265,6 @@ SWITCH_DECLARE(void) switch_core_launch_thread(switch_thread_start_t func, void
                switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
                switch_thread_create(&thread, thd_attr, func, ts, pool);
        }
-
 }
 
 SWITCH_DECLARE(void) switch_core_set_globals(void)
@@ -366,7 +363,6 @@ SWITCH_DECLARE(void) switch_core_set_globals(void)
 #endif
 #endif
        }
-
        
        dir_path = switch_mprintf("%s%ssounds", SWITCH_GLOBAL_dirs.base_dir, SWITCH_PATH_SEPARATOR);
        switch_dir_make_recursive(dir_path,
@@ -374,7 +370,6 @@ SWITCH_DECLARE(void) switch_core_set_globals(void)
                                                          runtime.memory_pool);
        switch_safe_free(dir_path);
 
-       
        switch_dir_make_recursive(SWITCH_GLOBAL_dirs.base_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
        switch_dir_make_recursive(SWITCH_GLOBAL_dirs.mod_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
        switch_dir_make_recursive(SWITCH_GLOBAL_dirs.conf_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
@@ -384,12 +379,8 @@ SWITCH_DECLARE(void) switch_core_set_globals(void)
        switch_dir_make_recursive(SWITCH_GLOBAL_dirs.htdocs_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
        switch_dir_make_recursive(SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
        switch_dir_make_recursive(SWITCH_GLOBAL_dirs.temp_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
-       
-
-
 }
 
-
 SWITCH_DECLARE(int32_t) set_high_priority(void)
 {
 #ifdef WIN32
@@ -654,10 +645,8 @@ static void load_mime_types(void)
                close(fd);
                fd = -1;
        }
-
 }      
 
-
 SWITCH_DECLARE(void) switch_core_setrlimits(void)
 {
 #ifdef HAVE_SETRLIMIT
@@ -694,7 +683,6 @@ SWITCH_DECLARE(void) switch_core_setrlimits(void)
        return;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switch_bool_t console, const char **err)
 {
        switch_xml_t xml = NULL, cfg = NULL;
@@ -734,8 +722,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
        switch_find_local_ip(guess_ip, sizeof(guess_ip), AF_INET6);
        switch_core_set_variable("local_ip_v6", guess_ip);
        switch_core_set_variable("base_dir", SWITCH_GLOBAL_dirs.base_dir);
-       
-
 
        if (switch_xml_init(runtime.memory_pool, err) != SWITCH_STATUS_SUCCESS) {
                apr_terminate();
@@ -774,7 +760,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
                                        rlp.rlim_max = RLIM_INFINITY;
                                        setrlimit(RLIMIT_CORE, &rlp);
 #endif
-
                                } else if (!strcasecmp(var, "mailer-app")) {
                                        runtime.mailer_app = switch_core_strdup(runtime.memory_pool, val);
                                } else if (!strcasecmp(var, "mailer-app-args")) {
@@ -830,7 +815,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
 
        switch_scheduler_add_task(switch_timestamp(NULL), heartbeat_callback, "heartbeat", "core", 0, NULL, SSHF_NONE | SSHF_NO_DEL);
 
-
        switch_uuid_get(&uuid);
        switch_uuid_format(runtime.uuid_str, &uuid);
 
@@ -1026,7 +1010,6 @@ SWITCH_DECLARE(int32_t) switch_core_session_ctl(switch_session_ctl_t cmd, int32_
        return 0;
 }
 
-
 SWITCH_DECLARE(switch_core_flag_t) switch_core_flags(void)
 {
        return runtime.flags;
@@ -1037,7 +1020,6 @@ SWITCH_DECLARE(switch_bool_t) switch_core_ready(void)
        return (switch_test_flag((&runtime), SCF_SHUTTING_DOWN) || switch_test_flag((&runtime), SCF_NO_NEW_SESSIONS)) ? SWITCH_FALSE : SWITCH_TRUE;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_core_destroy(void)
 {
        switch_event_t *event;
@@ -1049,7 +1031,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_destroy(void)
        switch_set_flag((&runtime), SCF_NO_NEW_SESSIONS);
        switch_set_flag((&runtime), SCF_SHUTTING_DOWN);
 
-
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "End existing sessions\n");
        switch_core_session_hupall(SWITCH_CAUSE_SYSTEM_SHUTDOWN);
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Clean up modules.\n");
@@ -1084,7 +1065,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_destroy(void)
        switch_safe_free(SWITCH_GLOBAL_dirs.grammar_dir);
        switch_safe_free(SWITCH_GLOBAL_dirs.temp_dir);
 
-
        switch_core_hash_destroy(&runtime.global_vars);
        switch_core_hash_destroy(&runtime.mime_types);
 
index 21d846565856448c235d1c82ac1009fed37f5776..3fd88f1463799311b61a7befbc4521485f3f4750 100644 (file)
@@ -31,6 +31,7 @@
  * switch_core_asr.c -- Main Core Library (Speech Detection Interface)
  *
  */
+
 #include <switch.h>
 #include "private/switch_core_pvt.h"
 
index f9ca0d25822bf90eb1f4e0c9fc9fef77771f66ee..f99a00c4aadcbc511db1a82f82cc3f0e67db3e2b 100644 (file)
@@ -31,6 +31,7 @@
  * switch_core_codec.c -- Main Core Library (codec functions)
  *
  */
+
 #include <switch.h>
 #include "private/switch_core_pvt.h"
 
@@ -80,7 +81,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_write_codec(switch_core_
        switch_assert(session != NULL);
        channel = switch_core_session_get_channel(session);
 
-
        if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) {
                switch_channel_event_set_data(session->channel, event);
                switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-write-codec-name", "%s", codec->implementation->iananame);
@@ -117,7 +117,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_codec_init(switch_codec_t *codec, ch
 
        memset(codec, 0, sizeof(*codec));
 
-
        if (channels == 2) {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Stereo is currently unsupported. please downsample audio source to mono.\n");
                return SWITCH_STATUS_GENERR;
@@ -189,7 +188,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_codec_init(switch_codec_t *codec, ch
        }
 
        return SWITCH_STATUS_NOTIMPL;
-
 }
 
 SWITCH_DECLARE(switch_status_t) switch_core_codec_encode(switch_codec_t *codec,
@@ -213,10 +211,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_codec_encode(switch_codec_t *codec,
                return SWITCH_STATUS_GENERR;
        }
 
-
        return codec->implementation->encode(codec, other_codec, decoded_data, decoded_data_len, decoded_rate, encoded_data, encoded_data_len, encoded_rate,
                                                                                 flag);
-
 }
 
 SWITCH_DECLARE(switch_status_t) switch_core_codec_decode(switch_codec_t *codec,
@@ -226,13 +222,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_codec_decode(switch_codec_t *codec,
                                                                                                                 uint32_t encoded_rate,
                                                                                                                 void *decoded_data, uint32_t * decoded_data_len, uint32_t * decoded_rate, unsigned int *flag)
 {
-
        switch_assert(codec != NULL);
        switch_assert(encoded_data != NULL);
        switch_assert(decoded_data != NULL);
 
-
-
        if (!codec->implementation) {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec is not initialized!\n");
                return SWITCH_STATUS_GENERR;
@@ -243,10 +236,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_codec_decode(switch_codec_t *codec,
                return SWITCH_STATUS_GENERR;
        }
 
-
        return codec->implementation->decode(codec, other_codec, encoded_data, encoded_data_len, encoded_rate, decoded_data, decoded_data_len, decoded_rate,
                                                                                 flag);
-
 }
 
 SWITCH_DECLARE(switch_status_t) switch_core_codec_destroy(switch_codec_t *codec)
@@ -266,3 +257,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_codec_destroy(switch_codec_t *codec)
 
        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:
+ */
index b1128cf7cb4e3685f4d01bfd947798f60d5d364f..40ca6f2bfba47df1b2f2b559c6200b48ba2a6f20 100644 (file)
@@ -45,7 +45,6 @@ static void db_pick_path(char *dbname, char *buf, switch_size_t size)
        }
 }
 
-
 SWITCH_DECLARE(int) switch_core_db_open(const char *filename, switch_core_db_t **ppDb)
 {
        return sqlite3_open(filename, ppDb);
@@ -185,7 +184,6 @@ SWITCH_DECLARE(switch_core_db_t *) switch_core_db_open_file(char *filename)
        return db;
 }
 
-
 SWITCH_DECLARE(void) switch_core_db_test_reactive(switch_core_db_t *db, char *test_sql, char *drop_sql, char *reactive_sql)
 {
        char *errmsg;
@@ -218,7 +216,6 @@ SWITCH_DECLARE(void) switch_core_db_test_reactive(switch_core_db_t *db, char *te
 
 }
 
-
 /* For Emacs:
  * Local Variables:
  * mode:c
index 379f579f52919668a404aad77b58f5a7fcc94b32..21d024e526aa1f857a6192b55aafe353ea7bcbf8 100644 (file)
@@ -31,6 +31,7 @@
  * switch_core_directory.c -- Main Core Library (Directory Interface)
  *
  */
+
 #include <switch.h>
 #include "private/switch_core_pvt.h"
 
index c7fa8ba7cea130c5d8df840572669d14f848e73d..eb53093cf3599e2b45ac34cc086fa11ccf09a988 100644 (file)
@@ -31,8 +31,6 @@
 #include "switch.h"
 #include "private/switch_core_pvt.h"
 
-               
-
 NEW_HOOK_DECL(outgoing_channel)
 NEW_HOOK_DECL(receive_message)
 NEW_HOOK_DECL(receive_event)
@@ -46,3 +44,14 @@ NEW_HOOK_DECL(waitfor_read)
 NEW_HOOK_DECL(waitfor_write)
 NEW_HOOK_DECL(send_dtmf)
 NEW_HOOK_DECL(recv_dtmf)
+
+/* 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:
+ */
index 5a2262483ab56a459ddd8651a9609c710d1825c7..f7960bc7e0387be6175d041f75c624054d114a0e 100644 (file)
@@ -31,6 +31,7 @@
  * switch_core_file.c -- Main Core Library (File I/O Functions)
  *
  */
+
 #include <switch.h>
 #include "private/switch_core_pvt.h"
 
@@ -272,10 +273,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_get_string(switch_file_handle_t
        }
 
        return fh->file_interface->file_get_string(fh, col, string);
-
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_core_file_close(switch_file_handle_t *fh)
 {
        switch_status_t status;
@@ -292,7 +291,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_close(switch_file_handle_t *fh)
 
        switch_resample_destroy(&fh->resampler);
 
-
        if (switch_test_flag(fh, SWITCH_FILE_FLAG_FREE_POOL)) {
                switch_core_destroy_memory_pool(&fh->memory_pool);
        }
index 0898695cedbc96085d922ddf5ae2e144596f1014..082943546ba8bbce2aff654cb3ec66e17a369972 100644 (file)
  * switch_core_hash.c -- Main Core Library (hash functions)
  *
  */
+
 #include <switch.h>
 #include "private/switch_core_pvt.h"
 #include <sqlite3.h>
 #include "../../../libs/sqlite/src/hash.h"
 
-
 struct switch_hash {
        Hash table;
 };
 
-
 SWITCH_DECLARE(switch_status_t) switch_core_hash_init(switch_hash_t ** hash, switch_memory_pool_t *pool)
 {
        switch_hash_t *newhash;
@@ -53,7 +52,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_hash_init(switch_hash_t ** hash, swi
        *hash = newhash;
        
        return SWITCH_STATUS_SUCCESS;
-
 }
 
 SWITCH_DECLARE(switch_status_t) switch_core_hash_destroy(switch_hash_t **hash)
@@ -106,7 +104,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_hash_delete_locked(switch_hash_t * h
        return SWITCH_STATUS_SUCCESS;
 }
 
-
 SWITCH_DECLARE(void *) switch_core_hash_find(switch_hash_t * hash, const char *key)
 {
        return sqlite3HashFind(&hash->table, key, (int)strlen(key)+1);
@@ -129,13 +126,11 @@ SWITCH_DECLARE(void *) switch_core_hash_find_locked(switch_hash_t * hash, const
        return val;
 }
 
-
 SWITCH_DECLARE(switch_hash_index_t *) switch_hash_first(char *depricate_me, switch_hash_t *hash)
 {
        return (switch_hash_index_t *) sqliteHashFirst(&hash->table);
 }
 
-
 SWITCH_DECLARE(switch_hash_index_t *) switch_hash_next(switch_hash_index_t *hi)
 {
        return (switch_hash_index_t *) sqliteHashNext((HashElem *) hi);
index b27f334b3af15988aa7a1fed7859342f06d35ca7..871a220bfb1828eed5182f7ac907989d620d36b5 100644 (file)
  * switch_core_io.c -- Main Core Library (Media I/O)
  *
  */
+
 #include <switch.h>
 #include "private/switch_core_pvt.h"
 
-
 SWITCH_DECLARE(switch_status_t) switch_core_session_write_video_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout, int stream_id)
 {
        switch_io_event_hook_video_write_frame_t *ptr;
@@ -89,7 +89,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_video_frame(switch_core
        return status;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout, int stream_id)
 {
        switch_io_event_hook_read_frame_t *ptr;
@@ -137,7 +136,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
                        goto done;
                }
                is_cng = 1;
-
        } 
 
        switch_assert((*frame)->codec != NULL);
@@ -352,7 +350,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
                                                                                                  session->read_codec->implementation->actual_samples_per_second,
                                                                                                  session->enc_read_frame.data, &session->enc_read_frame.datalen, &session->enc_read_frame.rate, &flag);
 
-
                                switch (status) {
                                case SWITCH_STATUS_RESAMPLE:
                                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "fixme 1\n");
@@ -431,7 +428,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
                        switch_thread_rwlock_unlock(session->bug_rwlock);
                }
        }
-
        return status;
 }
 
@@ -470,11 +466,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
        }
 
        if (switch_test_flag(frame, SFF_CNG)) {
-
                if (switch_channel_test_flag(session->channel, CF_ACCEPT_CNG)) {
                        return perform_write(session, frame, timeout, flag, stream_id);
                }
-
                return SWITCH_STATUS_SUCCESS;
        }
 
@@ -571,13 +565,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
                        session->write_resampler->from_len = write_frame->datalen / 2;
                        switch_short_to_float(data, session->write_resampler->from, session->write_resampler->from_len);
 
-                       
-
                        session->write_resampler->to_len = (uint32_t)
                                switch_resample_process(session->write_resampler, session->write_resampler->from,
                                                                                session->write_resampler->from_len, session->write_resampler->to, session->write_resampler->to_size, 0);
 
-
                        switch_float_to_short(session->write_resampler->to, data, session->write_resampler->to_len);
 
                        write_frame->samples = session->write_resampler->to_len;
@@ -748,7 +739,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
                                                                                                                          session->enc_write_frame.data,
                                                                                                                          &session->enc_write_frame.datalen, &session->enc_write_frame.rate, &flag);
 
-
                                                        switch (status) {
                                                        case SWITCH_STATUS_RESAMPLE:
                                                                session->enc_write_frame.codec = session->write_codec;
@@ -844,7 +834,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
        if (do_write) {
                return perform_write(session, frame, timeout, io_flag, stream_id);
        }
-
        return status;
 }
 
@@ -874,9 +863,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_perform_kill_channel(switch_
                        }
                }
        }
-
        return status;
-
 }
 
 SWITCH_DECLARE(switch_status_t) switch_core_session_waitfor_read(switch_core_session_t *session, int timeout, int stream_id)
@@ -893,9 +880,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_waitfor_read(switch_core_ses
                        }
                }
        }
-
        return status;
-
 }
 
 SWITCH_DECLARE(switch_status_t) switch_core_session_waitfor_write(switch_core_session_t *session, int timeout, int stream_id)
@@ -912,11 +897,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_waitfor_write(switch_core_se
                        }
                }
        }
-
        return status;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_core_session_recv_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf)
 {
        switch_io_event_hook_recv_dtmf_t *ptr;  
@@ -951,12 +934,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_send_dtmf(switch_core_sessio
                        status = session->endpoint_interface->io_routines->send_dtmf(session, dtmf);
                }
        }
-
        return status;
 }
 
-
-
 SWITCH_DECLARE(switch_status_t) switch_core_session_send_dtmf_string(switch_core_session_t *session, const char *dtmf_string)
 {
        char *p;
@@ -1007,7 +987,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_send_dtmf_string(switch_core
                }
                
        }
-
        return sent ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE;
 }
 
index 652620cf9f6eefc54052dcc0978d5c7d5c11a18b..446d9ad81de558fbd9f7465d3f887d299d1c355b 100644 (file)
@@ -31,6 +31,7 @@
  * switch_core_media_bug.c -- Main Core Library (Media Bugs)
  *
  */
+
 #include "switch.h"
 #include "private/switch_core_pvt.h"
 
@@ -100,11 +101,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_read(switch_media_bug_t *b
        if ((bug->raw_read_buffer && bug->raw_write_buffer) && (!rlen && !wlen)) {
                return SWITCH_STATUS_FALSE;
        }
-
-
+       
        maxlen = sizeof(data) > frame->buflen ? frame->buflen : sizeof(data);
 
-
        if ((rdlen = rlen > wlen ? wlen : rlen) > maxlen) {
                rdlen = maxlen;
        }
@@ -176,7 +175,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_read(switch_media_bug_t *b
                
                return SWITCH_STATUS_SUCCESS;
        }
-
+       
        return SWITCH_STATUS_FALSE;
 }
 
@@ -249,7 +248,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_add(switch_core_session_t
                bug->thread_id = switch_thread_self();
        }
 
-
        bug->ready = 1;
        switch_thread_rwlock_wrlock(session->bug_rwlock);
        bug->next = session->bugs;
@@ -290,7 +288,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove_all(switch_core_ses
                session->bugs = NULL;
                return SWITCH_STATUS_SUCCESS;
        }
-
+       
        return SWITCH_STATUS_FALSE;
 }
 
@@ -312,7 +310,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_close(switch_media_bug_t *
                *bug = NULL;
                return SWITCH_STATUS_SUCCESS;
        }
-
+       
        return SWITCH_STATUS_FALSE;
 }
 
@@ -345,7 +343,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove(switch_core_session
                switch_thread_rwlock_unlock(session->bug_rwlock);
                status = switch_core_media_bug_close(&bp);
        }
-
+       
        return status;
 }
 
index 2fe2a768bd7b80862269354bc0a19465a159c9f6..78f212e976c5f240d7b50c6491609ac96d3ebcf6 100644 (file)
@@ -31,6 +31,7 @@
  * switch_core_memory.c -- Main Core Library (memory management)
  *
  */
+
 #include <switch.h>
 #include "private/switch_core_pvt.h"
 /*#define LOCK_MORE*/
@@ -151,7 +152,6 @@ SWITCH_DECLARE(char *) switch_core_session_sprintf(switch_core_session_t *sessio
        switch_assert(result != NULL);
        va_end(ap);
 
-
 #ifdef LOCK_MORE
        switch_mutex_unlock(memory_manager.mem_lock);
 #endif
@@ -183,7 +183,6 @@ SWITCH_DECLARE(char *) switch_core_sprintf(switch_memory_pool_t *pool, const cha
        return result;
 }
 
-
 SWITCH_DECLARE(char *) switch_core_session_strdup(switch_core_session_t *session, const char *todup)
 {
        char *duped = NULL;
@@ -216,7 +215,6 @@ SWITCH_DECLARE(char *) switch_core_session_strdup(switch_core_session_t *session
        return duped;
 }
 
-
 SWITCH_DECLARE(char *) switch_core_strdup(switch_memory_pool_t *pool, const char *todup)
 {
        char *duped = NULL;
@@ -268,6 +266,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_perform_new_memory_pool(switch_memor
        tmp = switch_core_sprintf(*pool, "%s:%d", func, line);
        apr_pool_tag(*pool, tmp);
        switch_mutex_unlock(memory_manager.mem_lock);
+
        return SWITCH_STATUS_SUCCESS;
 }
 
@@ -286,12 +285,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_perform_destroy_memory_pool(switch_m
                apr_pool_destroy(*pool);
        }
        *pool = NULL;
-
-
+       
        return SWITCH_STATUS_SUCCESS;
 }
 
-
 SWITCH_DECLARE(void *) switch_core_alloc(switch_memory_pool_t *pool, switch_size_t memory)
 {
        void *ptr = NULL;
@@ -310,7 +307,6 @@ SWITCH_DECLARE(void *) switch_core_alloc(switch_memory_pool_t *pool, switch_size
        ptr = apr_palloc(pool, memory);
        switch_assert(ptr != NULL);
        memset(ptr, 0, memory);
-       
 
 #ifdef LOCK_MORE
        switch_mutex_unlock(memory_manager.mem_lock);
@@ -319,7 +315,6 @@ SWITCH_DECLARE(void *) switch_core_alloc(switch_memory_pool_t *pool, switch_size
        return ptr;
 }
 
-
 SWITCH_DECLARE(void) switch_core_memory_reclaim(void)
 {
        switch_memory_pool_t *pool;
@@ -391,10 +386,10 @@ static void *SWITCH_THREAD_FUNC pool_thread(switch_thread_t * thread, void *obj)
        }
 
        memory_manager.pool_thread_running = 0;
+
        return NULL;
 }
 
-
 void switch_core_memory_stop(void)
 {
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Stopping memory pool queue.\n");
@@ -430,3 +425,14 @@ switch_memory_pool_t *switch_core_memory_init(void)
 
        return memory_manager.memory_pool;
 }
+
+/* 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:
+ */
index 668727527e8b67c001b4a157fa09f86b9c6d0890..f5f5f693b91e588b0e771204addf7bece08a0dbc 100644 (file)
@@ -31,6 +31,7 @@
  * switch_core_port_allocator.c -- Main Core Library (port allocator)
  *
  */
+
 #include <switch.h>
 #include "private/switch_core_pvt.h"
 
@@ -109,7 +110,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_new(switch_port_t sta
        return SWITCH_STATUS_SUCCESS;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_request_port(switch_core_port_allocator_t *alloc, switch_port_t *port_ptr)
 {
        switch_port_t port = 0;
@@ -168,7 +168,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_request_port(switch_c
        
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_free_port(switch_core_port_allocator_t *alloc, switch_port_t port)
 {
        switch_status_t status = SWITCH_STATUS_FALSE;
@@ -191,10 +190,20 @@ SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_free_port(switch_core
        return status;
 }
 
-
 SWITCH_DECLARE(void) switch_core_port_allocator_destroy(switch_core_port_allocator_t **alloc)
 {
        switch_memory_pool_t *pool = (*alloc)->pool;
        switch_core_destroy_memory_pool(&pool);
        *alloc = NULL;
 }
+
+/* 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:
+ */
index 3f683d3d21306e82460c7ab6f8deaad4250c7324..1e6e35cd750e76b535b1820e2d4f1a6a0102e75b 100644 (file)
@@ -31,6 +31,7 @@
  * switch_core_rwlock.c -- Main Core Library (read / write locks)
  *
  */
+
 #include <switch.h>
 #include "private/switch_core_pvt.h"
 
index ff779042ba7f12d0d8b770368123c5d89d442f8e..f3df837a220f92fa1e6ba9f95b609c45c707d48c 100644 (file)
@@ -31,6 +31,7 @@
  * switch_core_session.c -- Main Core Library (session routines)
  *
  */
+
 #include "switch.h"
 #include "switch_core.h"
 #include "private/switch_core_pvt.h"
@@ -43,7 +44,6 @@ static struct {
        switch_size_t session_id;
 } session_manager;
 
-
 #ifdef SWITCH_DEBUG_RWLOCKS
 SWITCH_DECLARE(switch_core_session_t *) switch_core_session_perform_locate(const char *uuid_str, const char *file, const char *func, int line)
 #else
@@ -344,7 +344,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_receive_message(switch_core_
 
        if (session->endpoint_interface->io_routines->receive_message) {
                status = session->endpoint_interface->io_routines->receive_message(session, message);
-
        }
 
        if (status == SWITCH_STATUS_SUCCESS) {
@@ -380,7 +379,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_pass_indication(switch_core_
        } else {
                status = SWITCH_STATUS_FALSE;
        }
-
+       
        return status;
 }
 
@@ -396,7 +395,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_queue_indication(switch_core
                switch_core_session_queue_message(session, msg);
                return SWITCH_STATUS_SUCCESS;
        }
-
+       
        return SWITCH_STATUS_FALSE;
 }
 
@@ -411,7 +410,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_queue_message(switch_core_se
                        status = SWITCH_STATUS_SUCCESS;
                }
        }
-
+       
        return status;
 }
 
@@ -578,7 +577,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_dequeue_private_event(switch
        return status;
 }
 
-
 SWITCH_DECLARE(void) switch_core_session_reset(switch_core_session_t *session, switch_bool_t flush_dtmf)
 {
        switch_channel_t *channel;
@@ -605,9 +603,7 @@ SWITCH_DECLARE(void) switch_core_session_reset(switch_core_session_t *session, s
        }
 
        switch_ivr_deactivate_unicast(session);
-
        switch_channel_clear_flag(channel, CF_BREAK);
-
 }
 
 
@@ -616,8 +612,6 @@ SWITCH_DECLARE(switch_channel_t *) switch_core_session_get_channel(switch_core_s
        return session->channel;
 }
 
-
-
 SWITCH_DECLARE(void) switch_core_session_signal_state_change(switch_core_session_t *session)
 {
        switch_status_t status = SWITCH_STATUS_SUCCESS;
@@ -708,7 +702,6 @@ static void *SWITCH_THREAD_FUNC switch_core_session_thread(switch_thread_t * thr
        return NULL;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_core_session_thread_launch(switch_core_session_t *session)
 {
        switch_status_t status = SWITCH_STATUS_FALSE;
@@ -738,7 +731,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_thread_launch(switch_core_se
        return status;
 }
 
-
 SWITCH_DECLARE(void) switch_core_session_launch_thread(switch_core_session_t *session, switch_thread_start_t func, void *obj)
 {
        switch_thread_t *thread;
@@ -751,7 +743,6 @@ SWITCH_DECLARE(void) switch_core_session_launch_thread(switch_core_session_t *se
 
 }
 
-
 SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request(const switch_endpoint_interface_t
                                                                                                                                        *endpoint_interface, switch_memory_pool_t **pool)
 {
@@ -788,7 +779,6 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request(const switch
                switch_core_new_memory_pool(&usepool);
        }
 
-
        session = switch_core_alloc(usepool, sizeof(*session));
        session->pool = usepool;
        
@@ -798,7 +788,6 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request(const switch
 
        switch_channel_init(session->channel, session, CS_NEW, 0);
 
-
        /* The session *IS* the pool you may not alter it because you have no idea how
           its all private it will be passed to the thread run function */
 
@@ -858,12 +847,10 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_by_name(cons
        return switch_core_session_request(endpoint_interface, pool);
 }
 
-
 #ifndef SWITCH_PREFIX_DIR
 #define SWITCH_PREFIX_DIR "."
 #endif
 
-
 SWITCH_DECLARE(uint8_t) switch_core_session_compare(switch_core_session_t *a, switch_core_session_t *b)
 {
        switch_assert(a != NULL);
@@ -896,7 +883,6 @@ SWITCH_DECLARE(uint32_t) switch_core_sessions_per_second(uint32_t new_limit)
        return runtime.sps_total;
 }
 
-
 void switch_core_session_init(switch_memory_pool_t *pool)
 {
        memset(&session_manager, 0, sizeof(session_manager));
@@ -1102,8 +1088,18 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_execute_exten(switch_core_se
 
        session->stack_count--;
 
-       return status;
-       
+       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:
+ */
index c074d5c0dc534fdb3a9b4bdc2f865f6f9e4baea0..1d07e0f88080a351dc2ce01e1079b2c9a2c2d66e 100644 (file)
@@ -31,6 +31,7 @@
  * switch_core_speech.c -- Main Core Library (speech functions)
  *
  */
+
 #include <switch.h>
 #include "private/switch_core_pvt.h"
 
@@ -58,7 +59,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_speech_open(switch_speech_handle_t *
                }
        }
 
-
        if ((sh->speech_interface = switch_loadable_module_get_speech_interface(module_name)) == 0) {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid speech module [%s]!\n", module_name);
                return SWITCH_STATUS_GENERR;
@@ -79,7 +79,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_speech_open(switch_speech_handle_t *
                sh->param = switch_core_strdup(sh->memory_pool, param);
        }
 
-
        sh->rate = rate;
        sh->name = switch_core_strdup(pool, module_name);
        sh->samples = switch_bytes_per_frame(rate, interval);
@@ -87,7 +86,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_speech_open(switch_speech_handle_t *
        return sh->speech_interface->speech_open(sh, voice_name, rate, flags);
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_core_speech_feed_tts(switch_speech_handle_t *sh, char *text, switch_speech_flag_t *flags)
 {
        switch_assert(sh != NULL);
index f9fd7d62d22b1a4bb35e3c7e0d9c71a6caa8ca4f..e33de610fd0a1e3bbdd8f737995cdac5bcb96a1d 100644 (file)
@@ -31,6 +31,7 @@
  * switch_core_sqldb.c -- Main Core Library (statistics tracker)
  *
  */
+
 #include <switch.h>
 #include "private/switch_core_pvt.h"
 
@@ -88,9 +89,6 @@ static switch_status_t switch_core_db_persistant_execute_trans(switch_core_db_t
        }
 
        while (retries > 0) {
-
-
-
                switch_core_db_exec(db, sql, NULL, NULL, &errmsg);
                if (errmsg) {
                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SQL ERR [%s]\n", errmsg);
@@ -107,7 +105,6 @@ static switch_status_t switch_core_db_persistant_execute_trans(switch_core_db_t
                }
        }
 
-
   done:
 
        switch_core_db_exec(db, "end transaction", NULL, NULL, &errmsg);
@@ -347,7 +344,6 @@ static void core_event_handler(switch_event_t *event)
        }
 }
 
-
 void switch_core_sqldb_start(switch_memory_pool_t *pool)
 {
        switch_thread_t *thread;
@@ -431,3 +427,14 @@ void switch_core_sqldb_stop(void)
        switch_core_db_close(sql_manager.event_db);
 
 }
+
+/* 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:
+ */
index b83ced0d810b060b18d764a24a1e24198f2cc43b..4e8d1d0cfab4da87808044904ba8832a098edd61 100644 (file)
@@ -31,6 +31,7 @@
  * switch_core_state_maching.c -- Main Core Library (state machine)
  *
  */
+
 #include <switch.h>
 #include "private/switch_core_pvt.h"
 
@@ -44,15 +45,13 @@ static void switch_core_standard_on_hangup(switch_core_session_t *session)
 
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard HANGUP %s, cause: %s\n",
                                          switch_channel_get_name(session->channel), switch_channel_cause2str(switch_channel_get_cause(session->channel)));
-
 }
 
 static void switch_core_standard_on_reset(switch_core_session_t *session)
 {
 
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard RESET %s\n",
-                                         switch_channel_get_name(session->channel));
-       
+                                         switch_channel_get_name(session->channel));   
 }
 
 static void switch_core_standard_on_ring(switch_core_session_t *session)
@@ -119,7 +118,6 @@ static void switch_core_standard_on_ring(switch_core_session_t *session)
        if (expanded && dpstr && expanded != dpstr) {
                free(expanded);
        }
-
 }
 
 static void switch_core_standard_on_execute(switch_core_session_t *session)
@@ -166,8 +164,7 @@ static void switch_core_standard_on_execute(switch_core_session_t *session)
                         switch_channel_expand_variables(session->channel,
                                                                                         extension->current_application->application_data)) != extension->current_application->application_data) {
                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Expanded String %s(%s)\n", switch_channel_get_name(session->channel), 
-                                                         extension->current_application->application_name, expanded);
-                                                         
+                                                         extension->current_application->application_name, expanded);                            
                }
 
                if (switch_channel_get_variable(session->channel, "presence_id")) {
@@ -274,7 +271,6 @@ static void print_trace(void)
 }
 #endif
 
-
 static void handle_fatality(int sig)
 {
        switch_thread_id_t thread_id;
@@ -291,7 +287,6 @@ static void handle_fatality(int sig)
        }
 }
 
-
 void switch_core_state_machine_init(switch_memory_pool_t *pool)
 {
        
@@ -300,8 +295,6 @@ void switch_core_state_machine_init(switch_memory_pool_t *pool)
        }
 }
 
-
-
 #define STATE_MACRO(__STATE, __STATE_STR)                                              do {    \
                midstate = state;                                                                                               \
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State %s\n", switch_channel_get_name(session->channel), __STATE_STR);     \
@@ -371,7 +364,6 @@ SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session)
                }
        }
 
-
        /*
           Life of the channel. you have channel and pool in your session
           everywhere you go you use the session to malloc with
@@ -477,9 +469,7 @@ SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session)
 
                }
 
-
                endstate = switch_channel_get_state(session->channel);
-
                
                if (endstate == switch_channel_get_running_state(session->channel)) {
                        if (endstate == CS_NEW) {
@@ -488,7 +478,6 @@ SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session)
                                switch_thread_cond_wait(session->cond, session->mutex);
                        }
                }
-
        }
   done:
        switch_mutex_unlock(session->mutex);
@@ -498,5 +487,15 @@ SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session)
                //apr_hash_set(stack_table, &thread_id, sizeof(thread_id), NULL);
        }
        session->thread_running = 0;
-
 }
+
+/* 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:
+ */
index c226ac86941eb9d245287ba532e175f91852a1d9..9c3d1bd26aa3497dcf3c4d3b925e9664778dfbc6 100644 (file)
@@ -31,6 +31,7 @@
  * switch_core_timer.c -- Main Core Library (timer interface)
  *
  */
+
 #include <switch.h>
 #include "private/switch_core_pvt.h"
 
index 13626237af1277b0cba9cc8cff7ceb70482bae39..b1148651b74599ed7209b2d628747d381c92ff7d 100644 (file)
@@ -703,12 +703,10 @@ switch_status_t process_callback_result(char *ret,
     }
 
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "no match, return false\n");
-    return SWITCH_STATUS_FALSE;
-
 
+    return SWITCH_STATUS_FALSE;
 }
 
-
 /* For Emacs:
  * Local Variables:
  * mode:c
index bdaf4606f5625bb234138d98e3fad7c6bf7dc071..32be830377b00dfcd399d64bad9a9346b7460941 100644 (file)
@@ -31,6 +31,7 @@
  * switch_event.c -- Event System
  *
  */
+
 #include <switch.h>
 #include <switch_event.h>
 
@@ -326,7 +327,6 @@ SWITCH_DECLARE(switch_status_t) switch_event_reserve_subclass_detailed(const cha
        switch_core_hash_insert(CUSTOM_HASH, subclass->name, subclass);
 
        return SWITCH_STATUS_SUCCESS;
-
 }
 
 SWITCH_DECLARE(void) switch_core_memory_reclaim_events(void)
@@ -390,7 +390,6 @@ SWITCH_DECLARE(switch_status_t) switch_event_shutdown(void)
 
        switch_core_hash_destroy(&CUSTOM_HASH);
        switch_core_memory_reclaim_events();
-       
 
        return SWITCH_STATUS_SUCCESS;
 }
@@ -413,8 +412,6 @@ SWITCH_DECLARE(switch_status_t) switch_event_init(switch_memory_pool_t *pool)
        switch_queue_create(&EVENT_QUEUE[2], POOL_COUNT_MAX + 10, THRUNTIME_POOL);
        switch_queue_create(&EVENT_RECYCLE_QUEUE, SWITCH_CORE_QUEUE_LEN, THRUNTIME_POOL);
        switch_queue_create(&EVENT_HEADER_RECYCLE_QUEUE, SWITCH_CORE_QUEUE_LEN, THRUNTIME_POOL);
-       
-
 
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Activate Eventing Engine.\n");
        switch_mutex_init(&BLOCK, SWITCH_MUTEX_NESTED, RUNTIME_POOL);
@@ -430,7 +427,6 @@ SWITCH_DECLARE(switch_status_t) switch_event_init(switch_memory_pool_t *pool)
                switch_yield(1000);
        }
        return SWITCH_STATUS_SUCCESS;
-
 }
 
 SWITCH_DECLARE(switch_status_t) switch_event_create_subclass(switch_event_t **event, switch_event_types_t event_id, const char *subclass_name)
@@ -794,7 +790,6 @@ SWITCH_DECLARE(switch_status_t) switch_event_serialize(switch_event_t *event, ch
        return SWITCH_STATUS_SUCCESS;
 }
 
-
 static switch_xml_t add_xml_header(switch_xml_t xml, char *name, char *value, int offset)
 {
        switch_xml_t header = NULL;
@@ -1012,7 +1007,6 @@ SWITCH_DECLARE(switch_status_t) switch_event_create_pres_in_detailed(char *file,
        return SWITCH_STATUS_MEMERR;
 }
 
-
 #define resize(l) {\
 char *dp;\
 olen += (len + l + block);\
@@ -1273,7 +1267,6 @@ SWITCH_DECLARE(char *) switch_event_expand_headers(switch_event_t *event, const
        return data;
 }
 
-
 SWITCH_DECLARE(char *) switch_event_build_param_string(switch_event_t *event, const char *prefix)
 {
        switch_stream_handle_t stream = { 0 };
index 005fc73f91d57ba8408553dda279fa320f4660f5..709aae696c47e846201ecfed1b91d519ce93c881 100644 (file)
@@ -33,6 +33,7 @@
  * switch_ivr.c -- IVR Library
  *
  */
+
 #include <switch.h>
 #include <switch_ivr.h>
 #include "stfu.h"
@@ -78,7 +79,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_sleep(switch_core_session_t *session,
        return status;
 }
 
-
 static void *SWITCH_THREAD_FUNC unicast_thread_run(switch_thread_t *thread, void *obj)
 {
        switch_unicast_conninfo_t *conninfo = (switch_unicast_conninfo_t *) obj;
@@ -596,7 +596,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_collect_digits_callback(switch_core_s
        return status;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_ivr_collect_digits_count(switch_core_session_t *session,
                                                                                                                                char *buf,
                                                                                                                                switch_size_t buflen,
@@ -645,8 +644,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_collect_digits_count(switch_core_sess
                digit_started = switch_timestamp_now();
        }
 
-
-
        while (switch_channel_ready(channel)) {
                switch_frame_t *read_frame;
                
@@ -709,7 +706,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_collect_digits_count(switch_core_sess
        return status;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_ivr_hold(switch_core_session_t *session)
 {
        switch_core_session_message_t msg = { 0 };
@@ -823,7 +819,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_media(const char *uuid, switch_media_
        return status;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_ivr_nomedia(const char *uuid, switch_media_flag_t flags)
 {
        const char *other_uuid;
index 5c1ff19c0d6ccc4394c5e0a9828638f6cb93736c..b6732add5038e93e5c80b8a2b3e7b3a9b02d631e 100644 (file)
@@ -30,6 +30,7 @@
  * switch_ivr_async.c -- IVR Library (async operations)
  *
  */
+
 #include <switch.h>
 
 struct echo_helper {
@@ -94,7 +95,6 @@ SWITCH_DECLARE(void) switch_ivr_session_echo(switch_core_session_t *session)
        }
 }
 
-
 typedef struct {
        switch_file_handle_t fh;
        int mux;
@@ -174,8 +174,6 @@ static switch_bool_t write_displace_callback(switch_media_bug_t *bug, void *user
        return SWITCH_TRUE;
 }
 
-
-
 static switch_bool_t read_displace_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type)
 {
        displace_helper_t *dh = (displace_helper_t *) user_data;
@@ -261,7 +259,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_stop_displace_session(switch_core_ses
        }
 
        return SWITCH_STATUS_FALSE;
-
 }
 
 SWITCH_DECLARE(switch_status_t) switch_ivr_displace_session(switch_core_session_t *session, const char *file, uint32_t limit, const char *flags)
@@ -273,7 +270,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_displace_session(switch_core_session_
        time_t to = 0;
        displace_helper_t *dh;
 
-
        channel = switch_core_session_get_channel(session);
        switch_assert(channel != NULL);
 
@@ -334,7 +330,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_displace_session(switch_core_session_
        return SWITCH_STATUS_SUCCESS;
 }
 
-
 static switch_bool_t record_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type)
 {
        switch_file_handle_t *fh = (switch_file_handle_t *) user_data;
@@ -397,10 +392,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_stop_record_session(switch_core_sessi
        }
 
        return SWITCH_STATUS_FALSE;
-
 }
 
-
 struct eavesdrop_pvt {
        switch_buffer_t *buffer;
        switch_mutex_t *mutex;
@@ -489,7 +482,6 @@ static switch_bool_t eavesdrop_callback(switch_media_bug_t *bug, void *user_data
        return SWITCH_TRUE;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session_t *session, const char *uuid, switch_eavesdrop_flag_t flags)
 {
        switch_core_session_t *tsession;
@@ -649,7 +641,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session
                        
         }
 
-
     end:
 
                switch_core_codec_destroy(&codec);
@@ -883,7 +874,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_inband_dtmf_session(switch_core_sessi
        return SWITCH_STATUS_SUCCESS;
 }
 
-
 typedef struct {
        switch_core_session_t *session;
        teletone_generation_session_t ts;
@@ -907,7 +897,6 @@ static int teletone_dtmf_generate_handler(teletone_generation_session_t * ts, te
     return 0;
 }
 
-
 static switch_status_t generate_on_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf)
 {
 
@@ -1034,7 +1023,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_inband_dtmf_generate_session(switch_c
        return SWITCH_STATUS_SUCCESS;
 }
 
-
 #define MAX_TONES 16
 typedef struct {
        teletone_multi_tone_t mt;
@@ -1045,7 +1033,6 @@ typedef struct {
        int up;
 } switch_tone_detect_t;
 
-
 typedef struct {
        switch_tone_detect_t list[MAX_TONES+1];
        int index;
@@ -1244,7 +1231,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_tone_detect_session(switch_core_sessi
   return SWITCH_STATUS_SUCCESS;
 }
 
-
 struct speech_thread_handle {
        switch_core_session_t *session;
        switch_asr_handle_t *ah;
@@ -1336,7 +1322,6 @@ static switch_bool_t speech_callback(switch_media_bug_t *bug, void *user_data, s
                        switch_threadattr_detach_set(thd_attr, 1);
                        switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
                        switch_thread_create(&thread, thd_attr, speech_thread, sth, sth->pool);
-
                }
                break;
        case SWITCH_ABC_TYPE_CLOSE:{
@@ -1382,11 +1367,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_stop_detect_speech(switch_core_sessio
        }
 
        return SWITCH_STATUS_FALSE;
-
 }
 
-
-
 SWITCH_DECLARE(switch_status_t) switch_ivr_pause_detect_speech(switch_core_session_t *session)
 {
        switch_channel_t *channel = switch_core_session_get_channel(session);
@@ -1399,7 +1381,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_pause_detect_speech(switch_core_sessi
        }
 
        return SWITCH_STATUS_FALSE;
-
 }
 
 SWITCH_DECLARE(switch_status_t) switch_ivr_resume_detect_speech(switch_core_session_t *session)
@@ -1414,10 +1395,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_resume_detect_speech(switch_core_sess
        }
 
        return SWITCH_STATUS_FALSE;
-
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_ivr_detect_speech_load_grammar(switch_core_session_t *session, char *grammar, char *path)
 {
        switch_channel_t *channel = switch_core_session_get_channel(session);
@@ -1439,7 +1418,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_detect_speech_load_grammar(switch_cor
        return SWITCH_STATUS_FALSE;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_ivr_detect_speech_unload_grammar(switch_core_session_t *session, const char *grammar)
 {
        switch_channel_t *channel = switch_core_session_get_channel(session);
@@ -1536,7 +1514,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_detect_speech(switch_core_session_t *
        return SWITCH_STATUS_SUCCESS;
 }
 
-
 struct hangup_helper {
        char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
        switch_bool_t bleg;
@@ -1654,7 +1631,6 @@ SWITCH_DECLARE(uint32_t) switch_ivr_schedule_transfer(time_t runtime, const char
        return switch_scheduler_add_task(runtime, sch_transfer_callback, (char *) __SWITCH_FUNC__, uuid, 0, helper, SSHF_FREE_ARG);
 }
 
-
 struct broadcast_helper {
        char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
        char *path;
@@ -1798,12 +1774,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_broadcast(const char *uuid, const cha
 
        switch_core_session_rwunlock(session);
        switch_safe_free(mypath);
-       
-
 
        return SWITCH_STATUS_SUCCESS;
-
 }
+
 /* For Emacs:
  * Local Variables:
  * mode:c
index a0a4f58651d32fd2e858431e9977a705a203f74c..275d84f685afb3b9c8c3b03fbd3274c760244b9c 100644 (file)
@@ -28,6 +28,7 @@
  * switch_ivr_bridge.c -- IVR Library 
  *
  */
+
 #include <switch.h>
 
 static const switch_state_handler_table_t audio_bridge_peer_state_handlers;
@@ -43,8 +44,6 @@ struct switch_ivr_bridge_data {
 };
 typedef struct switch_ivr_bridge_data switch_ivr_bridge_data_t;
 
-
-
 static void *audio_bridge_thread(switch_thread_t * thread, void *obj)
 {
        switch_ivr_bridge_data_t *data = obj;
@@ -260,7 +259,6 @@ static switch_status_t audio_bridge_on_loopback(switch_core_session_t *session)
        return SWITCH_STATUS_FALSE;
 }
 
-
 static switch_status_t audio_bridge_on_ring(switch_core_session_t *session)
 {
        switch_channel_t *channel = NULL;
@@ -298,7 +296,6 @@ static const switch_state_handler_table_t audio_bridge_peer_state_handlers = {
        /*.on_hold */ audio_bridge_on_hold,
 };
 
-
 static switch_status_t uuid_bridge_on_reset(switch_core_session_t *session)
 {
        switch_channel_t *channel = NULL;
@@ -440,7 +437,6 @@ static switch_status_t signal_bridge_on_hangup(switch_core_session_t *session)
                }
        }
 
-
        if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE))
                && (other_session = switch_core_session_locate(uuid))) {
                switch_channel_t *other_channel = NULL;
@@ -468,7 +464,6 @@ static switch_status_t signal_bridge_on_hangup(switch_core_session_t *session)
                switch_core_session_rwunlock(other_session);
        }
 
-
        return SWITCH_STATUS_SUCCESS;
 }
 
@@ -515,7 +510,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_signal_bridge(switch_core_session_t *
        switch_channel_add_state_handler(caller_channel, &signal_bridge_state_handlers);
        switch_channel_add_state_handler(peer_channel, &signal_bridge_state_handlers);
 
-
        /* fire events that will change the data table from "show channels" */
        if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_EXECUTE) == SWITCH_STATUS_SUCCESS) {
                switch_channel_event_set_data(caller_channel, event);
@@ -651,7 +645,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
                                }
                        }
 
-
                        msg.message_id = SWITCH_MESSAGE_INDICATE_BRIDGE;
                        msg.from = __FILE__;
                        msg.string_arg = switch_core_session_strdup(peer_session, switch_core_session_get_uuid(session));
@@ -669,7 +662,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
                                goto done;
                        }
 
-
                        switch_channel_set_variable(caller_channel, SWITCH_BRIDGE_CHANNEL_VARIABLE, switch_channel_get_name(peer_channel));
                        switch_channel_set_variable(caller_channel, SWITCH_BRIDGE_UUID_VARIABLE, switch_core_session_get_uuid(peer_session));
                        switch_channel_set_variable(caller_channel, SWITCH_SIGNAL_BOND_VARIABLE, switch_core_session_get_uuid(peer_session));
@@ -728,7 +720,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
        return status;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_ivr_uuid_bridge(const char *originator_uuid, const char *originatee_uuid)
 {
        switch_core_session_t *originator_session, *originatee_session, *swap_session;
@@ -757,7 +748,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_uuid_bridge(const char *originator_uu
                                }
                        }
 
-
                        /* override transmit state for originator_channel to bridge to originatee_channel 
                         * install pointer to originatee_session into originator_channel
                         * set CF_TRANSFER on both channels and change state to CS_TRANSMIT to
@@ -772,9 +762,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_uuid_bridge(const char *originator_uu
                        switch_channel_add_state_handler(originator_channel, &uuid_bridge_state_handlers);
                        switch_channel_add_state_handler(originatee_channel, &uuid_bridge_state_handlers);
                        switch_channel_set_variable(originator_channel, SWITCH_UUID_BRIDGE, switch_core_session_get_uuid(originatee_session));
-                       
-
-                       
+               
                        switch_channel_set_variable(originator_channel, SWITCH_BRIDGE_CHANNEL_VARIABLE, switch_channel_get_name(originatee_channel));
                        switch_channel_set_variable(originator_channel, SWITCH_BRIDGE_UUID_VARIABLE, switch_core_session_get_uuid(originatee_session));
                        switch_channel_set_variable(originator_channel, SWITCH_SIGNAL_BOND_VARIABLE, switch_core_session_get_uuid(originatee_session));
@@ -794,7 +782,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_uuid_bridge(const char *originator_uu
                        switch_channel_set_variable(originator_channel, "original_destination_number", originator_cp->destination_number);
                        switch_channel_set_variable(originator_channel, "original_caller_id_name", originator_cp->caller_id_name);
                        switch_channel_set_variable(originator_channel, "original_caller_id_number", originator_cp->caller_id_number);
-                       
 
                        cp = switch_caller_profile_clone(originatee_session, originatee_cp);
                        cp->destination_number = switch_core_strdup(cp->pool, originator_cp->caller_id_number);
@@ -838,7 +825,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_uuid_bridge(const char *originator_uu
        }
 
        return status;
-
 }
 
 SWITCH_DECLARE(void) switch_ivr_intercept_session(switch_core_session_t *session, const char *uuid)
@@ -868,16 +854,12 @@ SWITCH_DECLARE(void) switch_ivr_intercept_session(switch_core_session_t *session
        switch_channel_set_state_flag(rchannel, CF_TRANSFER);
        switch_channel_set_state(rchannel, CS_RESET);
 
-
        if (bsession) {
                bchannel = switch_core_session_get_channel(bsession);
                switch_channel_hangup(bchannel, SWITCH_CAUSE_PICKED_OFF);
                switch_core_session_rwunlock(bsession);
        }
 
-       
-
-
        switch_core_session_rwunlock(rsession);
 
        switch_ivr_uuid_bridge(switch_core_session_get_uuid(session), uuid);
index 086642dc5cd147b843a0f15ece63e10d5adcd8b1..55a6ba3507c2bbe8993cd8aaefc6ed3f9cadbe9e 100644 (file)
@@ -29,6 +29,7 @@
  * switch_ivr_menu.c -- IVR Library (menu code)
  *
  */
+
 #include <switch.h>
 
 struct switch_ivr_menu_action;
index 567f12492ceb63dfa901287059351e94d3657f24..bbdf718a8a5e0254453b292b57b9db7383dbae01 100644 (file)
@@ -29,6 +29,7 @@
  * switch_ivr_originate.c -- IVR Library (originate)
  *
  */
+
 #include <switch.h>
 
 static const switch_state_handler_table_t originate_state_handlers;
@@ -60,7 +61,6 @@ static const switch_state_handler_table_t originate_state_handlers = {
        /*.on_hold */ NULL
 };
 
-
 typedef enum {
        IDX_CANCEL = -2,
        IDX_NADA = -1
@@ -215,7 +215,6 @@ static uint8_t check_channel_status(switch_channel_t **peer_channels,
        } else {
                return 1;
        }
-
 }
 
 struct ringback {
@@ -622,7 +621,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
                }
        }
 
-
        if (caller_channel) {           /* ringback is only useful when there is an originator */
                ringback_data = NULL;
 
@@ -691,8 +689,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
                cid_num_override = switch_event_get_header(var_event, "origination_caller_id_number");
        }
 
-
-
        for (try = 0; try < retries; try++) {
                switch_safe_free(loop_data);
                loop_data = strdup(data);
@@ -812,9 +808,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
                                peer_sessions[i] = NULL;
                                new_session = NULL;
                                
-                               
-
-
                                if (and_argc > 1 || or_argc > 1) {
                                        myflags |= SOF_FORKED_DIAL;
                                } else if (var_event) {
@@ -879,14 +872,12 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
                                        switch_channel_add_state_handler(peer_channels[i], table);
                                }
 
-
                                if ((flags & SOF_NOBLOCK) && peer_sessions[i]) {
                                        status = SWITCH_STATUS_SUCCESS;
                                        *bleg = peer_sessions[i];
                                        *cause = SWITCH_CAUSE_SUCCESS;
                                        goto outer_for;
                                }
-
                                
                                if (switch_core_session_running(peer_sessions[i])) {
                                        if (!(flags & SOF_NOBLOCK)) {
@@ -895,8 +886,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
                                } else {
                                        switch_core_session_thread_launch(peer_sessions[i]);
                                }
-
-
                        }                       
 
                        switch_timestamp(&start);