[PATCH 1/1] remove module_write_data_ok

[Andrei Kholodnyi]

module_write_data_ok was used in each synth's module_speak
to check data for consistency before speaking.
Since module_speak is called only once it is obviously better to do such a
check before it in module_utils.c.
module_write_data_ok used nowhere else, so it is removed.
---
 src/modules/cicero.c       |    2 --
 src/modules/dummy.c        |    2 --
 src/modules/espeak.c       |    4 ----
 src/modules/festival.c     |    3 ---
 src/modules/flite.c        |    2 --
 src/modules/generic.c      |    3 ---
 src/modules/ibmtts.c       |    2 --
 src/modules/ivona.c        |    2 --
 src/modules/module_utils.c |   25 +++++++------------------
 src/modules/module_utils.h |    1 -
 10 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/src/modules/cicero.c b/src/modules/cicero.c
index 75103ec..1feff02 100644
--- a/src/modules/cicero.c
+++ b/src/modules/cicero.c
@@ -253,8 +253,6 @@ module_speak(gchar *data, size_t bytes, EMessageType 
msgtype)
     return 0;
   }
 
-  if(module_write_data_ok(data) != 0) return -1;
-  
   DBG("Requested data: |%s|\n", data);
 
   if (*cicero_message != NULL){
diff --git a/src/modules/dummy.c b/src/modules/dummy.c
index cb4a666..7c98745 100644
--- a/src/modules/dummy.c
+++ b/src/modules/dummy.c
@@ -121,8 +121,6 @@ module_speak(gchar *data, size_t bytes, EMessageType 
msgtype)
         return 0;
     }
 
-    if(module_write_data_ok(data) != 0) return -1;
-
     DBG("Requested data: |%s|\n", data);
        
     /* Send semaphore signal to the speaking thread */
diff --git a/src/modules/espeak.c b/src/modules/espeak.c
index c0a7742..c81f5d4 100644
--- a/src/modules/espeak.c
+++ b/src/modules/espeak.c
@@ -346,10 +346,6 @@ module_speak(gchar *data, size_t bytes, EMessageType 
msgtype)
                return FALSE;
        }
 
-       if (0 != module_write_data_ok(data)){
-         pthread_mutex_unlock(&espeak_state_mutex);
-         return FATAL_ERROR;
-       }
        DBG("Espeak: Requested data: |%s| %d %lu", data, msgtype, (unsigned 
long) bytes);
 
        espeak_state_reset();
diff --git a/src/modules/festival.c b/src/modules/festival.c
index 546a732..12df03d 100644
--- a/src/modules/festival.c
+++ b/src/modules/festival.c
@@ -337,9 +337,6 @@ module_speak(char *data, size_t bytes, EMessageType msgtype)
 
     festival_stop_request = 0;
 
-    /* Check the parameters */
-    if(module_write_data_ok(data) != 0) return -1;
-
     festival_message_type = msgtype;
     if ((msgtype == MSGTYPE_TEXT) && (msg_settings.spelling_mode == 
SPELLING_ON))
         festival_message_type = MSGTYPE_SPELL;
diff --git a/src/modules/flite.c b/src/modules/flite.c
index dd4f4fe..42d102d 100644
--- a/src/modules/flite.c
+++ b/src/modules/flite.c
@@ -176,8 +176,6 @@ module_speak(gchar *data, size_t bytes, EMessageType 
msgtype)
         return 0;
     }
 
-    if(module_write_data_ok(data) != 0) return -1;
-
     DBG("Requested data: |%s|\n", data);
 
     if (*flite_message != NULL){
diff --git a/src/modules/generic.c b/src/modules/generic.c
index 61d1b8d..6ef1815 100644
--- a/src/modules/generic.c
+++ b/src/modules/generic.c
@@ -198,9 +198,6 @@ module_speak(gchar *data, size_t bytes, EMessageType 
msgtype)
         return 0;
     }
 
-
-    if(module_write_data_ok(data) != 0) return -1;
-
     UPDATE_STRING_PARAMETER(language, generic_set_language);
     UPDATE_PARAMETER(voice, generic_set_voice);
     UPDATE_PARAMETER(punctuation_mode, generic_set_punct);
diff --git a/src/modules/ibmtts.c b/src/modules/ibmtts.c
index f7c8a6d..41628c6 100644
--- a/src/modules/ibmtts.c
+++ b/src/modules/ibmtts.c
@@ -568,8 +568,6 @@ module_speak(gchar *data, size_t bytes, EMessageType 
msgtype)
         return IBMTTS_FALSE;
     }
 
-       if (0 != module_write_data_ok(data)) return FATAL_ERROR;
-
        DBG("Ibmtts: Type: %d, bytes: %d, requested data: |%s|\n", msgtype, 
bytes, data);
 
        xfree(*ibmtts_message);    
diff --git a/src/modules/ivona.c b/src/modules/ivona.c
index 6beed34..5b5e28d 100644
--- a/src/modules/ivona.c
+++ b/src/modules/ivona.c
@@ -194,8 +194,6 @@ module_speak(gchar *data, size_t bytes, EMessageType 
msgtype)
         return 0;
     }
 
-    if(module_write_data_ok(data) != 0) return -1;
-
     DBG("Requested data: |%s|\n", data);
 
     if (*ivona_message != NULL){
diff --git a/src/modules/module_utils.c b/src/modules/module_utils.c
index 0c7a453..aaa6b52 100644
--- a/src/modules/module_utils.c
+++ b/src/modules/module_utils.c
@@ -155,6 +155,13 @@ do_message(EMessageType msgtype)
        msg = g_string_new(" ");
     }
 
+    /* no sure we need this check here at all */
+    if (msg->str == NULL || msg->str[0] == 0){
+       DBG("requested data NULL or empty\n");
+       g_string_free(msg, TRUE);
+       return strdup("301 ERROR CANT SPEAK");
+    }
+
     ret = module_speak(msg->str, strlen(msg->str), msgtype);
 
     g_string_free(msg,1);
@@ -922,24 +929,6 @@ set_speaking_thread_parameters()
     pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);                  
        
 }
 
-
-int
-module_write_data_ok(char *data)
-{
-    /* Tests */
-    if(data == NULL){
-        DBG("requested data NULL\n");          
-        return -1;
-    }
-
-    if(data[0] == 0){
-        DBG("requested data empty\n");
-        return -1;
-    }
-
-    return 0;
-}
-
 int
 module_terminate_thread(pthread_t thread)
 {
diff --git a/src/modules/module_utils.h b/src/modules/module_utils.h
index bfdccde..785ac75 100644
--- a/src/modules/module_utils.h
+++ b/src/modules/module_utils.h
@@ -240,7 +240,6 @@ size_t module_parent_wfork(TModuleDoublePipe dpipe, const 
char* message, EMessag
 int module_parent_wait_continue(TModuleDoublePipe dpipe);
 
 void set_speaking_thread_parameters();
-int module_write_data_ok(char *data);
 int module_terminate_thread(pthread_t thread);
 sem_t* module_semaphore_init();
 char * module_recode_to_iso(char *data, int bytes, char *language, char 
*fallback);
-- 
1.6.0.4