I before e, except after c.

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

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 399d1a64fe3b79cc9c0fbdbcbf1f675376fbb67e..fce8e12a9bdd67184bdf426d6b24c81c373391af 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -233,7 +233,7 @@ typedef struct conference_obj {
        char *auto_record;
        uint32_t max_members;
        char *maxmember_sound;
-       uint32_t anounce_count;
+       uint32_t announce_count;
        switch_ivr_digit_stream_parser_t *dtmf_parser;
        char *pin;
        char *pin_sound;
@@ -556,7 +556,7 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
 {
        switch_status_t status = SWITCH_STATUS_FALSE;
        switch_event_t *event;
-       char msg[512];                          /* conference count anouncement */
+       char msg[512];                          /* conference count announcement */
        call_list_t *call_list = NULL;
        switch_channel_t *channel;
 
@@ -613,8 +613,8 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
                        conference_member_say(member, saymsg, 0);
                } else {
                        if (switch_strlen_zero(conference->special_announce)) {
-                               /* anounce the total number of members in the conference */
-                               if (conference->count >= conference->anounce_count && conference->anounce_count > 1) {
+                               /* announce the total number of members in the conference */
+                               if (conference->count >= conference->announce_count && conference->announce_count > 1) {
                                        switch_snprintf(msg, sizeof(msg), "There are %d callers", conference->count);
                                        conference_member_say(member, msg, CONF_DEFAULT_LEADIN);
                                } else if (conference->count == 1 && !conference->perpetual_sound) {
@@ -749,7 +749,7 @@ static switch_status_t conference_del_member(conference_obj_t *conference, confe
                        }
                }
 
-               if (conference->anounce_count == 1) {
+               if (conference->announce_count == 1) {
                        conference->floor_holder = conference->members;
                }
 
@@ -3983,7 +3983,7 @@ static switch_status_t conference_outcall_bg(conference_obj_t *conference,
        switch_threadattr_detach_set(thd_attr, 1);
        switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
        switch_thread_create(&thread, thd_attr, conference_outcall_run, call, conference->pool);
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Lanuching BG Thread for outcall\n");
+       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Launching BG Thread for outcall\n");
 
        return SWITCH_STATUS_SUCCESS;
 }
@@ -4845,7 +4845,7 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_m
        char *perpetual_sound = NULL;
        char *moh_sound = NULL;
        uint32_t max_members = 0;
-       uint32_t anounce_count = 0;
+       uint32_t announce_count = 0;
        char *maxmember_sound = NULL;
        uint32_t rate = 8000, interval = 20;
        switch_status_t status;
@@ -4960,12 +4960,12 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_m
                        }
                } else if (!strcasecmp(var, "max-members-sound") && !switch_strlen_zero(val)) {
                        maxmember_sound = val;
-               } else if (!strcasecmp(var, "anounce-count") && !switch_strlen_zero(val)) {
+               } else if (!strcasecmp(var, "announce-count") && !switch_strlen_zero(val)) {
                        errno = 0;                      // safety first
-                       anounce_count = strtol(val, NULL, 0);
+                       announce_count = strtol(val, NULL, 0);
                        if (errno == ERANGE || errno == EINVAL) {
-                               anounce_count = 0;
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "anounce-count is invalid, not anouncing member counts\n");
+                               announce_count = 0;
+                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "announce-count is invalid, not anouncing member counts\n");
                        }
                } else if (!strcasecmp(var, "suppress-events") && !switch_strlen_zero(val)) {
                        suppress_events = val;
@@ -5108,7 +5108,7 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_m
        }
        // its going to be 0 by default, set to a value otherwise so this should be safe
        conference->max_members = max_members;
-       conference->anounce_count = anounce_count;
+       conference->announce_count = announce_count;
 
        conference->name = switch_core_strdup(conference->pool, name);
        if (domain) {
@@ -5144,7 +5144,7 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_m
                                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to install caller controls group '%s'\n", caller_controls);
                        }
                } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "no caller controls intalled.\n");
+                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "no caller controls installed.\n");
                }
        } else {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to allocate caller control digit parser.\n");

diff --git a/src/mod/applications/mod_dptools/mod_dptools.c b/src/mod/applications/mod_dptools/mod_dptools.c
index 281775da1178a30d25fc1371f9892df92ffccba5..eb4978dd6f497214611dafa4cf0a6dd73bb92575 100644 (file)
--- a/src/mod/applications/mod_dptools/mod_dptools.c
+++ b/src/mod/applications/mod_dptools/mod_dptools.c
@@ -1559,7 +1559,7 @@ SWITCH_STANDARD_APP(read_function)
        if (!switch_strlen_zero(data) && (mydata = switch_core_session_strdup(session, data))) {
                argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No arguements specified.\n");
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No arguments specified.\n");
                return;
        }
 

diff --git a/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c b/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c
index c0caa740ac47c329afb7e2e67ffa406f4eceb990..6c874a51e06e27f470750ec53e9918600fd13ed6 100644 (file)
--- a/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c
+++ b/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c
@@ -413,7 +413,7 @@ static switch_status_t openmrcp_asr_feed(switch_asr_handle_t *ah, void *data, un
                media_frame.codec_frame.buffer = (char *) media_frame.codec_frame.buffer + media_frame.codec_frame.size;
        }
        if (len > 0) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "None frame alligned data len [%d]\n", len);
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "None frame aligned data len [%d]\n", len);
        }
        return SWITCH_STATUS_SUCCESS;
 }

