Fixed several compiler warnings

[lcr.git] / apppbx.cpp

diff --git a/apppbx.cpp b/apppbx.cpp
index 8df43f6..b976393 100644 (file)
--- a/apppbx.cpp
+++ b/apppbx.cpp
@@ -1389,8 +1389,8 @@ void EndpointAppPBX::port_setup(struct port_list *portlist, int message_type, un
        /* screen incoming caller id */
        if (e_callerinfo.interface[0]) {
                do_screen(0, e_callerinfo.id, sizeof(e_callerinfo.id), &e_callerinfo.ntype, &e_callerinfo.present, e_callerinfo.interface);
-               do_screen(0, e_callerinfo.id2, sizeof(e_callerinfo.id2), &e_callerinfo.ntype2, &e_callerinfo.present2, e_callerinfo.interface);
-               do_screen(0, e_redirinfo.id, sizeof(e_redirinfo.id), &e_redirinfo.ntype, &e_redirinfo.present, e_callerinfo.interface);
+               if (e_callerinfo.id2[0]) do_screen(0, e_callerinfo.id2, sizeof(e_callerinfo.id2), &e_callerinfo.ntype2, &e_callerinfo.present2, e_callerinfo.interface);
+               if (e_redirinfo.id[0]) do_screen(0, e_redirinfo.id, sizeof(e_redirinfo.id), &e_redirinfo.ntype, &e_redirinfo.present, e_callerinfo.interface);
        }
 
        /* process extension */
@@ -3391,10 +3391,8 @@ void EndpointAppPBX::pick_join(char *extensions)
        class Join *join;
        class JoinPBX *joinpbx;
        struct join_relation *relation;
-       int vbox;
 
        /* find an endpoint that is ringing internally or vbox with higher priority */
-       vbox = 0;
        found = NULL;
        eapp = apppbx_first;
        while(eapp) {
@@ -3405,7 +3403,6 @@ void EndpointAppPBX::pick_join(char *extensions)
                                        if (port->p_type == PORT_TYPE_VBOX_OUT) {
                                                if (match_list(extensions, eapp->e_ext.number)) {
                                                        found = eapp;
-                                                       vbox = 1;
                                                        break;
                                                }
                                        }