From dbaf49926c74995dcbfc63686a10873fef80b33c Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Mon, 28 Apr 2014 14:38:38 -0400 Subject: [PATCH] remove unnecessary null check, we would have crashed already if that strdup failed --- src/mod/say/mod_say_de/mod_say_de.c | 4 +--- src/mod/say/mod_say_en/mod_say_en.c | 4 +--- src/mod/say/mod_say_es/mod_say_es.c | 4 +--- src/mod/say/mod_say_fa/mod_say_fa.c | 4 +--- src/mod/say/mod_say_fr/mod_say_fr.c | 4 +--- src/mod/say/mod_say_he/mod_say_he.c | 4 +--- src/mod/say/mod_say_hr/mod_say_hr.c | 4 +--- src/mod/say/mod_say_hu/mod_say_hu.c | 4 +--- src/mod/say/mod_say_it/mod_say_it.c | 4 +--- src/mod/say/mod_say_ja/mod_say_ja.c | 4 +--- src/mod/say/mod_say_nl/mod_say_nl.c | 4 +--- src/mod/say/mod_say_pl/mod_say_pl.c | 4 +--- src/mod/say/mod_say_pt/mod_say_pt.c | 8 +++----- src/mod/say/mod_say_ru/mod_say_ru.c | 4 +--- src/mod/say/mod_say_sv/mod_say_sv.c | 4 +--- src/mod/say/mod_say_th/mod_say_th.c | 4 +--- src/mod/say/mod_say_zh/mod_say_zh.c | 4 +--- 17 files changed, 19 insertions(+), 53 deletions(-) diff --git a/src/mod/say/mod_say_de/mod_say_de.c b/src/mod/say/mod_say_de/mod_say_de.c index 33ae35f936..ec5e2e9773 100644 --- a/src/mod/say/mod_say_de/mod_say_de.c +++ b/src/mod/say/mod_say_de/mod_say_de.c @@ -243,9 +243,7 @@ static switch_status_t de_say_time(switch_core_session_t *session, char *tosay, if ((p = strchr(tme, ':'))) { *p++ = '\0'; minutes = atoi(p); - if (tme) { - hours = atoi(tme); - } + hours = atoi(tme); } else { minutes = atoi(tme); } diff --git a/src/mod/say/mod_say_en/mod_say_en.c b/src/mod/say/mod_say_en/mod_say_en.c index 8d5a7a08f7..8ca7d25f76 100644 --- a/src/mod/say/mod_say_en/mod_say_en.c +++ b/src/mod/say/mod_say_en/mod_say_en.c @@ -208,9 +208,7 @@ static switch_status_t en_say_time(switch_say_file_handle_t *sh, char *tosay, sw if ((p = strchr(tme, ':'))) { *p++ = '\0'; minutes = atoi(p); - if (tme) { - hours = atoi(tme); - } + hours = atoi(tme); } else { minutes = atoi(tme); } diff --git a/src/mod/say/mod_say_es/mod_say_es.c b/src/mod/say/mod_say_es/mod_say_es.c index 20950aaf78..0516a280cb 100644 --- a/src/mod/say/mod_say_es/mod_say_es.c +++ b/src/mod/say/mod_say_es/mod_say_es.c @@ -237,9 +237,7 @@ static switch_status_t es_say_time(switch_core_session_t *session, char *tosay, if ((p = strchr(tme, ':'))) { *p++ = '\0'; minutes = atoi(p); - if (tme) { - hours = atoi(tme); - } + hours = atoi(tme); } else { minutes = atoi(tme); } diff --git a/src/mod/say/mod_say_fa/mod_say_fa.c b/src/mod/say/mod_say_fa/mod_say_fa.c index 0f13a2e242..37f456b14f 100644 --- a/src/mod/say/mod_say_fa/mod_say_fa.c +++ b/src/mod/say/mod_say_fa/mod_say_fa.c @@ -242,9 +242,7 @@ static switch_status_t fa_say_time(switch_core_session_t *session, char *tosay, if ((p = strchr(tme, ':'))) { *p++ = '\0'; minutes = atoi(p); - if (tme) { - hours = atoi(tme); - } + hours = atoi(tme); } else { minutes = atoi(tme); } diff --git a/src/mod/say/mod_say_fr/mod_say_fr.c b/src/mod/say/mod_say_fr/mod_say_fr.c index 9a9176da5f..1304c0401b 100644 --- a/src/mod/say/mod_say_fr/mod_say_fr.c +++ b/src/mod/say/mod_say_fr/mod_say_fr.c @@ -227,9 +227,7 @@ static switch_status_t fr_say_time(switch_core_session_t *session, char *tosay, if ((p = strchr(tme, ':'))) { *p++ = '\0'; minutes = atoi(p); - if (tme) { - hours = atoi(tme); - } + hours = atoi(tme); } else { minutes = atoi(tme); } diff --git a/src/mod/say/mod_say_he/mod_say_he.c b/src/mod/say/mod_say_he/mod_say_he.c index 7c09b2f738..ac5aef7f96 100644 --- a/src/mod/say/mod_say_he/mod_say_he.c +++ b/src/mod/say/mod_say_he/mod_say_he.c @@ -337,9 +337,7 @@ static switch_status_t he_say_time(switch_say_file_handle_t *sh, char *tosay, sw if ((p = strchr(tme, ':'))) { *p++ = '\0'; minutes = atoi(p); - if (tme) { - hours = atoi(tme); - } + hours = atoi(tme); } else { minutes = atoi(tme); } diff --git a/src/mod/say/mod_say_hr/mod_say_hr.c b/src/mod/say/mod_say_hr/mod_say_hr.c index b664819e27..b620eda860 100644 --- a/src/mod/say/mod_say_hr/mod_say_hr.c +++ b/src/mod/say/mod_say_hr/mod_say_hr.c @@ -486,9 +486,7 @@ static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay, if ((p = strchr(tme, ':'))) { *p++ = '\0'; minutes = atoi(p); - if (tme) { - hours = atoi(tme); - } + hours = atoi(tme); } else { minutes = atoi(tme); } diff --git a/src/mod/say/mod_say_hu/mod_say_hu.c b/src/mod/say/mod_say_hu/mod_say_hu.c index 1a0d0fe0c2..5e6a49b287 100644 --- a/src/mod/say/mod_say_hu/mod_say_hu.c +++ b/src/mod/say/mod_say_hu/mod_say_hu.c @@ -205,9 +205,7 @@ static switch_status_t hu_say_time(switch_core_session_t *session, char *tosay, if ((p = strchr(tme, ':'))) { *p++ = '\0'; minutes = atoi(p); - if (tme) { - hours = atoi(tme); - } + hours = atoi(tme); } else { minutes = atoi(tme); } diff --git a/src/mod/say/mod_say_it/mod_say_it.c b/src/mod/say/mod_say_it/mod_say_it.c index f64bcb3ec7..43f2a0bf70 100644 --- a/src/mod/say/mod_say_it/mod_say_it.c +++ b/src/mod/say/mod_say_it/mod_say_it.c @@ -251,9 +251,7 @@ static switch_status_t it_say_time(switch_core_session_t *session, char *tosay, if ((p = strchr(tme, ':'))) { *p++ = '\0'; minutes = atoi(p); - if (tme) { - hours = atoi(tme); - } + hours = atoi(tme); } else { minutes = atoi(tme); } diff --git a/src/mod/say/mod_say_ja/mod_say_ja.c b/src/mod/say/mod_say_ja/mod_say_ja.c index a7a3b8236e..69466ecbdf 100644 --- a/src/mod/say/mod_say_ja/mod_say_ja.c +++ b/src/mod/say/mod_say_ja/mod_say_ja.c @@ -268,9 +268,7 @@ static switch_status_t ja_say_time(switch_core_session_t *session, char *tosay, if ((p = strchr(tme, ':'))) { *p++ = '\0'; minutes = atoi(p); - if (tme) { - hours = atoi(tme); - } + hours = atoi(tme); } else { minutes = atoi(tme); } diff --git a/src/mod/say/mod_say_nl/mod_say_nl.c b/src/mod/say/mod_say_nl/mod_say_nl.c index 6784887188..a464280b0c 100644 --- a/src/mod/say/mod_say_nl/mod_say_nl.c +++ b/src/mod/say/mod_say_nl/mod_say_nl.c @@ -195,9 +195,7 @@ static switch_status_t nl_say_time(switch_core_session_t *session, char *tosay, if ((p = strchr(tme, ':'))) { *p++ = '\0'; minutes = atoi(p); - if (tme) { - hours = atoi(tme); - } + hours = atoi(tme); } else { minutes = atoi(tme); } diff --git a/src/mod/say/mod_say_pl/mod_say_pl.c b/src/mod/say/mod_say_pl/mod_say_pl.c index 9a299229c9..71ebeb311f 100644 --- a/src/mod/say/mod_say_pl/mod_say_pl.c +++ b/src/mod/say/mod_say_pl/mod_say_pl.c @@ -228,9 +228,7 @@ static switch_status_t pl_say_time(switch_say_file_handle_t *sh, char *tosay, sw if ((p = strchr(tme, ':'))) { *p++ = '\0'; minutes = atoi(p); - if (tme) { - hours = atoi(tme); - } + hours = atoi(tme); } else { minutes = atoi(tme); } diff --git a/src/mod/say/mod_say_pt/mod_say_pt.c b/src/mod/say/mod_say_pt/mod_say_pt.c index 460bf737bc..1a12914e4a 100644 --- a/src/mod/say/mod_say_pt/mod_say_pt.c +++ b/src/mod/say/mod_say_pt/mod_say_pt.c @@ -39,7 +39,7 @@ * * Anthony Minessale II * Michael B. Murdock - * António Silva + * António Silva * * mod_say_pt.c -- Say for Portuguese * @@ -184,7 +184,7 @@ static switch_status_t pt_say_general_count(switch_core_session_t *session, char switch (say_args->method) { case SSM_COUNTED: case SSM_PRONOUNCED: - /* specific case, one million => um milhão */ + /* specific case, one million => um milhão */ if (!places[8] && !places[7] && (places[6] == 1)) { say_file("digits/1.wav"); say_file("digits/million.wav"); @@ -233,9 +233,7 @@ static switch_status_t pt_say_time(switch_core_session_t *session, char *tosay, if ((p = strchr(tme, ':'))) { *p++ = '\0'; minutes = atoi(p); - if (tme) { - hours = atoi(tme); - } + hours = atoi(tme); } else { minutes = atoi(tme); } diff --git a/src/mod/say/mod_say_ru/mod_say_ru.c b/src/mod/say/mod_say_ru/mod_say_ru.c index ff1f08dbc7..04cd1df834 100644 --- a/src/mod/say/mod_say_ru/mod_say_ru.c +++ b/src/mod/say/mod_say_ru/mod_say_ru.c @@ -368,9 +368,7 @@ static switch_status_t ru_say_time(switch_say_file_handle_t *sh, char *tosay, sw if ((p = strchr(tme, ':'))) { *p++ = '\0'; minutes = atoi(p); - if (tme) { - hours = atoi(tme); - } + hours = atoi(tme); } else { minutes = atoi(tme); } diff --git a/src/mod/say/mod_say_sv/mod_say_sv.c b/src/mod/say/mod_say_sv/mod_say_sv.c index bba8f8cc28..b406838988 100644 --- a/src/mod/say/mod_say_sv/mod_say_sv.c +++ b/src/mod/say/mod_say_sv/mod_say_sv.c @@ -274,9 +274,7 @@ static switch_status_t sv_say_time(switch_say_file_handle_t *sh, char *tosay, sw if ((p = strchr(tme, ':'))) { *p++ = '\0'; minutes = atoi(p); - if (tme) { - hours = atoi(tme); - } + hours = atoi(tme); } else { minutes = atoi(tme); } diff --git a/src/mod/say/mod_say_th/mod_say_th.c b/src/mod/say/mod_say_th/mod_say_th.c index b51c004921..1ed0a83e21 100644 --- a/src/mod/say/mod_say_th/mod_say_th.c +++ b/src/mod/say/mod_say_th/mod_say_th.c @@ -257,9 +257,7 @@ static switch_status_t th_say_time(switch_core_session_t *session, char *tosay, if ((p = strchr(tme, ':'))) { *p++ = '\0'; minutes = atoi(p); - if (tme) { - hours = atoi(tme); - } + hours = atoi(tme); } else { minutes = atoi(tme); } diff --git a/src/mod/say/mod_say_zh/mod_say_zh.c b/src/mod/say/mod_say_zh/mod_say_zh.c index 289ebb7f5b..a9fa570de5 100644 --- a/src/mod/say/mod_say_zh/mod_say_zh.c +++ b/src/mod/say/mod_say_zh/mod_say_zh.c @@ -221,9 +221,7 @@ static switch_status_t zh_say_time(switch_core_session_t *session, char *tosay, if ((p = strchr(tme, ':'))) { *p++ = '\0'; minutes = atoi(p); - if (tme) { - hours = atoi(tme); - } + hours = atoi(tme); } else { minutes = atoi(tme); }