remove unnecessary null check, we would have crashed already if that strdup failed

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 33ae35f9360e976c7eb6f7d6d9bee9f6bec96408..ec5e2e97735411cd3166a2afc73b1ff9ea2135db 100644 (file)
--- 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 8d5a7a08f7c43260684caad92ab389dafc5452ab..8ca7d25f76478aac8eaefb1e536a260274c70bf3 100644 (file)
--- 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 20950aaf7810d3cb8b2edb8058441ccf850584c9..0516a280cb95e1f2f7bb809959e88eff4a8027f4 100644 (file)
--- 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 0f13a2e242dbd5cc7298a4362dc1455a47db3401..37f456b14fc5f3478d9e5aaa04a93081f088581d 100644 (file)
--- 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 9a9176da5f8c3959916ba42407c7710fc7d416e0..1304c0401b598abce9f6b5e42f5cc2d2455c657e 100644 (file)
--- 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 7c09b2f738e14d287b1aebd2b158d44a31954bca..ac5aef7f9640b1fc2796074ff3b6a08bf2342aaa 100644 (file)
--- 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 b664819e271e58f75a6c3b50fd758b2d38032584..b620eda86035325ca6726396f0dd785daddb330c 100644 (file)
--- 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 1a0d0fe0c2650c5c486893bed7061a34a2a7c180..5e6a49b287db23cb9c0866d774cc6a1e0b2e9282 100644 (file)
--- 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 f64bcb3ec7364c97bd1ce52e9988df5768fc9d28..43f2a0bf70641656f8df727eeb6b5d4c87ff7ab2 100644 (file)
--- 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 a7a3b8236efe06c85b44d0ef34cf70d5d0eb0d69..69466ecbdf7bf4420d851b218e83861256aa2f78 100644 (file)
--- 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 6784887188631bac24d172022bf803955440959c..a464280b0c6fd6c063b8caf0be5b5de8033a2d59 100644 (file)
--- 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 9a299229c92a718dd555bc12ca2d2d174cf2705c..71ebeb311f64c13111499087cc8f492838b2276d 100644 (file)
--- 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 460bf737bc87be28f1afd9f00323dbeb7b4b0ca9..1a12914e4a6630fb18ccf7bfcbbe51b386d29c6f 100644 (file)
--- 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 @@
  * \r
  * Anthony Minessale II <anthm@freeswitch.org>\r
  * Michael B. Murdock <mike@mmurdock.org>\r
- * António Silva <asilva@wirelessmundi.com>\r
+ * António Silva <asilva@wirelessmundi.com>\r
  *\r
  * mod_say_pt.c -- Say for Portuguese\r
  *\r
@@ -184,7 +184,7 @@ static switch_status_t pt_say_general_count(switch_core_session_t *session, char
                switch (say_args->method) {\r
                case SSM_COUNTED:\r
                case SSM_PRONOUNCED:\r
-                       /* 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, ':'))) {\r
                                        *p++ = '\0';\r
                                        minutes = atoi(p);\r
-                                       if (tme) {\r
-                                               hours = atoi(tme);\r
-                                       }\r
+                                       hours = atoi(tme);\r
                                } else {\r
                                        minutes = atoi(tme);\r
                                }\r

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 ff1f08dbc7831cee03e3a5394997544e258911fa..04cd1df834f08511f43883a5afd346e232e55279 100644 (file)
--- 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 bba8f8cc28eff481a013d3701f29ba3c3f86dc01..b406838988d04eae94f7b0bd9b202bf74820fc26 100644 (file)
--- 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 b51c0049211df492fa70ab1d064423d3957a50c2..1ed0a83e215b983e9121a122fc7111d3f4f32f3b 100644 (file)
--- 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 289ebb7f5b83b3c0940abf876d387b36d5c1f233..a9fa570de59bb82ba5d87e1cc63cdb163ca3aa32 100644 (file)
--- 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);
                                }