]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
cleanup.
authorMichael Jerris <mike@jerris.com>
Sun, 6 Jan 2008 22:56:10 +0000 (22:56 +0000)
committerMichael Jerris <mike@jerris.com>
Sun, 6 Jan 2008 22:56:10 +0000 (22:56 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7114 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/applications/mod_conference/mod_conference.c

index dd5ed80a7bcb1a9f45e814ce29f54ab7f2f3159c..e9a7351cafa20ffcc51b3c8819a427caf1ddf5d7 100644 (file)
@@ -3913,36 +3913,29 @@ static void set_mflags(char *flags, member_flag_t * f)
 
 SWITCH_STANDARD_APP(conference_auto_function)
 {
-       switch_channel_t *channel = NULL;
+       switch_channel_t *channel = switch_core_session_get_channel(session);
        call_list_t *call_list, *np;
-       char *addition = (char *) data;
 
-       channel = switch_core_session_get_channel(session);
     switch_assert(channel != NULL);
 
        call_list = switch_channel_get_private(channel, "_conference_autocall_list_");
 
-       if (switch_strlen_zero(addition)) {
+       if (switch_strlen_zero(data)) {
                call_list = NULL;
        } else {
                np = switch_core_session_alloc(session, sizeof(*np));
                switch_assert(np != NULL);
 
-               np->string = switch_core_session_strdup(session, addition);
+               np->string = switch_core_session_strdup(session, data);
                if (call_list) {
                        np->next = call_list;
                        np->itteration = call_list->itteration + 1;
                } else {
                        np->itteration = 1;
                }
-
                call_list = np;
-               
        }
-       
        switch_channel_set_private(channel, "_conference_autocall_list_", call_list);
-       
-
 }
 
 /* Application interface function that is called from the dialplan to join the channel to a conference */