<p>Corey Farrell has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/7630">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Remove constant conditionals (dead-code).<br><br>Some variables are set and never changed, making them constant. This<br>means that code in the 'false' block of the conditional is unreachable.<br><br>In the case of chan_skinny I used preprocessor directive `#if 0` as I'm<br>unsure if the video handling could be enabled in the future.<br><br>Change-Id: I62e2aac353d739fb3c983cf768933120f5fba059<br>---<br>M channels/chan_skinny.c<br>M main/manager_system.c<br>M main/stdtime/localtime.c<br>M main/xmldoc.c<br>M res/res_config_ldap.c<br>5 files changed, 18 insertions(+), 78 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/30/7630/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c<br>index 6f4231a..0093a1f 100644<br>--- a/channels/chan_skinny.c<br>+++ b/channels/chan_skinny.c<br>@@ -4753,15 +4753,19 @@<br> {<br> struct skinny_line *l = sub->line;<br> struct skinny_device *d = l->device;<br>+#if 0<br> int hasvideo = 0;<br>+#endif<br> struct ast_sockaddr bindaddr_tmp;<br> <br> skinny_locksub(sub);<br> SKINNY_DEBUG(DEBUG_AUDIO, 3, "Sub %u - Starting RTP\n", sub->callid);<br> ast_sockaddr_from_sin(&bindaddr_tmp, &bindaddr);<br> sub->rtp = ast_rtp_instance_new("asterisk", sched, &bindaddr_tmp, NULL);<br>+#if 0<br> if (hasvideo)<br> sub->vrtp = ast_rtp_instance_new("asterisk", sched, &bindaddr_tmp, NULL);<br>+#endif<br> <br> if (sub->rtp) {<br> ast_rtp_instance_set_prop(sub->rtp, AST_RTP_PROPERTY_RTCP, 1);<br>@@ -4775,11 +4779,13 @@<br> ast_channel_set_fd(sub->owner, 0, ast_rtp_instance_fd(sub->rtp, 0));<br> ast_channel_set_fd(sub->owner, 1, ast_rtp_instance_fd(sub->rtp, 1));<br> }<br>+#if 0<br> if (hasvideo && sub->vrtp && sub->owner) {<br> ast_rtp_instance_set_channel_id(sub->vrtp, ast_channel_uniqueid(sub->owner));<br> ast_channel_set_fd(sub->owner, 2, ast_rtp_instance_fd(sub->vrtp, 0));<br> ast_channel_set_fd(sub->owner, 3, ast_rtp_instance_fd(sub->vrtp, 1));<br> }<br>+#endif<br> if (sub->rtp) {<br> ast_rtp_instance_set_qos(sub->rtp, qos.tos_audio, qos.cos_audio, "Skinny RTP");<br> ast_rtp_instance_set_prop(sub->rtp, AST_RTP_PROPERTY_NAT, l->nat);<br>diff --git a/main/manager_system.c b/main/manager_system.c<br>index b20deea..8ef15e3 100644<br>--- a/main/manager_system.c<br>+++ b/main/manager_system.c<br>@@ -42,7 +42,6 @@<br> <br> int manager_system_init(void)<br> {<br>- int ret = 0;<br> struct stasis_topic *manager_topic;<br> struct stasis_topic *system_topic;<br> struct stasis_message_router *message_router;<br>@@ -66,14 +65,6 @@<br> }<br> <br> ast_register_cleanup(manager_system_shutdown);<br>-<br>- /* If somehow we failed to add any routes, just shut down the whole<br>- * thing and fail it.<br>- */<br>- if (ret) {<br>- manager_system_shutdown();<br>- return -1;<br>- }<br> <br> return 0;<br> }<br>diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c<br>index 88b8020..eac199a 100644<br>--- a/main/stdtime/localtime.c<br>+++ b/main/stdtime/localtime.c<br>@@ -1506,16 +1506,14 @@<br> }<br> } else {<br> long theirstdoffset;<br>- long theirdstoffset;<br> long theiroffset;<br>- int isdst;<br> int i;<br> int j;<br> <br> if (*name != '\0')<br> return -1;<br> /*<br>- ** Initial values of theirstdoffset and theirdstoffset.<br>+ ** Initial values of theirstdoffset.<br> */<br> theirstdoffset = 0;<br> for (i = 0; i < sp->timecnt; ++i) {<br>@@ -1526,19 +1524,6 @@<br> break;<br> }<br> }<br>- theirdstoffset = 0;<br>- for (i = 0; i < sp->timecnt; ++i) {<br>- j = sp->types[i];<br>- if (sp->ttis[j].tt_isdst) {<br>- theirdstoffset =<br>- -sp->ttis[j].tt_gmtoff;<br>- break;<br>- }<br>- }<br>- /*<br>- ** Initially we're assumed to be in standard time.<br>- */<br>- isdst = FALSE;<br> theiroffset = theirstdoffset;<br> /*<br> ** Now juggle transition times and types<br>@@ -1550,32 +1535,13 @@<br> if (sp->ttis[j].tt_ttisgmt) {<br> /* No adjustment to transition time */<br> } else {<br>- /*<br>- ** If summer time is in effect, and the<br>- ** transition time was not specified as<br>- ** standard time, add the summer time<br>- ** offset to the transition time;<br>- ** otherwise, add the standard time<br>- ** offset to the transition time.<br>- */<br>- /*<br>- ** Transitions from DST to DDST<br>- ** will effectively disappear since<br>- ** POSIX provides for only one DST<br>- ** offset.<br>- */<br>- if (isdst && !sp->ttis[j].tt_ttisstd) {<br>- sp->ats[i] += dstoffset -<br>- theirdstoffset;<br>- } else {<br>- sp->ats[i] += stdoffset -<br>- theirstdoffset;<br>- }<br>+ /* Add the standard time offset to the transition time. */<br>+ sp->ats[i] += stdoffset - theirstdoffset;<br> }<br> theiroffset = -sp->ttis[j].tt_gmtoff;<br>- if (sp->ttis[j].tt_isdst)<br>- theirdstoffset = theiroffset;<br>- else theirstdoffset = theiroffset;<br>+ if (!sp->ttis[j].tt_isdst) {<br>+ theirstdoffset = theiroffset;<br>+ }<br> }<br> /*<br> ** Finally, fill in ttis.<br>diff --git a/main/xmldoc.c b/main/xmldoc.c<br>index e9a0afc..105bee0 100644<br>--- a/main/xmldoc.c<br>+++ b/main/xmldoc.c<br>@@ -1411,7 +1411,7 @@<br> static int xmldoc_parse_specialtags(struct ast_xml_node *fixnode, const char *tabs, const char *posttabs, struct ast_str **buffer)<br> {<br> struct ast_xml_node *node = fixnode;<br>- int ret = 0, i, count = 0;<br>+ int ret = 0, i;<br> <br> if (!node || !ast_xml_node_get_children(node)) {<br> return ret;<br>@@ -1438,8 +1438,8 @@<br> /* parse <para> elements inside special tags. */<br> for (node = ast_xml_node_get_children(node); node; node = ast_xml_node_get_next(node)) {<br> /* first <para> just print it without tabs at the begining. */<br>- if ((xmldoc_parse_para(node, (!count ? "" : tabs), posttabs, buffer) == 2)<br>- || (xmldoc_parse_info(node, (!count ? "": tabs), posttabs, buffer) == 2)) {<br>+ if ((xmldoc_parse_para(node, "", posttabs, buffer) == 2)<br>+ || (xmldoc_parse_info(node, "", posttabs, buffer) == 2)) {<br> ret = 2;<br> }<br> }<br>diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c<br>index 8f24a8d..6d17a39 100644<br>--- a/res/res_config_ldap.c<br>+++ b/res/res_config_ldap.c<br>@@ -309,11 +309,8 @@<br> BerElement *ber = NULL;<br> struct ast_variable *var = NULL;<br> struct ast_variable *prev = NULL;<br>- int is_delimited = 0;<br>- int i = 0;<br> char *ldap_attribute_name;<br> struct berval *value;<br>- int pos = 0;<br> <br> ldap_attribute_name = ldap_first_attribute(ldapConn, ldap_entry, &ber);<br> <br>@@ -338,34 +335,14 @@<br> ast_debug(2, "md5: %s\n", valptr);<br> }<br> if (valptr) {<br>- /* ok, so looping through all delimited values except the last one (not, last character is not delimited...) */<br>- if (is_delimited) {<br>- i = 0;<br>- pos = 0;<br>- while (!ast_strlen_zero(valptr + i)) {<br>- if (valptr[i] == ';') {<br>- valptr[i] = '\0';<br>- if (prev) {<br>- prev->next = ast_variable_new(attribute_name, &valptr[pos], table_config->table_name);<br>- if (prev->next) {<br>- prev = prev->next;<br>- }<br>- } else {<br>- prev = var = ast_variable_new(attribute_name, &valptr[pos], table_config->table_name);<br>- }<br>- pos = i + 1;<br>- }<br>- i++;<br>- }<br>- }<br>- /* for the last delimited value or if the value is not delimited: */<br>+ /* add the value to the list */<br> if (prev) {<br>- prev->next = ast_variable_new(attribute_name, &valptr[pos], table_config->table_name);<br>+ prev->next = ast_variable_new(attribute_name, valptr, table_config->table_name);<br> if (prev->next) {<br> prev = prev->next;<br> }<br> } else {<br>- prev = var = ast_variable_new(attribute_name, &valptr[pos], table_config->table_name);<br>+ prev = var = ast_variable_new(attribute_name, valptr, table_config->table_name);<br> }<br> }<br> }<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7630">change 7630</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/7630"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 15 </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I62e2aac353d739fb3c983cf768933120f5fba059 </div>
<div style="display:none"> Gerrit-Change-Number: 7630 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>