2 files changed, 14 insertions, 22 deletions

diff --git a/plugin.c b/plugin.c
index 8070b0a..b2f924b 100644
--- a/plugin.c
+++ b/plugin.c
@@ -1,4 +1,4 @@
-/* $Id: plugin.c,v 1.42 2006/07/29 21:12:31 lfcorreia Exp $
+/* $Id: plugin.c,v 1.43 2006/07/30 11:29:02 lfcorreia Exp $
  *
  * plugin handler for the Evaluator
  *
@@ -23,6 +23,9 @@
  *
  *
  * $Log: plugin.c,v $
+ * Revision 1.43  2006/07/30 11:29:02  lfcorreia
+ * Make changes suggested by Michael, only one init function is needed
+ *
  * Revision 1.42  2006/07/29 21:12:31  lfcorreia
  * Add UPPERCASE string plugin function
  *
@@ -221,8 +224,6 @@ int plugin_init_math(void);
 void plugin_exit_math(void);
 int plugin_init_string(void);
 void plugin_exit_string(void);
-int plugin_init_strupper(void);
-void plugin_exit_strupper(void);
 int plugin_init_test(void);
 void plugin_exit_test(void);
 int plugin_init_time(void);
diff --git a/plugin_string.c b/plugin_string.c
index 464d9e8..7684f67 100644
--- a/plugin_string.c
+++ b/plugin_string.c
@@ -1,4 +1,4 @@
-/* $Id: plugin_string.c,v 1.9 2006/07/29 21:12:31 lfcorreia Exp $
+/* $Id: plugin_string.c,v 1.10 2006/07/30 11:29:02 lfcorreia Exp $
  *
  * string plugin
  *
@@ -23,6 +23,9 @@
  *
  *
  * $Log: plugin_string.c,v $
+ * Revision 1.10  2006/07/30 11:29:02  lfcorreia
+ * Make changes suggested by Michael, only one init function is needed
+ *
  * Revision 1.9  2006/07/29 21:12:31  lfcorreia
  * Add UPPERCASE string plugin function
  *
@@ -85,21 +88,6 @@ static void my_strlen(RESULT * result, RESULT * arg1)
     SetResult(&result, R_NUMBER, &value);
 }
 
-
-int plugin_init_string(void)
-{
-
-    /* register some basic string functions */
-    AddFunction("strlen", 1, my_strlen);
-
-    return 0;
-}
-
-void plugin_exit_string(void)
-{
-    /* empty */
-}
-
 /* 'upcase' function (shamelessly stolen from plugin_sample.c)*/
 /* takes one argument, a string */
 /* returns the string in upper case letters */
@@ -127,16 +115,19 @@ static void my_upcase(RESULT * result, RESULT * arg1)
     free(value);
 }
 
-int plugin_init_strupper(void)
+int plugin_init_string(void)
 {
 
+    /* register some basic string functions */
+    AddFunction("strlen", 1, my_strlen);
+
     /* register my UPPERCASE transforming function */
     AddFunction("strupper", 1, my_upcase);
 
     return 0;
 }
 
-void plugin_exit_strupper(void)
+void plugin_exit_string(void)
 {
     /* empty */
-}
+}
\ No newline at end of file