[PATCH 1/2] rename fdsetconv.c to spd_conv.c and move fdsetconv.h to spd_utils.h

[Andrei Kholodnyi]

fdsetconv was renamed to spd_conv.c to align naming in common dir
since spd_utils.h is used as a header for common dir,
put content of fdsetconv.h to this header
---
 include/Makefile.am                    |    2 +-
 include/fdsetconv.h                    |   28 ----------------------------
 include/spd_utils.h                    |   13 +++++++++++++
 src/common/Makefile.am                 |    2 +-
 src/common/{fdsetconv.c => spd_conv.c} |    8 +++++---
 src/modules/festival.c                 |    2 +-
 src/modules/module_utils.c             |    1 -
 src/server/configuration.c             |    2 +-
 src/server/output.c                    |    1 -
 9 files changed, 22 insertions(+), 37 deletions(-)
 delete mode 100644 include/fdsetconv.h
 rename src/common/{fdsetconv.c => spd_conv.c} (96%)

diff --git a/include/Makefile.am b/include/Makefile.am
index 4597166..8d8df94 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,4 +1,4 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_HEADERS = fdsetconv.h speechd_types.h spd_utils.h
+noinst_HEADERS = speechd_types.h spd_utils.h
 
diff --git a/include/fdsetconv.h b/include/fdsetconv.h
deleted file mode 100644
index 2a5809f..0000000
--- a/include/fdsetconv.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef FDSETCONV_H
-#define FDSETCONV_H
-
-#include <stdio.h>
-#include <string.h>
-#include <speechd_types.h>
-
-char* EVoice2str(EVoiceType voice);
-
-EVoiceType str2EVoice(char* str);
-
-char* EPunctMode2str(EPunctMode punct);
-
-EPunctMode str2EPunctMode(char* str);
-
-char* ESpellMode2str(ESpellMode spell);
-
-ESpellMode str2ESpellMode(char* str);
-
-char* ECapLetRecogn2str(ECapLetRecogn recogn);
-
-ECapLetRecogn ECapLetRecognstr2ECapLetRecogn(char* str);
-
-EVoiceType str2intpriority(char* str);
-
-ECapLetRecogn str2ECapLetRecogn(char* str);
-
-#endif
diff --git a/include/spd_utils.h b/include/spd_utils.h
index f07d13a..452f37e 100644
--- a/include/spd_utils.h
+++ b/include/spd_utils.h
@@ -26,5 +26,18 @@
 #include <stddef.h>
 #include <sys/types.h>
 
+#include <speechd_types.h>
+
 ssize_t spd_getline(char **lineptr, size_t * n, FILE * f);
+
+char* EVoice2str(EVoiceType voice);
+EVoiceType str2EVoice(char* str);
+char* EPunctMode2str(EPunctMode punct);
+EPunctMode str2EPunctMode(char* str);
+char* ESpellMode2str(ESpellMode spell);
+ESpellMode str2ESpellMode(char* str);
+char* ECapLetRecogn2str(ECapLetRecogn recogn);
+ECapLetRecogn ECapLetRecognstr2ECapLetRecogn(char* str);
+EVoiceType str2intpriority(char* str);
+ECapLetRecogn str2ECapLetRecogn(char* str);
 #endif /* SPD_UTILS_H */
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 68c5766..f938dc6 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -4,4 +4,4 @@ noinst_LTLIBRARIES = libcommon.la
 libcommon_la_CFLAGS = $(ERROR_CFLAGS)
 libcommon_la_CPPFLAGS = "-I$(top_srcdir)/include/" $(GLIB_CFLAGS)
 libcommon_la_LIBADD = $(GLIB_LIBS)
-libcommon_la_SOURCES = fdsetconv.c spd_getline.c
+libcommon_la_SOURCES = spd_conv.c spd_getline.c
diff --git a/src/common/fdsetconv.c b/src/common/spd_conv.c
similarity index 96%
rename from src/common/fdsetconv.c
rename to src/common/spd_conv.c
index 628912a..94f620e 100644
--- a/src/common/fdsetconv.c
+++ b/src/common/spd_conv.c
@@ -1,6 +1,6 @@
 
 /*
- * fdsetconv.c - Conversion of types for Speech Dispatcher
+ * spd_conv.c - Conversion of types for Speech Dispatcher
  *
  * Copyright (C) 2001, 2002, 2003 Brailcom, o.p.s.
  *
@@ -19,14 +19,16 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
- * $Id: fdsetconv.c,v 1.5 2007-06-21 20:09:45 hanke Exp $
  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-#include "fdsetconv.h"
+#include <string.h>
+
+#include <speechd_types.h>
+#include "spd_utils.h"
 
 char*
 EVoice2str(EVoiceType voice)
diff --git a/src/modules/festival.c b/src/modules/festival.c
index 2ef8520..12b7a3b 100644
--- a/src/modules/festival.c
+++ b/src/modules/festival.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 
 #include <speechd_types.h>
-#include "fdsetconv.h"
+#include "spd_utils.h"
 
 #include "festival_client.h"
 #include "module_utils.h"
diff --git a/src/modules/module_utils.c b/src/modules/module_utils.c
index 76b308c..7a5c8f6 100644
--- a/src/modules/module_utils.c
+++ b/src/modules/module_utils.c
@@ -25,7 +25,6 @@
 #include <config.h>
 #endif
 
-#include <fdsetconv.h>
 #include <spd_utils.h>
 #include "module_utils.h"
 
diff --git a/src/server/configuration.c b/src/server/configuration.c
index 952bf69..27211f9 100644
--- a/src/server/configuration.c
+++ b/src/server/configuration.c
@@ -30,7 +30,7 @@
 
 #include "speechd.h"
 #include "configuration.h"
-#include <fdsetconv.h>
+#include <spd_utils.h>
 
 static TFDSetClientSpecific *cl_spec_section;
 
diff --git a/src/server/output.c b/src/server/output.c
index 24db70c..145ebd1 100644
--- a/src/server/output.c
+++ b/src/server/output.c
@@ -25,7 +25,6 @@
 #include <config.h>
 #endif
 
-#include <fdsetconv.h>
 #include <spd_utils.h>
 #include "output.h"
 #include "parse.h"
-- 
1.6.0.4