[Ayttm-commits] CVS: ayttm/modules/utility autotrans.c,1.7,1.8 middle.c,1.4,1.5 notes.c,1.4,1.5 rainbow.c,1.5,1.6

[Andy Maloney <address@hidden>]

Update of /cvsroot/ayttm/ayttm/modules/utility
In directory subversions:/tmp/cvs-serv2413/modules/utility

Modified Files:
        autotrans.c middle.c notes.c rainbow.c 
Log Message:
Yet more include cleanups and addition of statics

Index: autotrans.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/utility/autotrans.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- autotrans.c 24 Jan 2003 14:31:23 -0000      1.7
+++ autotrans.c 24 Jan 2003 15:46:12 -0000      1.8
@@ -19,18 +19,18 @@
  *
  */
 
+#include "intl.h"
+
 #include <stdio.h>
 #include <string.h>
-#include <glib.h>
 #include <stdlib.h>
 #include <ctype.h>
+
 #include "externs.h"
 #include "plugin_api.h"
-#include "browser.h"
 #include "prefs.h"
 #include "util.h"
-#include "intl.h"
-#include "llist.h"
+
 
 /* already declared in dialog.h - but that uses gtk */
 void do_message_dialog(char *message, char *title, int modal);
@@ -45,21 +45,21 @@
 #define plugin_finish autotrans_LTX_plugin_finish
 
 /* Function Prototypes */
-gchar * doTranslate(gchar * string, gchar * from, gchar * to);
-gchar * translate_out(eb_local_account * local, eb_account * remote, struct 
contact * contact, gchar * s);
-gchar * translate_in(eb_local_account * local, eb_account * remote, struct 
contact * contact, gchar * s);
-
-char * trans_URLEncode(char * s);
-int trans_init();
-int trans_finish();
-void language_select(ebmCallbackData *data);
-void language_selected(char * text, gpointer data);
+static gchar * doTranslate(gchar * string, gchar * from, gchar * to);
+static gchar * translate_out(eb_local_account * local, eb_account * remote, 
struct contact * contact, gchar * s);
+static gchar * translate_in(eb_local_account * local, eb_account * remote, 
struct contact * contact, gchar * s);
+
+static char * trans_URLEncode(char * s);
+static int trans_init();
+static int trans_finish();
+static void language_select(ebmCallbackData *data);
+static void language_selected(char * text, gpointer data);
 
-int doTrans=0;
-gchar myLanguage[MAX_PREF_LEN]="en";
+static int doTrans=0;
+static gchar myLanguage[MAX_PREF_LEN]="en";
 
-void * tag1;
-void * tag2;
+static void * tag1;
+static void * tag2;
 
 static int ref_count=0;
 
@@ -106,7 +106,7 @@
 };
 /* End Module Exports */
 
-int trans_init()
+static int trans_init()
 {
 
 
@@ -146,7 +146,7 @@
   return 0;
 }
 
