]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
[mod_say_xx] Fix multiple dead assignments 417/head
authorAndrey Volk <andywolk@gmail.com>
Tue, 25 Feb 2020 19:53:45 +0000 (23:53 +0400)
committerAndrey Volk <andywolk@gmail.com>
Tue, 25 Feb 2020 19:53:45 +0000 (23:53 +0400)
src/mod/say/mod_say_hr/mod_say_hr.c
src/mod/say/mod_say_hu/mod_say_hu.c
src/mod/say/mod_say_nl/mod_say_nl.c
src/mod/say/mod_say_pl/mod_say_pl.c
src/mod/say/mod_say_ru/mod_say_ru.c
src/mod/say/mod_say_sv/mod_say_sv.c

index 5f5b9a99a44bf3b5645b0898da064f1fa0807671..f996c7424d1e3252903f0a39e230121072612d3e 100644 (file)
@@ -752,7 +752,6 @@ static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay,
 
        if (say_date) {
                say_year = say_month = say_day = say_dow = 1;
-               say_today = say_yesterday = 0;
        }
 
        if (say_day) {
index c35be1bc5993e02ed25aa3426dd754d1f119ffab..839fe47421a33d36ba68da30ce6c8ac70ed9a671 100644 (file)
@@ -326,7 +326,6 @@ static switch_status_t hu_say_time(switch_core_session_t *session, char *tosay,
 
        if (say_date) {
                say_year = say_month = say_day = say_dow = 1;
-               say_today = say_yesterday = 0;
        }
 
        if (say_year) {
index 770e7cbf215bfe7a4fb9ba446f9d6230cb4958a9..78f398bc7c49dd5ee44854858eb266c665cfd005 100644 (file)
@@ -188,7 +188,7 @@ static switch_status_t nl_say_time(switch_core_session_t *session, char *tosay,
        if (say_args->type == SST_TIME_MEASUREMENT) {
                int64_t hours = 0;
                int64_t minutes = 0;
-               int64_t seconds = 0;
+               int64_t seconds;
                int64_t r = 0;
 
                if (strchr(tosay, ':')) {
@@ -197,7 +197,6 @@ static switch_status_t nl_say_time(switch_core_session_t *session, char *tosay,
 
                        if ((p = strrchr(tme, ':'))) {
                                *p++ = '\0';
-                               seconds = atoi(p);
                                if ((p = strchr(tme, ':'))) {
                                        *p++ = '\0';
                                        minutes = atoi(p);
@@ -215,8 +214,6 @@ static switch_status_t nl_say_time(switch_core_session_t *session, char *tosay,
 
                        if (seconds >= 60) {
                                minutes = seconds / 60;
-                               r = seconds % 60;
-                               seconds = r;
                        }
 
                        if (minutes >= 60) {
index 68546f9410ea64484178fb5de077f9429a592dfa..02fb4e15a366e9c892c7d5e2681950a5751d6097 100644 (file)
@@ -385,7 +385,6 @@ static switch_status_t pl_say_time(switch_say_file_handle_t *sh, char *tosay, sw
 
        if (say_date) {
                say_year = say_month = say_day = say_dow = 1;
-               say_today = say_yesterday = 0;
        }
 
        if (say_day) {
index b4759442721f35a04435f2b82fae065575fd0779..74c6c5c216ac5605abf2f6490427d6c2520d25f9 100644 (file)
@@ -381,7 +381,6 @@ static switch_status_t ru_say_time(switch_say_file_handle_t *sh, char *tosay, sw
 
                        if (seconds >= 60) {
                                minutes = seconds / 60;
-                               r = seconds % 60;
                        }
 
                        if (minutes >= 60) {
@@ -503,7 +502,6 @@ static switch_status_t ru_say_time(switch_say_file_handle_t *sh, char *tosay, sw
        }
        if (say_date) {
                say_year = say_month = say_day = say_dow = 1;
-               say_today = say_yesterday = 0;
        }
        if (say_day) {
                switch_snprintf(buf, sizeof(buf), "%u", (unsigned) tm.tm_mday);
index b3fd2dcfebd61a2cb4bece859a7b8b209bb1ba66..7a2311b013ef3dae5d9e7604d00f0703addc2242 100644 (file)
@@ -416,7 +416,6 @@ static switch_status_t sv_say_time(switch_say_file_handle_t *sh, char *tosay, sw
 
         if (say_date) {
                 say_year = say_month = say_day = say_dow = 1;
-                say_today = say_yesterday = 0;
         }
 
         if (say_month) {