kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove constant conditionals (dead-code).

Browse Source 
Some variables are set and never changed, making them constant.  This
means that code in the 'false' block of the conditional is unreachable.

In chan_skinny and res_config_ldap I used preprocessor directive `#if 0`
as I'm unsure if the unreachable code could be enabled in the future.

Change-Id: I62e2aac353d739fb3c983cf768933120f5fba059
This commit is contained in:
Corey Farrell
2017-12-18 16:36:21 -05:00
parent 11a1e07ad2
commit b3e839debd
5 changed files with 19 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/manager_system.c
View File

@@ -42,7 +42,6 @@ static void manager_system_shutdown(void)
int manager_system_init(void)
{
int ret = 0;
struct stasis_topic *manager_topic;
struct stasis_topic *system_topic;
struct stasis_message_router *message_router;
@@ -67,13 +66,5 @@ int manager_system_init(void)
ast_register_cleanup(manager_system_shutdown);
/* If somehow we failed to add any routes, just shut down the whole
* thing and fail it.
*/
if (ret) {
manager_system_shutdown();
return -1;
}
return 0;
}

46
main/stdtime/localtime.c
View File

@@ -1506,16 +1506,14 @@ static int tzparse(const char *name, struct state *sp, const int lastditch)
}
} else {
long theirstdoffset;
long theirdstoffset;
long theiroffset;
int isdst;
int i;
int j;
if (*name != '\0')
return -1;
/*
** Initial values of theirstdoffset and theirdstoffset.
** Initial values of theirstdoffset.
*/
theirstdoffset = 0;
for (i = 0; i < sp->timecnt; ++i) {
@@ -1526,19 +1524,6 @@ static int tzparse(const char *name, struct state *sp, const int lastditch)
break;
}
}
theirdstoffset = 0;
for (i = 0; i < sp->timecnt; ++i) {
j = sp->types[i];
if (sp->ttis[j].tt_isdst) {
theirdstoffset =
-sp->ttis[j].tt_gmtoff;
break;
}
}
/*
** Initially we're assumed to be in standard time.
*/
isdst = FALSE;
theiroffset = theirstdoffset;
/*
** Now juggle transition times and types
@@ -1550,32 +1535,13 @@ static int tzparse(const char *name, struct state *sp, const int lastditch)
if (sp->ttis[j].tt_ttisgmt) {
/* No adjustment to transition time */
} else {
/*
** If summer time is in effect, and the
** transition time was not specified as
** standard time, add the summer time
** offset to the transition time;
** otherwise, add the standard time
** offset to the transition time.
*/
/*
** Transitions from DST to DDST
** will effectively disappear since
** POSIX provides for only one DST
** offset.
*/
if (isdst && !sp->ttis[j].tt_ttisstd) {
sp->ats[i] += dstoffset -
theirdstoffset;
} else {
sp->ats[i] += stdoffset -
theirstdoffset;
}
/* Add the standard time offset to the transition time. */
sp->ats[i] += stdoffset - theirstdoffset;
}
theiroffset = -sp->ttis[j].tt_gmtoff;
if (sp->ttis[j].tt_isdst)
theirdstoffset = theiroffset;
else theirstdoffset = theiroffset;
if (!sp->ttis[j].tt_isdst) {
theirstdoffset = theiroffset;
}
}
/*
** Finally, fill in ttis.

6
main/xmldoc.c
View File

@@ -1411,7 +1411,7 @@ static int xmldoc_parse_example(struct ast_xml_node *fixnode, struct ast_str **b
static int xmldoc_parse_specialtags(struct ast_xml_node *fixnode, const char *tabs, const char *posttabs, struct ast_str **buffer)
{
struct ast_xml_node *node = fixnode;
int ret = 0, i, count = 0;
int ret = 0, i;
if (!node || !ast_xml_node_get_children(node)) {
return ret;
@@ -1438,8 +1438,8 @@ static int xmldoc_parse_specialtags(struct ast_xml_node *fixnode, const char *ta
/* parse <para> elements inside special tags. */
for (node = ast_xml_node_get_children(node); node; node = ast_xml_node_get_next(node)) {
/* first <para> just print it without tabs at the begining. */
if ((xmldoc_parse_para(node, (!count ? "" : tabs), posttabs, buffer) == 2)
|| (xmldoc_parse_info(node, (!count ? "": tabs), posttabs, buffer) == 2)) {
if ((xmldoc_parse_para(node, "", posttabs, buffer) == 2)
|| (xmldoc_parse_info(node, "", posttabs, buffer) == 2)) {
ret = 2;
}
}