gcc 4.2 has a new set of warnings dealing with cosnt pointers. This set of

changes gets all of Asterisk (minus chan_alsa for now) to compile with gcc 4.2.
(closes issue #10774, patch from qwell)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@83432 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index d519664edf607790896b2e5fd1ba24c1d1477be7..2ae04f08dc783968ac5802467889a04dc978f36c 100644 (file)
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -303,9 +303,9 @@ static void oh323_destroy_peer(struct oh323_peer *peer)
        free(peer);
 }
 
-static int oh323_simulate_dtmf_end(void *data)
+static int oh323_simulate_dtmf_end(const void *data)
 {
-       struct oh323_pvt *pvt = data;
+       struct oh323_pvt *pvt = (struct oh323_pvt *)data;
 
        if (pvt) {
                ast_mutex_lock(&pvt->lock);

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 8fcf40139d3419b38ebeb793eaad63441fe19c0c..b9ab341e718a2035eafd2188905403707590098f 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -710,8 +710,8 @@ struct iax2_thread {
        int type;
        int iostate;
 #ifdef SCHED_MULTITHREADED
-       void (*schedfunc)(void *);
-       void *scheddata;
+       void (*schedfunc)(const void *);
+       const void *scheddata;
 #endif
 #ifdef DEBUG_SCHED_MULTITHREAD
        char curfunc[80];
@@ -812,7 +812,7 @@ static ast_mutex_t iaxsl[IAX_MAX_CALLS];
 static struct timeval lastused[IAX_MAX_CALLS];
 
 static enum ast_bridge_result iax2_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, struct ast_frame **fo, struct ast_channel **rc, int timeoutms);
-static int expire_registry(void *data);
+static int expire_registry(const void *data);
 static int iax2_answer(struct ast_channel *c);
 static int iax2_call(struct ast_channel *c, char *dest, int timeout);
 static int iax2_devicestate(void *data);
@@ -935,7 +935,7 @@ static struct iax2_thread *find_idle_thread(void)
 }
 
 #ifdef SCHED_MULTITHREADED
-static int __schedule_action(void (*func)(void *data), void *data, const char *funcname)
+static int __schedule_action(void (*func)(const void *data), const void *data, const char *funcname)
 {
        struct iax2_thread *thread = NULL;
        static time_t lasterror;
@@ -963,7 +963,7 @@ static int __schedule_action(void (*func)(void *data), void *data, const char *f
 #define schedule_action(func, data) __schedule_action(func, data, __PRETTY_FUNCTION__)
 #endif
 
-static int iax2_sched_add(struct sched_context *con, int when, ast_sched_cb callback, void *data)
+static int iax2_sched_add(struct sched_context *con, int when, ast_sched_cb callback, const void *data)
 {
        int res;
 
@@ -973,9 +973,9 @@ static int iax2_sched_add(struct sched_context *con, int when, ast_sched_cb call
        return res;
 }
 
-static int send_ping(void *data);
+static int send_ping(const void *data);
 
-static void __send_ping(void *data)
+static void __send_ping(const void *data)
 {
        int callno = (long)data;
        ast_mutex_lock(&iaxsl[callno]);
@@ -986,7 +986,7 @@ static void __send_ping(void *data)
        ast_mutex_unlock(&iaxsl[callno]);
 }
 
-static int send_ping(void *data)
+static int send_ping(const void *data)
 {
 #ifdef SCHED_MULTITHREADED
        if (schedule_action(__send_ping, data))
@@ -1007,9 +1007,9 @@ static int get_encrypt_methods(const char *s)
        return e;
 }
 
-static int send_lagrq(void *data);
+static int send_lagrq(const void *data);
 
-static void __send_lagrq(void *data)
+static void __send_lagrq(const void *data)
 {
        int callno = (long)data;
        /* Ping only if it's real not if it's bridged */
@@ -1021,7 +1021,7 @@ static void __send_lagrq(void *data)
        ast_mutex_unlock(&iaxsl[callno]);
 }
 
-static int send_lagrq(void *data)
+static int send_lagrq(const void *data)
 {
 #ifdef SCHED_MULTITHREADED
        if (schedule_action(__send_lagrq, data))
@@ -2033,12 +2033,12 @@ static int update_packet(struct iax_frame *f)
        return 0;
 }
 
-static int attempt_transmit(void *data);
-static void __attempt_transmit(void *data)
+static int attempt_transmit(const void *data);
+static void __attempt_transmit(const void *data)
 {
        /* Attempt to transmit the frame to the remote peer...
           Called without iaxsl held. */
-       struct iax_frame *f = data;
+       struct iax_frame *f = (struct iax_frame *)data;
        int freeme=0;
        int callno = f->callno;
        /* Make sure this call is still active */
@@ -2115,7 +2115,7 @@ static void __attempt_transmit(void *data)
        }
 }
 
-static int attempt_transmit(void *data)
+static int attempt_transmit(const void *data)
 {
 #ifdef SCHED_MULTITHREADED
        if (schedule_action(__attempt_transmit, data))
@@ -2136,7 +2136,7 @@ static int iax2_prune_realtime(int fd, int argc, char *argv[])
        } else if ((peer = find_peer(argv[3], 0))) {
                if(ast_test_flag(peer, IAX_RTCACHEFRIENDS)) {
                        ast_set_flag(peer, IAX_RTAUTOCLEAR);
-                       expire_registry((void *)peer->name);
+                       expire_registry((const void *)peer->name);
                        ast_cli(fd, "OK peer %s was removed from the cache.\n", argv[3]);
                } else {
                        ast_cli(fd, "SORRY peer %s is not eligible for this operation.\n", argv[3]);
@@ -2411,7 +2411,7 @@ static void unwrap_timestamp(struct iax_frame *fr)
        }
 }
 
-static int get_from_jb(void *p);
+static int get_from_jb(const void *p);
 
 static void update_jbsched(struct chan_iax2_pvt *pvt)
 {
@@ -2431,7 +2431,7 @@ static void update_jbsched(struct chan_iax2_pvt *pvt)
        pvt->jbid = iax2_sched_add(sched, when, get_from_jb, CALLNO_TO_PTR(pvt->callno));
 }
 
-static void __get_from_jb(void *p) 
+static void __get_from_jb(const void *p) 
 {
        int callno = PTR_TO_CALLNO(p);
        struct chan_iax2_pvt *pvt = NULL;
@@ -2508,7 +2508,7 @@ static void __get_from_jb(void *p)
        ast_mutex_unlock(&iaxsl[callno]);
 }
 
-static int get_from_jb(void *data)
+static int get_from_jb(const void *data)
 {
 #ifdef SCHED_MULTITHREADED
        if (schedule_action(__get_from_jb, data))
@@ -2914,7 +2914,7 @@ return_unref:
        return res;
 }
 
-static void __auto_congest(void *nothing)
+static void __auto_congest(const void *nothing)
 {
        int callno = PTR_TO_CALLNO(nothing);
        struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_CONGESTION };
@@ -2927,7 +2927,7 @@ static void __auto_congest(void *nothing)
        ast_mutex_unlock(&iaxsl[callno]);
 }
 
-static int auto_congest(void *data)
+static int auto_congest(const void *data)
 {
 #ifdef SCHED_MULTITHREADED
        if (schedule_action(__auto_congest, data))
@@ -5479,14 +5479,14 @@ static int authenticate_reply(struct chan_iax2_pvt *p, struct sockaddr_in *sin,
 
 static int iax2_do_register(struct iax2_registry *reg);
 
-static void __iax2_do_register_s(void *data)
+static void __iax2_do_register_s(const void *data)
 {
-       struct iax2_registry *reg = data;
+       struct iax2_registry *reg = (struct iax2_registry *)data;
        reg->expire = -1;
        iax2_do_register(reg);
 }
 
-static int iax2_do_register_s(void *data)
+static int iax2_do_register_s(const void *data)
 {
 #ifdef SCHED_MULTITHREADED
        if (schedule_action(__iax2_do_register_s, data))
@@ -5762,9 +5762,9 @@ static void register_peer_exten(struct iax2_peer *peer, int onoff)
 }
 static void prune_peers(void);
 
-static void __expire_registry(void *data)
+static void __expire_registry(const void *data)
 {
-       char *name = data;
+       const char *name = data;
        struct iax2_peer *peer = NULL;
        struct iax2_peer tmp_peer = {
                .name = name,
@@ -5797,7 +5797,7 @@ static void __expire_registry(void *data)
        peer_unref(peer);
 }
 
-static int expire_registry(void *data)
+static int expire_registry(const void *data)
 {
 #ifdef SCHED_MULTITHREADED
        if (schedule_action(__expire_registry, data))
@@ -5941,7 +5941,7 @@ static int update_registry(struct sockaddr_in *sin, int callno, char *devtype, i
                p->expiry = refresh;
        }
        if (p->expiry && sin->sin_addr.s_addr)
-               p->expire = iax2_sched_add(sched, (p->expiry + 10) * 1000, expire_registry, (void *)p->name);
+               p->expire = iax2_sched_add(sched, (p->expiry + 10) * 1000, expire_registry, (const void *)p->name);
        iax_ie_append_str(&ied, IAX_IE_USERNAME, p->name);
        iax_ie_append_int(&ied, IAX_IE_DATETIME, iax2_datetime(p->zonetag));
        if (sin->sin_addr.s_addr) {
@@ -6065,7 +6065,7 @@ static void stop_stuff(int callno)
        iax2_destroy_helper(iaxs[callno]);
 }
 
-static void __auth_reject(void *nothing)
+static void __auth_reject(const void *nothing)
 {
        /* Called from IAX thread only, without iaxs lock */
        int callno = (int)(long)(nothing);
@@ -6085,7 +6085,7 @@ static void __auth_reject(void *nothing)
        ast_mutex_unlock(&iaxsl[callno]);
 }
 
-static int auth_reject(void *data)
+static int auth_reject(const void *data)
 {
        int callno = (int)(long)(data);
        ast_mutex_lock(&iaxsl[callno]);
@@ -6115,7 +6115,7 @@ static int auth_fail(int callno, int failcode)
        return 0;
 }
 
-static void __auto_hangup(void *nothing)
+static void __auto_hangup(const void *nothing)
 {
        /* Called from IAX thread only, without iaxs lock */
        int callno = (int)(long)(nothing);
@@ -6130,7 +6130,7 @@ static void __auto_hangup(void *nothing)
        ast_mutex_unlock(&iaxsl[callno]);
 }
 
-static int auto_hangup(void *data)
+static int auto_hangup(const void *data)
 {
        int callno = (int)(long)(data);
        ast_mutex_lock(&iaxsl[callno]);
@@ -6179,15 +6179,15 @@ static void vnak_retransmit(int callno, int last)
        AST_LIST_UNLOCK(&iaxq.queue);
 }
 
-static void __iax2_poke_peer_s(void *data)
+static void __iax2_poke_peer_s(const void *data)
 {
-       struct iax2_peer *peer = data;
+       struct iax2_peer *peer = (struct iax2_peer *)data;
        iax2_poke_peer(peer, 0);
 }
 
-static int iax2_poke_peer_s(void *data)
+static int iax2_poke_peer_s(const void *data)
 {
-       struct iax2_peer *peer = data;
+       struct iax2_peer *peer = (struct iax2_peer *)data;
        peer->pokeexpire = -1;
 #ifdef SCHED_MULTITHREADED
        if (schedule_action(__iax2_poke_peer_s, data))
@@ -8460,9 +8460,9 @@ static int iax2_prov_cmd(int fd, int argc, char *argv[])
        return RESULT_SUCCESS;
 }
 
-static void __iax2_poke_noanswer(void *data)
+static void __iax2_poke_noanswer(const void *data)
 {
-       struct iax2_peer *peer = data;
+       struct iax2_peer *peer = (struct iax2_peer *)data;
        if (peer->lastms > -1) {
                ast_log(LOG_NOTICE, "Peer '%s' is now UNREACHABLE! Time: %d\n", peer->name, peer->lastms);
                manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "Peer: IAX2/%s\r\nPeerStatus: Unreachable\r\nTime: %d\r\n", peer->name, peer->lastms);
@@ -8479,9 +8479,9 @@ static void __iax2_poke_noanswer(void *data)
        peer->pokeexpire = iax2_sched_add(sched, peer->pokefreqnotok, iax2_poke_peer_s, peer);
 }
 
-static int iax2_poke_noanswer(void *data)
+static int iax2_poke_noanswer(const void *data)
 {
-       struct iax2_peer *peer = data;
+       struct iax2_peer *peer = (struct iax2_peer *)data;
        peer->pokeexpire = -1;
 #ifdef SCHED_MULTITHREADED
        if (schedule_action(__iax2_poke_noanswer, data))

diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index d504e36797d947a36ba978281a3e129e7b9bd328..3fa2bcf03e3fdeee135ff5d5ba6d19083d16f449 100644 (file)
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -604,7 +604,7 @@ static void mgcp_queue_control(struct mgcp_subchannel *sub, int control)
        return mgcp_queue_frame(sub, &f);
 }
 
-static int retrans_pkt(void *data)
+static int retrans_pkt(const void *data)
 {
        struct mgcp_gateway *gw = (struct mgcp_gateway *)data;
        struct mgcp_message *cur, *exq = NULL, *w, *prev;

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 41a0eada722de27ea041e709c4d39bc7e38ff9c5..e99464d9de3138d3a71a255593043048b799eca0 100644 (file)
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -613,7 +613,7 @@ static inline void misdn_tasks_wakeup (void)
        pthread_kill(misdn_tasks_thread, SIGUSR1);
 }
 
-static inline int _misdn_tasks_add_variable (int timeout, ast_sched_cb callback, void *data, int variable)
+static inline int _misdn_tasks_add_variable (int timeout, ast_sched_cb callback, const void *data, int variable)
 {
        int task_id;
 
@@ -626,12 +626,12 @@ static inline int _misdn_tasks_add_variable (int timeout, ast_sched_cb callback,
        return task_id;
 }
 
-static int misdn_tasks_add (int timeout, ast_sched_cb callback, void *data)
+static int misdn_tasks_add (int timeout, ast_sched_cb callback, const void *data)
 {
        return _misdn_tasks_add_variable(timeout, callback, data, 0);
 }
 
-static int misdn_tasks_add_variable (int timeout, ast_sched_cb callback, void *data)
+static int misdn_tasks_add_variable (int timeout, ast_sched_cb callback, const void *data)
 {
        return _misdn_tasks_add_variable(timeout, callback, data, 1);
 }
@@ -641,14 +641,14 @@ static void misdn_tasks_remove (int task_id)
        ast_sched_del(misdn_tasks, task_id);
 }
 
-static int misdn_l1_task (void *data)
+static int misdn_l1_task (const void *data)
 {
        misdn_lib_isdn_l1watcher(*(int *)data);
        chan_misdn_log(5, *(int *)data, "L1watcher timeout\n");
        return 1;
 }
 
-static int misdn_overlap_dial_task (void *data)
+static int misdn_overlap_dial_task (const void *data)
 {
        struct timeval tv_end, tv_now;
        int diff;

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index c365c00c7e9e3cea03f88d6282b71dbb108b6f13..ec06ca6499a5c80e517fccb6ee782a8beaed23f6 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1225,7 +1225,7 @@ static int sipsock_read(int *id, int fd, short events, void *ignore);
 static int __sip_xmit(struct sip_pvt *p, char *data, int len);
 static int __sip_reliable_xmit(struct sip_pvt *p, int seqno, int resp, char *data, int len, int fatal, int sipmethod);
 static int __transmit_response(struct sip_pvt *p, const char *msg, const struct sip_request *req, enum xmittype reliable);
-static int retrans_pkt(void *data);
+static int retrans_pkt(const void *data);
 static int transmit_sip_request(struct sip_pvt *p, struct sip_request *req);
 static int transmit_response_using_temp(ast_string_field callid, struct sockaddr_in *sin, int useglobal_nat, const int intended_method, const struct sip_request *req, const char *msg);
 static int transmit_response(struct sip_pvt *p, const char *msg, const struct sip_request *req);
@@ -1258,7 +1258,7 @@ static int does_peer_need_mwi(struct sip_peer *peer);
 /*--- Dialog management */
 static struct sip_pvt *sip_alloc(ast_string_field callid, struct sockaddr_in *sin,
                                 int useglobal_nat, const int intended_method);
-static int __sip_autodestruct(void *data);
+static int __sip_autodestruct(const void *data);
 static void sip_scheddestroy(struct sip_pvt *p, int ms);
 static void sip_cancel_destroy(struct sip_pvt *p);
 static void sip_destroy(struct sip_pvt *p);
@@ -1266,7 +1266,7 @@ static void __sip_destroy(struct sip_pvt *p, int lockowner);
 static void __sip_ack(struct sip_pvt *p, int seqno, int resp, int sipmethod);
 static void __sip_pretend_ack(struct sip_pvt *p);
 static int __sip_semi_ack(struct sip_pvt *p, int seqno, int resp, int sipmethod);
-static int auto_congest(void *nothing);
+static int auto_congest(const void *nothing);
 static int update_call_counter(struct sip_pvt *fup, int event);
 static int hangup_sip2cause(int cause);
 static const char *hangup_cause2sip(int cause);
@@ -1321,7 +1321,7 @@ static struct sip_auth *find_realm_authentication(struct sip_auth *authlist, con
 /*--- Misc functions */
 static int sip_do_reload(enum channelreloadreason reason);
 static int reload_config(enum channelreloadreason reason);
-static int expire_register(void *data);
+static int expire_register(const void *data);
 static void *do_monitor(void *data);
 static int restart_monitor(void);
 static int sip_send_mwi_to_peer(struct sip_peer *peer);
@@ -1334,7 +1334,7 @@ static int attempt_transfer(struct sip_dual *transferer, struct sip_dual *target
 /*--- Device monitoring and Device/extension state handling */
 static int cb_extensionstate(char *context, char* exten, int state, void *data);
 static int sip_devicestate(void *data);
-static int sip_poke_noanswer(void *data);
+static int sip_poke_noanswer(const void *data);
 static int sip_poke_peer(struct sip_peer *peer);
 static void sip_poke_all_peers(void);
 static void sip_peer_hold(struct sip_pvt *p, int hold);
@@ -1413,14 +1413,14 @@ static int update_call_counter(struct sip_pvt *fup, int event);
 static void sip_destroy_peer(struct sip_peer *peer);
 static void sip_destroy_user(struct sip_user *user);
 static int sip_poke_peer(struct sip_peer *peer);
-static int sip_poke_peer_s(void *data);
+static int sip_poke_peer_s(const void *data);
 static void set_peer_defaults(struct sip_peer *peer);
 static struct sip_peer *temp_peer(const char *name);
 static void register_peer_exten(struct sip_peer *peer, int onoff);
 static struct sip_peer *find_peer(const char *peer, struct sockaddr_in *sin, int realtime);
 static struct sip_user *find_user(const char *name, int realtime);
 static enum parse_register_result parse_register_contact(struct sip_pvt *pvt, struct sip_peer *p, struct sip_request *req);
-static int expire_register(void *data);
+static int expire_register(const void *data);
 static void reg_source_db(struct sip_peer *peer);
 static void destroy_association(struct sip_peer *peer);
 static int handle_common_options(struct ast_flags *flags, struct ast_flags *mask, struct ast_variable *v);
@@ -1437,9 +1437,9 @@ static int ast_sip_ouraddrfor(struct in_addr *them, struct in_addr *us);
 static void sip_registry_destroy(struct sip_registry *reg);
 static int sip_register(char *value, int lineno);
 static char *regstate2str(enum sipregistrystate regstate) attribute_const;
-static int sip_reregister(void *data);
+static int sip_reregister(const void *data);
 static int __sip_do_register(struct sip_registry *r);
-static int sip_reg_timeout(void *data);
+static int sip_reg_timeout(const void *data);
 static void sip_send_all_registers(void);
 
 /*--- Parsing SIP requests and responses */
@@ -1881,9 +1881,9 @@ static void append_history_full(struct sip_pvt *p, const char *fmt, ...)
 }
 
 /*! \brief Retransmit SIP message if no answer (Called from scheduler) */
-static int retrans_pkt(void *data)
+static int retrans_pkt(const void *data)
 {
-       struct sip_pkt *pkt = data, *prev, *cur = NULL;
+       struct sip_pkt *pkt = (struct sip_pkt *)data, *prev, *cur = NULL;
        int reschedule = DEFAULT_RETRANS;
        int xmitres = 0;
 
@@ -2054,9 +2054,9 @@ static enum sip_result __sip_reliable_xmit(struct sip_pvt *p, int seqno, int res
 }
 
 /*! \brief Kill a SIP dialog (called by scheduler) */
-static int __sip_autodestruct(void *data)
+static int __sip_autodestruct(const void *data)
 {
-       struct sip_pvt *p = data;
+       struct sip_pvt *p = (struct sip_pvt *)data;
 
        /* If this is a subscription, tell the phone that we got a timeout */
        if (p->subscribed) {
@@ -2868,9 +2868,9 @@ static int create_addr(struct sip_pvt *dialog, const char *opeer)
 }
 
 /*! \brief Scheduled congestion on a call */
-static int auto_congest(void *nothing)
+static int auto_congest(const void *nothing)
 {
-       struct sip_pvt *p = nothing;
+       struct sip_pvt *p = (struct sip_pvt *)nothing;
 
        ast_mutex_lock(&p->lock);
        p->initid = -1;
@@ -7279,7 +7279,7 @@ static char *regstate2str(enum sipregistrystate regstate)
 }
 
 /*! \brief Update registration with SIP Proxy */
-static int sip_reregister(void *data) 
+static int sip_reregister(const void *data) 
 {
        /* if we are here, we know that we need to reregister. */
        struct sip_registry *r= ASTOBJ_REF((struct sip_registry *) data);
@@ -7311,7 +7311,7 @@ static int __sip_do_register(struct sip_registry *r)
 }
 
 /*! \brief Registration timeout, register again */
-static int sip_reg_timeout(void *data)
+static int sip_reg_timeout(const void *data)
 {
 
        /* if we are here, our registration timed out, so we'll just do it over */
@@ -7716,9 +7716,9 @@ static void destroy_association(struct sip_peer *peer)
 }
 
 /*! \brief Expire registration of SIP peer */
-static int expire_register(void *data)
+static int expire_register(const void *data)
 {
-       struct sip_peer *peer = data;
+       struct sip_peer *peer = (struct sip_peer *)data;
        
        if (!peer)              /* Hmmm. We have no peer. Weird. */
                return 0;
@@ -7745,9 +7745,9 @@ static int expire_register(void *data)
 }
 
 /*! \brief Poke peer (send qualify to check if peer is alive and well) */
-static int sip_poke_peer_s(void *data)
+static int sip_poke_peer_s(const void *data)
 {
-       struct sip_peer *peer = data;
+       struct sip_peer *peer = (struct sip_peer *)data;
 
        peer->pokeexpire = -1;
        sip_poke_peer(peer);
@@ -15442,9 +15442,9 @@ static int restart_monitor(void)
 }
 
 /*! \brief React to lack of answer to Qualify poke */
-static int sip_poke_noanswer(void *data)
+static int sip_poke_noanswer(const void *data)
 {
-       struct sip_peer *peer = data;
+       struct sip_peer *peer = (struct sip_peer *)data;
        
        peer->pokeexpire = -1;
        if (peer->lastms > -1) {

diff --git a/channels/misdn_config.c b/channels/misdn_config.c
index 6755a5e73780a15b829afad00acf792fe574d839..d30b4589bd46a45439456cd94d78022487aabe07 100644 (file)
--- a/channels/misdn_config.c
+++ b/channels/misdn_config.c
@@ -1000,7 +1000,7 @@ void misdn_cfg_update_ptp (void)
 
        misdn_cfg_get(0, MISDN_GEN_MISDN_INIT, &misdn_init, sizeof(misdn_init));
 
-       if (misdn_init) {
+       if (!ast_strlen_zero(misdn_init)) {
                fp = fopen(misdn_init, "r");
                if (fp) {
                        while(fgets(line, sizeof(line), fp)) {

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 7035b57462f5fbb40a19738a461f6f464cfab98a..eaf50d42a686d8302d18b220d30f92d29e9ee409 100644 (file)
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -367,7 +367,7 @@ struct ast_channel {
        int oldwriteformat;                             /*!< Original writer format */
        
        int timingfd;                                   /*!< Timing fd */
-       int (*timingfunc)(void *data);
+       int (*timingfunc)(const void *data);
        void *timingdata;
 
        enum ast_channel_state _state;                  /*!< State of line -- Don't write directly, use ast_setstate */
@@ -1135,7 +1135,7 @@ int ast_autoservice_stop(struct ast_channel *chan);
 
 /* If built with zaptel optimizations, force a scheduled expiration on the
    timer fd, at which point we call the callback function / data */
-int ast_settimeout(struct ast_channel *c, int samples, int (*func)(void *data), void *data);
+int ast_settimeout(struct ast_channel *c, int samples, int (*func)(const void *data), void *data);
 
 /*!    \brief Transfer a channel (if supported).  Returns -1 on error, 0 if not supported
    and 1 if supported and requested 

diff --git a/include/asterisk/sched.h b/include/asterisk/sched.h
index 00dc7a0a200a3b3906b1806a342085ef9e42d606..7489c6377c668bcbba4fca87483c50f29e5e1e45 100644 (file)
--- a/include/asterisk/sched.h
+++ b/include/asterisk/sched.h
@@ -55,7 +55,7 @@ void sched_context_destroy(struct sched_context *c);
  * \return returns a 0 if it should not be run again, or non-zero if it should be
  * rescheduled to run again
  */
-typedef int (*ast_sched_cb)(void *data);
+typedef int (*ast_sched_cb)(const void *data);
 #define AST_SCHED_CB(a) ((ast_sched_cb)(a))
 
 /*! \brief Adds a scheduled event
@@ -69,7 +69,7 @@ typedef int (*ast_sched_cb)(void *data);
  * \param data data to pass to the callback
  * \return Returns a schedule item ID on success, -1 on failure
  */
-int ast_sched_add(struct sched_context *con, int when, ast_sched_cb callback, void *data);
+int ast_sched_add(struct sched_context *con, int when, ast_sched_cb callback, const void *data);
 
 /*!Adds a scheduled event with rescheduling support
  * \param con Scheduler context to add
@@ -84,7 +84,7 @@ int ast_sched_add(struct sched_context *con, int when, ast_sched_cb callback, vo
  * If callback returns 0, no further events will be re-scheduled
  * \return Returns a schedule item ID on success, -1 on failure
  */
-int ast_sched_add_variable(struct sched_context *con, int when, ast_sched_cb callback, void *data, int variable);
+int ast_sched_add_variable(struct sched_context *con, int when, ast_sched_cb callback, const void *data, int variable);
 
 /*! \brief Deletes a scheduled event
  * Remove this event from being run.  A procedure should not remove its

diff --git a/main/ast_expr2.fl b/main/ast_expr2.fl
index 5990a66ed63debbcf2aaccf458fdc5ac87c83791..db09850b8ca7464d280881bd99a2af288c57ce2b 100644 (file)
--- a/main/ast_expr2.fl
+++ b/main/ast_expr2.fl
@@ -89,7 +89,7 @@ struct parse_io
 void ast_yyset_column(int column_no, yyscan_t yyscanner);
 int ast_yyget_column(yyscan_t yyscanner);
 static int curlycount = 0;
-static char *expr2_token_subst(char *mess);
+static char *expr2_token_subst(const char *mess);
 %}
 
 %option prefix="ast_yy"
@@ -323,11 +323,11 @@ static char *expr2_token_equivs2[] =
 };
 
 
-static char *expr2_token_subst(char *mess)
+static char *expr2_token_subst(const char *mess)
 {
        /* calc a length, malloc, fill, and return; yyerror had better free it! */
        int len=0,i;
-       char *p;
+       const char *p;
        char *res, *s,*t;
        int expr2_token_equivs_entries = sizeof(expr2_token_equivs1)/sizeof(char*);
 
@@ -372,7 +372,7 @@ int ast_yyerror (const char *s,  yyltype *loc, struct parse_io *parseio )
        char spacebuf[8000]; /* best safe than sorry */
        char spacebuf2[8000]; /* best safe than sorry */
        int i=0;
-       char *s2 = expr2_token_subst((char *)s);
+       char *s2 = expr2_token_subst(s);
        spacebuf[0] = 0;
        
        for(i=0;i< (int)(yytext - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);i++) spacebuf2[i] = ' ';  /* uh... assuming yyg is defined, then I can use the yycolumn macro,

diff --git a/main/ast_expr2f.c b/main/ast_expr2f.c
index bebe38f2df6c15ea857af31663c2908830e34cfc..708ccfb8700f63151ad23e6432a65c2d5b34838e 100644 (file)
--- a/main/ast_expr2f.c
+++ b/main/ast_expr2f.c
@@ -1409,7 +1409,7 @@ struct parse_io
 void ast_yyset_column(int column_no, yyscan_t yyscanner);
 int ast_yyget_column(yyscan_t yyscanner);
 static int curlycount = 0;
-static char *expr2_token_subst(char *mess);
+static char *expr2_token_subst(const char *mess);
 
 #line 1415 "ast_expr2f.c"
 
@@ -3229,11 +3229,11 @@ static char *expr2_token_equivs2[] =
 };
 
 
-static char *expr2_token_subst(char *mess)
+static char *expr2_token_subst(const char *mess)
 {
        /* calc a length, malloc, fill, and return; yyerror had better free it! */
        int len=0,i;
-       char *p;
+       const char *p;
        char *res, *s,*t;
        int expr2_token_equivs_entries = sizeof(expr2_token_equivs1)/sizeof(char*);
 
@@ -3278,7 +3278,7 @@ int ast_yyerror (const char *s,  yyltype *loc, struct parse_io *parseio )
        char spacebuf[8000]; /* best safe than sorry */
        char spacebuf2[8000]; /* best safe than sorry */
        int i=0;
-       char *s2 = expr2_token_subst((char *)s);
+       char *s2 = expr2_token_subst(s);
        spacebuf[0] = 0;
        
        for(i=0;i< (int)(yytext - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);i++) spacebuf2[i] = ' ';  /* uh... assuming yyg is defined, then I can use the yycolumn macro,

diff --git a/main/cdr.c b/main/cdr.c
index d69db17786e6dc56a58bb6338785302b09f40303..5aa7a24f1c7a81a0bb14b5dcc5d68afe88a72eed 100644 (file)
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -1130,7 +1130,7 @@ void ast_cdr_submit_batch(int shutdown)
        }
 }
 
-static int submit_scheduled_batch(void *data)
+static int submit_scheduled_batch(const void *data)
 {
        ast_cdr_submit_batch(0);
        /* manually reschedule from this point in time */

diff --git a/main/channel.c b/main/channel.c
index eaa325d32974051d0c55eef6e496bdf123a79a66..1ffa0641613916d56b93061a1779e3f2217b6a6f 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -1833,13 +1833,13 @@ void ast_deactivate_generator(struct ast_channel *chan)
        ast_channel_unlock(chan);
 }
 
-static int generator_force(void *data)
+static int generator_force(const void *data)
 {
        /* Called if generator doesn't have data */
        void *tmp;
        int res;
        int (*generate)(struct ast_channel *chan, void *tmp, int datalen, int samples);
-       struct ast_channel *chan = data;
+       struct ast_channel *chan = (struct ast_channel *)data;
        tmp = chan->generatordata;
        chan->generatordata = NULL;
        generate = chan->generator->generate;
@@ -2057,7 +2057,7 @@ int ast_waitfordigit(struct ast_channel *c, int ms)
        return ast_waitfordigit_full(c, ms, -1, -1);
 }
 
-int ast_settimeout(struct ast_channel *c, int samples, int (*func)(void *data), void *data)
+int ast_settimeout(struct ast_channel *c, int samples, int (*func)(const void *data), void *data)
 {
        int res = -1;
 #ifdef HAVE_ZAPTEL
@@ -2253,7 +2253,7 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
                        ioctl(chan->timingfd, ZT_TIMERACK, &blah);
                        if (chan->timingfunc) {
                                /* save a copy of func/data before unlocking the channel */
-                               int (*func)(void *) = chan->timingfunc;
+                               int (*func)(const void *) = chan->timingfunc;
                                void *data = chan->timingdata;
                                ast_channel_unlock(chan);
                                func(data);

diff --git a/main/db1-ast/hash/hash.c b/main/db1-ast/hash/hash.c
index a28cb8b6327222cb484591ee5473b5fad59d75ea..47dc52a0ed315ce583a8357122a2e634183bfa49 100644 (file)
--- a/main/db1-ast/hash/hash.c
+++ b/main/db1-ast/hash/hash.c
@@ -68,7 +68,7 @@ static void *hash_realloc __P((SEGMENT **, int, int));
 static int   hash_seq __P((const DB *, DBT *, DBT *, u_int32_t));
 static int   hash_sync __P((const DB *, u_int32_t));
 static int   hdestroy __P((HTAB *));
-static HTAB *init_hash __P((HTAB *, const char *, HASHINFO *));
+static HTAB *init_hash __P((HTAB *, const char *, const HASHINFO *));
 static int   init_htab __P((HTAB *, int));
 #if BYTE_ORDER == LITTLE_ENDIAN
 static void  swap_header __P((HTAB *));
@@ -133,7 +133,7 @@ __hash_open(file, flags, mode, info, dflags)
                (void)fcntl(hashp->fp, F_SETFD, 1);
        }
        if (new_table) {
-               if (!(hashp = init_hash(hashp, file, (HASHINFO *)info)))
+               if (!(hashp = init_hash(hashp, file, info)))
                        RETURN_ERROR(errno, error1);
        } else {
                /* Table already exists */
@@ -280,7 +280,7 @@ static HTAB *
 init_hash(hashp, file, info)
        HTAB *hashp;
        const char *file;
-       HASHINFO *info;
+       const HASHINFO *info;
 {
 #ifdef _STATBUF_ST_BLKSIZE
        struct stat statbuf;

diff --git a/main/dnsmgr.c b/main/dnsmgr.c
index 043b9e685735876464aeb9034c5efa977231230e..f44751b979d3eb27db193259d502705ac6dc75a2 100644 (file)
--- a/main/dnsmgr.c
+++ b/main/dnsmgr.c
@@ -220,9 +220,9 @@ static void *do_refresh(void *data)
        return NULL;
 }
 
-static int refresh_list(void *data)
+static int refresh_list(const void *data)
 {
-       struct refresh_info *info = data;
+       struct refresh_info *info = (struct refresh_info *)data;
        struct ast_dnsmgr_entry *entry;
 
        /* if a refresh or reload is already in progress, exit now */

diff --git a/main/file.c b/main/file.c
index 443cb24d4ac396b2a008781154c8ff562bcf9e6f..65dd5e1b91fbbff81339bc76e7c6f54d4f28c77d 100644 (file)
--- a/main/file.c
+++ b/main/file.c
@@ -620,7 +620,7 @@ enum fsread_res {
        FSREAD_SUCCESS_NOSCHED,
 };
 
-static int ast_fsread_audio(void *data);
+static int ast_fsread_audio(const void *data);
 
 static enum fsread_res ast_readaudio_callback(struct ast_filestream *s)
 {
@@ -659,9 +659,9 @@ return_failure:
        return FSREAD_FAILURE;
 }
 
-static int ast_fsread_audio(void *data)
+static int ast_fsread_audio(const void *data)
 {
-       struct ast_filestream *fs = data;
+       struct ast_filestream *fs = (struct ast_filestream *)data;
        enum fsread_res res;
 
        res = ast_readaudio_callback(fs);
@@ -672,7 +672,7 @@ static int ast_fsread_audio(void *data)
        return 0;
 }
 
-static int ast_fsread_video(void *data);
+static int ast_fsread_video(const void *data);
 
 static enum fsread_res ast_readvideo_callback(struct ast_filestream *s)
 {
@@ -698,9 +698,9 @@ static enum fsread_res ast_readvideo_callback(struct ast_filestream *s)
        return FSREAD_SUCCESS_SCHED;
 }
 
-static int ast_fsread_video(void *data)
+static int ast_fsread_video(const void *data)
 {
-       struct ast_filestream *fs = data;
+       struct ast_filestream *fs = (struct ast_filestream *)data;
        enum fsread_res res;
 
        res = ast_readvideo_callback(fs);

diff --git a/main/rtp.c b/main/rtp.c
index f4b05857072e9e3c25ec542e795c620596bd5502..39f8c85ecd1db819ecd3e102359a34570345af71 100644 (file)
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -175,10 +175,10 @@ struct ast_rtp {
 };
 
 /* Forward declarations */
-static int ast_rtcp_write(void *data);
+static int ast_rtcp_write(const void *data);
 static void timeval2ntp(struct timeval tv, unsigned int *msw, unsigned int *lsw);
-static int ast_rtcp_write_sr(void *data);
-static int ast_rtcp_write_rr(void *data);
+static int ast_rtcp_write_sr(const void *data);
+static int ast_rtcp_write_rr(const void *data);
 static unsigned int ast_rtcp_calc_interval(struct ast_rtp *rtp);
 static int ast_rtp_senddigit_continuation(struct ast_rtp *rtp);
 int ast_rtp_senddigit_end(struct ast_rtp *rtp, char digit);
@@ -2307,9 +2307,9 @@ int ast_rtcp_send_h261fur(void *data)
 }
 
 /*! \brief Send RTCP sender's report */
-static int ast_rtcp_write_sr(void *data)
+static int ast_rtcp_write_sr(const void *data)
 {
-       struct ast_rtp *rtp = data;
+       struct ast_rtp *rtp = (struct ast_rtp *)data;
        int res;
        int len = 0;
        struct timeval now;
@@ -2421,9 +2421,9 @@ static int ast_rtcp_write_sr(void *data)
 }
 
 /*! \brief Send RTCP recepient's report */
-static int ast_rtcp_write_rr(void *data)
+static int ast_rtcp_write_rr(const void *data)
 {
-       struct ast_rtp *rtp = data;
+       struct ast_rtp *rtp = (struct ast_rtp *)data;
        int res;
        int len = 32;
        unsigned int lost;
@@ -2520,9 +2520,9 @@ static int ast_rtcp_write_rr(void *data)
 /*! \brief Write and RTCP packet to the far end
  * \note Decide if we are going to send an SR (with Reception Block) or RR 
  * RR is sent if we have not sent any rtp packets in the previous interval */
-static int ast_rtcp_write(void *data)
+static int ast_rtcp_write(const void *data)
 {
-       struct ast_rtp *rtp = data;
+       struct ast_rtp *rtp = (struct ast_rtp *)data;
        int res;
        
        if (!rtp || !rtp->rtcp)

diff --git a/main/sched.c b/main/sched.c
index abc5b3da1e42a9055eaedf7e3dde5b9a47f9cfeb..04589a0186c189575c2962d6a5602be428d2bca8 100644 (file)
--- a/main/sched.c
+++ b/main/sched.c
@@ -56,7 +56,7 @@ struct sched {
        struct timeval when;          /*!< Absolute time event should take place */
        int resched;                  /*!< When to reschedule */
        int variable;                 /*!< Use return value from callback to reschedule */
-       void *data;                   /*!< Data */
+       const void *data;             /*!< Data */
        ast_sched_cb callback;        /*!< Callback */
 };
 
@@ -211,7 +211,7 @@ static int sched_settime(struct timeval *tv, int when)
 /*! \brief
  * Schedule callback(data) to happen when ms into the future
  */
-int ast_sched_add_variable(struct sched_context *con, int when, ast_sched_cb callback, void *data, int variable)
+int ast_sched_add_variable(struct sched_context *con, int when, ast_sched_cb callback, const void *data, int variable)
 {
        struct sched *tmp;
        int res = -1;
@@ -244,7 +244,7 @@ int ast_sched_add_variable(struct sched_context *con, int when, ast_sched_cb cal
        return res;
 }
 
-int ast_sched_add(struct sched_context *con, int when, ast_sched_cb callback, void *data)
+int ast_sched_add(struct sched_context *con, int when, ast_sched_cb callback, const void *data)
 {
        return ast_sched_add_variable(con, when, callback, data, 0);
 }

diff --git a/pbx/ael/ael.tab.c b/pbx/ael/ael.tab.c
index cca6a39be9db373affbeca7e3fce5bf744723176..ba66f196fd317e4f77463fb1bd09f9313978122f 100644 (file)
--- a/pbx/ael/ael.tab.c
+++ b/pbx/ael/ael.tab.c
@@ -199,7 +199,7 @@ extern char *my_file;
 #ifdef AAL_ARGCHECK
 int ael_is_funcname(char *name);
 #endif
-static char *ael_token_subst(char *mess);
+static char *ael_token_subst(const char *mess);
 
 
 
@@ -3232,11 +3232,11 @@ static char *token_equivs2[] =
 };
 
 
-static char *ael_token_subst(char *mess)
+static char *ael_token_subst(const char *mess)
 {
        /* calc a length, malloc, fill, and return; yyerror had better free it! */
        int len=0,i;
-       char *p;
+       const char *p;
        char *res, *s,*t;
        int token_equivs_entries = sizeof(token_equivs1)/sizeof(char*);
 
@@ -3277,7 +3277,7 @@ static char *ael_token_subst(char *mess)
 
 void yyerror(YYLTYPE *locp, struct parse_io *parseio,  char const *s)
 {
-       char *s2 = ael_token_subst((char *)s);
+       char *s2 = ael_token_subst(s);
        if (locp->first_line == locp->last_line) {
                ast_log(LOG_ERROR, "==== File: %s, Line %d, Cols: %d-%d: Error: %s\n", my_file, locp->first_line, locp->first_column, locp->last_column, s2);
        } else {

diff --git a/pbx/ael/ael.y b/pbx/ael/ael.y
index 04df00c1a61468e9017acf62ac2217983c2cab4d..7cc758d7c532626f43e73ed3b98eeb0f6e4c387f 100644 (file)
--- a/pbx/ael/ael.y
+++ b/pbx/ael/ael.y
@@ -46,7 +46,7 @@ extern char *my_file;
 #ifdef AAL_ARGCHECK
 int ael_is_funcname(char *name);
 #endif
-static char *ael_token_subst(char *mess);
+static char *ael_token_subst(const char *mess);
 
 %}
 
@@ -705,11 +705,11 @@ static char *token_equivs2[] =
 };
 
 
-static char *ael_token_subst(char *mess)
+static char *ael_token_subst(const char *mess)
 {
        /* calc a length, malloc, fill, and return; yyerror had better free it! */
        int len=0,i;
-       char *p;
+       const char *p;
        char *res, *s,*t;
        int token_equivs_entries = sizeof(token_equivs1)/sizeof(char*);
 
@@ -750,7 +750,7 @@ static char *ael_token_subst(char *mess)
 
 void yyerror(YYLTYPE *locp, struct parse_io *parseio,  char const *s)
 {
-       char *s2 = ael_token_subst((char *)s);
+       char *s2 = ael_token_subst(s);
        if (locp->first_line == locp->last_line) {
                ast_log(LOG_ERROR, "==== File: %s, Line %d, Cols: %d-%d: Error: %s\n", my_file, locp->first_line, locp->first_column, locp->last_column, s2);
        } else {

diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index 8384b4d94aa96252d4a8d509044d83ac348b2ddf..ea3b91cb5188c8a7c89ff81551427c6588eec2dc 100644 (file)
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -1277,9 +1277,9 @@ static void apply_peer(struct dundi_transaction *trans, struct dundi_peer *p)
 }
 
 /*! \note Called with the peers list already locked */
-static int do_register_expire(void *data)
+static int do_register_expire(const void *data)
 {
-       struct dundi_peer *peer = data;
+       struct dundi_peer *peer = (struct dundi_peer *)data;
        char eid_str[20];
        ast_log(LOG_DEBUG, "Register expired for '%s'\n", dundi_eid_to_str(eid_str, sizeof(eid_str), &peer->eid));
        peer->registerexpire = -1;
@@ -2954,12 +2954,11 @@ static void destroy_trans(struct dundi_transaction *trans, int fromtimeout)
                free(trans);
 }
 
-static int dundi_rexmit(void *data)
+static int dundi_rexmit(const void *data)
 {
-       struct dundi_packet *pack;
+       struct dundi_packet *pack = (struct dundi_packet *)data;
        int res;
        AST_LIST_LOCK(&peers);
-       pack = data;
        if (pack->retrans < 1) {
                pack->retransid = -1;
                if (!ast_test_flag(pack->parent, FLAG_ISQUAL))
@@ -3049,9 +3048,9 @@ static int dundi_send(struct dundi_transaction *trans, int cmdresp, int flags, i
        return -1;
 }
 
-static int do_autokill(void *data)
+static int do_autokill(const void *data)
 {
-       struct dundi_transaction *trans = data;
+       struct dundi_transaction *trans = (struct dundi_transaction *)data;
        char eid_str[20];
        ast_log(LOG_NOTICE, "Transaction to '%s' took too long to ACK, destroying\n", 
                dundi_eid_to_str(eid_str, sizeof(eid_str), &trans->them_eid));
@@ -4023,10 +4022,10 @@ static void build_mapping(char *name, char *value)
 }
 
 /* \note Called with the peers list already locked */
-static int do_register(void *data)
+static int do_register(const void *data)
 {
        struct dundi_ie_data ied;
-       struct dundi_peer *peer = data;
+       struct dundi_peer *peer = (struct dundi_peer *)data;
        char eid_str[20];
        char eid_str2[20];
        ast_log(LOG_DEBUG, "Register us as '%s' to '%s'\n", dundi_eid_to_str(eid_str, sizeof(eid_str), &peer->us_eid), dundi_eid_to_str(eid_str2, sizeof(eid_str2), &peer->eid));
@@ -4049,10 +4048,9 @@ static int do_register(void *data)
        return 0;
 }
 
-static int do_qualify(void *data)
+static int do_qualify(const void *data)
 {
-       struct dundi_peer *peer;
-       peer = data;
+       struct dundi_peer *peer = (struct dundi_peer *)data;
        peer->qualifyid = -1;
        qualify_peer(peer, 0);
        return 0;

diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index e58cbda49e0de912c83bc327bf72573881f4d112..0439d6bc8f1110c4b718f4f8ac35fddcb736373c 100644 (file)
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -667,7 +667,7 @@ static int parse_config(void)
                dbport = atoi(s);
        }
 
-       if (dbhost && !(s = ast_variable_retrieve(config, "general", "dbsock"))) {
+       if (!ast_strlen_zero(dbhost) && !(s = ast_variable_retrieve(config, "general", "dbsock"))) {
                ast_log(LOG_WARNING,
                                "Postgresql RealTime: No database socket found, using '/tmp/pgsql.sock' as default.\n");
                strcpy(dbsock, "/tmp/pgsql.sock");
@@ -676,7 +676,7 @@ static int parse_config(void)
        }
        ast_config_destroy(config);
 
-       if (dbhost) {
+       if (!ast_strlen_zero(dbhost)) {
                ast_log(LOG_DEBUG, "Postgresql RealTime Host: %s\n", dbhost);
                ast_log(LOG_DEBUG, "Postgresql RealTime Port: %i\n", dbport);
        } else {
@@ -702,7 +702,7 @@ static int pgsql_reconnect(const char *database)
                pgsqlConn = NULL;
        }
 
-       if ((!pgsqlConn) && (dbhost || dbsock) && dbuser && dbpass && my_database) {
+       if ((!pgsqlConn) && (!ast_strlen_zero(dbhost) || !ast_strlen_zero(dbsock)) && !ast_strlen_zero(dbuser) && !ast_strlen_zero(dbpass) && !ast_strlen_zero(my_database)) {
                char *connInfo = NULL;
                unsigned int size = 100 + strlen(dbhost)
                        + strlen(dbuser)
@@ -744,15 +744,15 @@ static int realtime_pgsql_status(int fd, int argc, char **argv)
        int ctime = time(NULL) - connect_time;
 
        if (pgsqlConn && PQstatus(pgsqlConn) == CONNECTION_OK) {
-               if (dbhost) {
+               if (!ast_strlen_zero(dbhost)) {
                        snprintf(status, 255, "Connected to %s@%s, port %d", dbname, dbhost, dbport);
-               } else if (dbsock) {
+               } else if (!ast_strlen_zero(dbsock)) {
                        snprintf(status, 255, "Connected to %s on socket file %s", dbname, dbsock);
                } else {
                        snprintf(status, 255, "Connected to %s@%s", dbname, dbhost);
                }
 
-               if (dbuser && *dbuser) {
+               if (!ast_strlen_zero(dbuser)) {
                        snprintf(status2, 99, " with username %s", dbuser);
                }
 

diff --git a/utils/ael_main.c b/utils/ael_main.c
index 7ac50d2c21a674cf5ad0dfbf22060921e68cf87c..80d17af8d993875ba2b4d5382cccd8e2c1a08848 100644 (file)
--- a/utils/ael_main.c
+++ b/utils/ael_main.c
@@ -58,8 +58,8 @@ void destroy_namelist(struct namelist *x)
        }
 }
 
-struct namelist *create_name(char *name);
-struct namelist *create_name(char *name)
+struct namelist *create_name(const char *name);
+struct namelist *create_name(const char *name)
 {
        struct namelist *x = calloc(1, sizeof(*x));
        if (!x)
@@ -286,12 +286,12 @@ int ast_add_extension2(struct ast_context *con,
 
 void pbx_builtin_setvar(void *chan, void *data)
 {
-       struct namelist *x = create_name((char*)data);
+       struct namelist *x = create_name(data);
        if(!no_comp)
                printf("Executed pbx_builtin_setvar(chan, data=%s);\n", (char*)data);
 
        if( dump_extensions ) {
-               x = create_name((char*)data);
+               x = create_name(data);
                ADD_LAST(globalvars,x);
        }
 }
@@ -318,7 +318,7 @@ void ast_context_add_ignorepat2(struct ast_context *con, const char *value, cons
                printf("Executed ast_context_add_ignorepat2(con, value=%s, registrar=%s);\n", value, registrar);
        if( dump_extensions ) {
                struct namelist *x;
-               x = create_name((char*)value);
+               x = create_name(value);
                ADD_LAST(con->ignorepats,x);
        }
 }