diff --git a/src/mod/endpoints/mod_iax/mod_iax.c b/src/mod/endpoints/mod_iax/mod_iax.c
index 504781ce441abc5afbe84f38b696842bcfd2560d..aa57f06b81b2ca31740bf4c821304acd7e5a8513 100644 (file)
--- a/src/mod/endpoints/mod_iax/mod_iax.c
+++ b/src/mod/endpoints/mod_iax/mod_iax.c
@@ -986,7 +986,7 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_iax_runtime)
                                if (channel) {
                                        if (tech_media(tech_pvt, iaxevent) == SWITCH_STATUS_SUCCESS) {
                                                if (switch_channel_test_flag(channel, CF_ANSWERED)) {
-                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Mutiple Answer %s?\n", switch_channel_get_name(channel));
+                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Multiple Answer %s?\n", switch_channel_get_name(channel));
 
                                                } else {
                                                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Answer %s\n", switch_channel_get_name(channel));

diff --git a/src/mod/endpoints/mod_portaudio/mod_portaudio.c b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
index 6ac2850daef36241f9c0ca66d4c051376b56f347..0f8190178d8b005285a1eb19f63215328d45a6bc 100644 (file)
--- a/src/mod/endpoints/mod_portaudio/mod_portaudio.c
+++ b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
@@ -1123,7 +1123,7 @@ static int dump_info(int verbose)
        return 0;
 
   error:
-       switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR, "An error occured while using the portaudio stream\n");
+       switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR, "An error occurred while using the portaudio stream\n");
        switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR, "Error number: %d\n", err);
        switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR, "Error message: %s\n", Pa_GetErrorText(err));
        return err;

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index 76389b8443a7e45d905ee52e97684cc15b2b998d..dac2256c9a8cba194b9fdd3e7f32e53d78ee192b 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -1018,7 +1018,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
                                        to_host = switch_channel_get_variable(channel, "sip_to_host");
                                }
                                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Challenging call %s\n", to_uri);
-                               sofia_reg_auth_challange(NULL, tech_pvt->profile, tech_pvt->nh, REG_INVITE, to_host, 0);
+                               sofia_reg_auth_challenge(NULL, tech_pvt->profile, tech_pvt->nh, REG_INVITE, to_host, 0);
                                switch_channel_hangup(channel, SWITCH_CAUSE_USER_CHALLENGE);
                        } else if (code == 484 && msg->numeric_arg) {
                                const char *to = switch_channel_get_variable(channel, "sip_to_uri");

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.h b/src/mod/endpoints/mod_sofia/mod_sofia.h
index 260d989ff74d96224beffcb54298d69d5fcaa7f0..278e03697f6c483810ba99fe881857df04848f5f 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.h
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.h
@@ -554,7 +554,7 @@ void sofia_presence_event_handler(switch_event_t *event);
 void sofia_presence_mwi_event_handler(switch_event_t *event);
 void sofia_presence_cancel(void);
 switch_status_t config_sofia(int reload, char *profile_name);
-void sofia_reg_auth_challange(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_regtype_t regtype, const char *realm, int stale);
+void sofia_reg_auth_challenge(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_regtype_t regtype, const char *realm, int stale);
 auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, sip_t const *sip, const char *regstr, 
                                                                char *np, size_t nplen, char *ip, switch_event_t **v_event, long exptime, sofia_regtype_t regtype, const char *to_user);
 

diff --git a/src/mod/endpoints/mod_sofia/sofia_reg.c b/src/mod/endpoints/mod_sofia/sofia_reg.c
index 0d9468d6643b9694f1f22cf0484872ecb345f08d..eca95a4235ef9e31f51663bd3f91cf5dd56bbbc6 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_reg.c
+++ b/src/mod/endpoints/mod_sofia/sofia_reg.c
@@ -442,7 +442,7 @@ char *sofia_reg_find_reg_url(sofia_profile_t *profile, const char *user, const c
 }
 
 
-void sofia_reg_auth_challange(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_regtype_t regtype, const char *realm, int stale)
+void sofia_reg_auth_challenge(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_regtype_t regtype, const char *realm, int stale)
 {
        switch_uuid_t uuid;
        char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
@@ -702,7 +702,7 @@ uint8_t sofia_reg_handle_register(nua_t *nua, sofia_profile_t *profile, nua_hand
                }
 
                if (auth_res != AUTH_OK && !stale) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "send %s for [%s@%s]\n", forbidden ? "forbidden" : "challange", to_user, to_host);
+                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "send %s for [%s@%s]\n", forbidden ? "forbidden" : "challenge", to_user, to_host);
                        if (auth_res == AUTH_FORBIDDEN) {
                                nua_respond(nh, SIP_403_FORBIDDEN, NUTAG_WITH_THIS(nua), TAG_END());
                        } else {
@@ -713,7 +713,7 @@ uint8_t sofia_reg_handle_register(nua_t *nua, sofia_profile_t *profile, nua_hand
        }
 
        if (!authorization || stale) {
-               sofia_reg_auth_challange(nua, profile, nh, regtype, to_host, stale);
+               sofia_reg_auth_challenge(nua, profile, nh, regtype, to_host, stale);
                if (regtype == REG_REGISTER && profile->debug) {
                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Requesting Registration from: [%s@%s]\n", to_user, to_host);
                }