-int trans_finish()
+static int trans_finish()
 {
        int result=0;
 
@@ -173,7 +173,7 @@
 
/*******************************************************************************
  *                             End Module Code
  
******************************************************************************/
-void language_select(ebmCallbackData *data)
+static void language_select(ebmCallbackData *data)
 {
   ebmContactData *ecd=(ebmContactData *)data;
   struct contact * cont;
@@ -205,7 +205,7 @@
   do_list_dialog(buf, _("Select Language"), languages, &language_selected, 
(gpointer)cont);
 }
 
-void language_selected(char * text, gpointer data)
+static void language_selected(char * text, gpointer data)
 {
   struct contact * cont=(struct contact *)data;
 
@@ -222,7 +222,7 @@
 }
 
 
-gchar * translate_out(eb_local_account * local, eb_account * remote, struct 
contact * contact, gchar * s)
+static gchar * translate_out(eb_local_account * local, eb_account * remote, 
struct contact * contact, gchar * s)
 {
   gchar *p;
   if(!doTrans) { return s; }
@@ -236,7 +236,7 @@
   return p;
 }
 
-gchar * translate_in(eb_local_account * local, eb_account * remote, struct 
contact * contact, gchar * s)
+static gchar * translate_in(eb_local_account * local, eb_account * remote, 
struct contact * contact, gchar * s)
 {
   gchar *p;
   if(!doTrans) { return s; }
@@ -249,7 +249,7 @@
   return p;
 }
 
-gchar * doTranslate(gchar * ostring, gchar * from, gchar * to)
+static gchar * doTranslate(gchar * ostring, gchar * from, gchar * to)
 {
   gchar buf[2048];
   char lastfew[5]={'\0','\0','\0','\0', '\0'};
@@ -338,7 +338,7 @@
   return result;
 }
 
-char * trans_URLEncode(char * s)
+static char * trans_URLEncode(char * s)
 {
   char * rptr;
   char * wptr;

Index: middle.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/utility/middle.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- middle.c    24 Jan 2003 14:31:23 -0000      1.4
+++ middle.c    24 Jan 2003 15:46:12 -0000      1.5
@@ -18,15 +18,16 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-
-#include <glib.h>
+ 
 #ifdef __MINGW32__
 #define __IN_PLUGIN__
 #endif
+
+#include "intl.h"
+
 #include "externs.h"
 #include "plugin_api.h"
-#include "intl.h"
-#include "llist.h"
+
 
 
/*******************************************************************************
  *                             Begin Module Code
@@ -37,11 +38,11 @@
 #define plugin_finish middle_LTX_plugin_finish
 
 /* Function Prototypes */
-gchar * plstripHTML(eb_local_account * local, eb_account * remote, struct 
contact * contact, gchar * s);
-int middle_init();
-int middle_finish();
+static gchar * plstripHTML(eb_local_account * local, eb_account * remote, 
struct contact * contact, gchar * s);
+static int middle_init();
+static int middle_finish();
 
-int doLeet=0;
+static int doLeet=0;
 
 static int ref_count=0;
 
@@ -59,7 +60,7 @@
 };
 /* End Module Exports */
 
-int middle_init()
+static int middle_init()
 {
   input_list * il=g_new0(input_list, 1);
   plugin_info.prefs=il;
@@ -77,7 +78,7 @@
   return 0;
 }
 
-int middle_finish()
+static int middle_finish()
 {
   eb_debug(DBG_MOD, "L33tSp33k shutting down\n");
   outgoing_message_filters=l_list_remove(outgoing_message_filters, 
&plstripHTML);
@@ -89,7 +90,7 @@
 
/*******************************************************************************
  *                             End Module Code
  
******************************************************************************/
-gchar * plstripHTML(eb_local_account * local, eb_account * remote, struct 
contact * contact, gchar * s)
+static gchar * plstripHTML(eb_local_account * local, eb_account * remote, 
struct contact * contact, gchar * s)
 {
   int pos=0;
 

Index: notes.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/utility/notes.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- notes.c     16 Jan 2003 09:51:03 -0000      1.4
+++ notes.c     24 Jan 2003 15:46:12 -0000      1.5
@@ -20,11 +20,11 @@
  */
 
 #include "intl.h"
+
 #include <stdlib.h>
-#include <glib.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
+
 #ifdef __MINGW32__
 #define __IN_PLUGIN__
 #endif
@@ -38,11 +38,11 @@
 #endif
 
 
-char notes_dir[NAME_MAX];
+static char notes_dir[NAME_MAX];
 #ifdef __MINGW32__
-char notes_editor[MAX_PREF_LEN]="notepad";
+static char notes_editor[MAX_PREF_LEN]="notepad";
 #else
-char notes_editor[MAX_PREF_LEN]="xedit";
+static char notes_editor[MAX_PREF_LEN]="xedit";
 #endif
 
 
/*******************************************************************************
@@ -55,9 +55,9 @@
 
 /* Function Prototypes */
 /* ebmCallbackData is a parent struct, the child of which will be an 
ebmContactData */
-void notes_feature(ebmCallbackData *data);
-int plugin_init();
-int plugin_finish();
+static void notes_feature(ebmCallbackData *data);
+static int plugin_init();
+static int plugin_finish();
 
 static int ref_count=0;
 
@@ -78,7 +78,7 @@
 static void *notes_tag1=NULL;
 static void *notes_tag2=NULL;
 
-int plugin_init()
+static int plugin_init()
 {
        input_list * il = g_new0(input_list, 1);
        int result=0;
@@ -106,7 +106,7 @@
        return(0);
 }
 
-int plugin_finish()
+static int plugin_finish()
 {
        int result=0;
 
@@ -128,7 +128,7 @@
  
******************************************************************************/
 
 /* We're really going to get back an ebmContactData object */
-void notes_feature(ebmCallbackData *data)
+static void notes_feature(ebmCallbackData *data)
 {
        ebmContactData *ecd=NULL;
        char buff[256];

Index: rainbow.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/utility/rainbow.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rainbow.c   24 Jan 2003 14:31:23 -0000      1.5
+++ rainbow.c   24 Jan 2003 15:46:12 -0000      1.6
@@ -19,17 +19,18 @@
  *
  */
 
-#include <glib.h>
+#include "intl.h"
+ 
 #include <stdlib.h>
 #include <string.h>
+
 #ifdef __MINGW32__
 #define __IN_PLUGIN__
 #endif
 #include "externs.h"
 #include "plugin_api.h"
 #include "prefs.h"
-#include "intl.h"
-#include "llist.h"
+
 
 
/*******************************************************************************
  *                             Begin Module Code
@@ -41,22 +42,22 @@
 
 /* Function Prototypes */
 /* ebmCallbackData is a parent struct, the child of which will be an 
ebmContactData */
-gchar * dorainbow(eb_local_account * local, eb_account * remote, struct 
contact * contact, gchar * s);
-int rainbow_init();
-int rainbow_finish();
-
-int doRainbow=0;
-
-char sstart_r[MAX_PREF_LEN]="255";
-char sstart_g[MAX_PREF_LEN]="0";
-char sstart_b[MAX_PREF_LEN]="0";
-
-char send_r[MAX_PREF_LEN]="0";
-char send_g[MAX_PREF_LEN]="0";
-char send_b[MAX_PREF_LEN]="255";
+static gchar * dorainbow(eb_local_account * local, eb_account * remote, struct 
contact * contact, gchar * s);
+static int rainbow_init();
+static int rainbow_finish();
+
+static int doRainbow=0;
+
+static char sstart_r[MAX_PREF_LEN]="255";
+static char sstart_g[MAX_PREF_LEN]="0";
+static char sstart_b[MAX_PREF_LEN]="0";
+
+static char send_r[MAX_PREF_LEN]="0";
+static char send_g[MAX_PREF_LEN]="0";
+static char send_b[MAX_PREF_LEN]="255";
 
-char * html_tags[] = {"html", "body", "font", "p", "i", "b", "u", "img", "a", 
"br", "hr", "head"};
-int num_tags=12;
+static char * html_tags[] = {"html", "body", "font", "p", "i", "b", "u", 
"img", "a", "br", "hr", "head"};
+static int num_tags=12;
 
 static int ref_count=0;
 
@@ -74,7 +75,7 @@
 };
 /* End Module Exports */
 
-int rainbow_init()
+static int rainbow_init()
 {
   input_list * il=g_new0(input_list, 1);
   plugin_info.prefs=il;
@@ -129,7 +130,7 @@
   return 0;
 }
 
-int rainbow_finish()
+static int rainbow_finish()
 {
   eb_debug(DBG_MOD, "Rainbow shutting down\n");
   outgoing_message_filters=l_list_remove(outgoing_message_filters, &dorainbow);
@@ -140,7 +141,7 @@
 
/*******************************************************************************
  *                             End Module Code
  
******************************************************************************/
-gchar * dorainbow(eb_local_account * local, eb_account * remote, struct 
contact * contact, gchar * s)
+static gchar * dorainbow(eb_local_account * local, eb_account * remote, struct 
contact * contact, gchar * s)
 {
   gchar * retval;
   gchar * wptr;