[Msyslog-cvs] syslog/src/modules im_bsd.c,1.94,1.95 im_doors.c,1.16,1.17 im_file.c,1.13,1.14 im_linux.c,1.61,1.62 im_serial.c,1.6,1.7 im_streams.c,1.23,1.24 im_tcp.c,1.49,1.50 im_udp.c,1.85,1.86 im_unix.c,1.61,1.62 om_classic.c,1.97,1.98 om_directory.c,1.7,1.8 om_mysql.c,1.92,1.93 om_oracle8i.c,1.5,1.6 om_pgsql.c,1.57,1.58 om_queue.c,1.10,1.11 om_refract.c,1.9,1.10 om_regex.c,1.53,1.54 om_snmptrap.c,1.3,1.4 om_tcp.c,1.30,1.31 om_udp.c,1.8,1.9

[<al...@us...>]

Update of /cvsroot/msyslog/syslog/src/modules
In directory sc8-pr-cvs1:/tmp/cvs-serv10864/src/modules

Modified Files:
	im_bsd.c im_doors.c im_file.c im_linux.c im_serial.c 
	im_streams.c im_tcp.c im_udp.c im_unix.c om_classic.c 
	om_directory.c om_mysql.c om_oracle8i.c om_pgsql.c om_queue.c 
	om_refract.c om_regex.c om_snmptrap.c om_tcp.c om_udp.c 
Log Message:
use typedefs now


Index: im_bsd.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/im_bsd.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- im_bsd.c	5 Jun 2003 16:12:20 -0000	1.94
+++ im_bsd.c	16 Jun 2003 19:18:39 -0000	1.95
@@ -62,7 +62,7 @@
 
 
 int
-im_bsd_init(struct i_module *im, char **argv, int argc)
+im_bsd_init(i_module_t *im, char **argv, int argc)
 {
 
 	/*
@@ -89,7 +89,7 @@
  */
 
 int
-im_bsd_read(struct i_module *im, int infd, struct m_msg *m)
+im_bsd_read(i_module_t *im, int infd, m_msg_t *m)
 {
 	int	r, mcount, cnt;
 
@@ -166,7 +166,7 @@
 }
 
 int
-im_bsd_close (struct i_module *im)
+im_bsd_close (i_module_t *im)
 {
 
 	unwatch_fd_input('p', im->fd);

Index: im_doors.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/im_doors.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- im_doors.c	17 Sep 2002 05:20:27 -0000	1.16
+++ im_doors.c	16 Jun 2003 19:18:39 -0000	1.17
@@ -66,7 +66,7 @@
  */
 
 int
-im_doors_init(struct i_module *I, char **argv, int argc)
+im_doors_init(i_module_t *I, char **argv, int argc)
 {
 	char *door_path = DEFAULT_DOOR;
 	int fd;

Index: im_file.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/im_file.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- im_file.c	23 Apr 2003 20:01:43 -0000	1.13
+++ im_file.c	16 Jun 2003 19:18:39 -0000	1.14
@@ -67,7 +67,7 @@
  */
 
 int
-im_file_init(struct i_module *im, char **argv, int argc)
+im_file_init(i_module_t *im, char **argv, int argc)
 {
 	struct im_file_ctx	*c;
 	int    ch, argcnt;
@@ -146,7 +146,7 @@
  *  1: read the file, call im_file_read
  */
 int
-im_file_poll(struct i_module *im)
+im_file_poll(i_module_t *im)
 {
   struct stat new_stat;
 	struct im_file_ctx	*c = (struct im_file_ctx *) (im->ctx);
@@ -197,7 +197,7 @@
  */
 
 int
-im_file_read(struct i_module *im, int infd, struct m_msg  *m)
+im_file_read(i_module_t *im, int infd, m_msg_t  *m)
 {
 	struct im_file_ctx	*c;
 	int			 cnt, r, mcount;
@@ -273,7 +273,7 @@
  */
 
 int
-im_file_close( struct i_module *im)
+im_file_close( i_module_t *im)
 {
 	FREE_PTR(im->ctx);
 	CLOSE_FD(im->fd);

Index: im_linux.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/im_linux.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- im_linux.c	11 Jun 2003 19:42:23 -0000	1.61
+++ im_linux.c	16 Jun 2003 19:18:39 -0000	1.62
@@ -153,7 +153,7 @@
  * Initialize linux input module
  */
 int
-im_linux_init (struct i_module *I, char **argv, int argc)
+im_linux_init (i_module_t *I, char **argv, int argc)
 {
 	int ch;
 	int argcnt;
@@ -267,7 +267,7 @@
  * and log it.
  */
 int
-im_linux_read (struct i_module *im, int infd, struct m_msg *m)
+im_linux_read (i_module_t *im, int infd, m_msg_t *m)
 {
 	char			 buf[MAXLINE];
 	struct im_linux_ctx	*c;
@@ -357,7 +357,7 @@
  * Close linux input module
  */
 int
-im_linux_close (struct i_module *im)
+im_linux_close (i_module_t *im)
 {
 	ksym_close();
 

Index: im_serial.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/im_serial.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- im_serial.c	23 Apr 2003 18:41:36 -0000	1.6
+++ im_serial.c	16 Jun 2003 19:18:39 -0000	1.7
@@ -69,7 +69,7 @@
  */
 
 int
-im_serial_init(struct i_module *im, char **argv, int argc)
+im_serial_init(i_module_t *im, char **argv, int argc)
 {
 	struct im_serial_ctx	*c;
 	int    ch, argcnt;
@@ -155,7 +155,7 @@
  */
 
 int
-im_serial_read(struct i_module *im, int infd, struct m_msg  *m)
+im_serial_read(i_module_t *im, int infd, m_msg_t  *m)
 {
 #ifdef IGNORE_PIPES
 	RETSIGTYPE		(*sigsave)(int);
@@ -239,7 +239,7 @@
  */
 
 int
-im_serial_close( struct i_module *im)
+im_serial_close( i_module_t *im)
 {
 	struct im_serial_ctx	*c = (struct im_serial_ctx *) (im->ctx);
 

Index: im_streams.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/im_streams.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- im_streams.c	23 Apr 2003 18:41:37 -0000	1.23
+++ im_streams.c	16 Jun 2003 19:18:40 -0000	1.24
@@ -68,7 +68,7 @@
  */
 
 int
-im_streams_init (struct i_module *I, char **argv, int argc)
+im_streams_init (i_module_t *I, char **argv, int argc)
 {
 	m_dprintf(MSYSLOG_INFORMATIVE, "im_streams_init: Entering\n");
 
@@ -124,7 +124,7 @@
  */
 
 int
-im_streams_read (struct i_module *im, int infd, struct im_msg *ret)
+im_streams_read (i_module_t *im, int infd, struct im_msg *ret)
 {
 	struct strbuf ctl, dat;
 	struct log_ctl     lc;
@@ -210,7 +210,7 @@
  * the following function is not mandatory, you can omit it
  */
 int
-im_streams_close (struct i_module *im) 
+im_streams_close (i_module_t *im) 
 {
 	struct im_streams_ctx *c = (im_streams_ctx *) im->ctx;
 

Index: im_tcp.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/im_tcp.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- im_tcp.c	23 Apr 2003 18:41:37 -0000	1.49
+++ im_tcp.c	16 Jun 2003 19:18:40 -0000	1.50
@@ -111,7 +111,7 @@
  */
 
 int
-im_tcp_init(struct i_module *I, char **argv, int argc)
+im_tcp_init(i_module_t *I, char **argv, int argc)
 {
 	struct im_tcp_ctx	*c;
 	char   *host, *port;
@@ -202,7 +202,7 @@
  */
 
 int
-im_tcp_read(struct i_module *im, int infd, struct m_msg *m)
+im_tcp_read(i_module_t *im, int infd, m_msg_t *m)
 {
 	struct im_tcp_ctx	*c;
 	struct tcp_conn		*con;
@@ -336,7 +336,7 @@
  */
 
 int
-im_tcp_close(struct i_module *im)
+im_tcp_close(i_module_t *im)
 {
 	struct im_tcp_ctx *c;
 	struct tcp_conn *con, *cnext;

Index: im_udp.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/im_udp.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- im_udp.c	23 Apr 2003 20:01:43 -0000	1.85
+++ im_udp.c	16 Jun 2003 19:18:40 -0000	1.86
@@ -78,7 +78,7 @@
  */
 
 int
-im_udp_init(struct i_module *im, char **argv, int argc)
+im_udp_init(i_module_t *im, char **argv, int argc)
 {
 	char   			*host, *port;
 	int			ch, argcnt;
@@ -151,7 +151,7 @@
  */
 
 int
-im_udp_read(struct i_module *im, int infd, struct m_msg *m)
+im_udp_read(i_module_t *im, int infd, m_msg_t *m)
 {
 	int	r, cnt, mcount;
 
@@ -202,7 +202,7 @@
 }
 
 int
-im_udp_close(struct i_module *im)
+im_udp_close(i_module_t *im)
 {
 
 	CLOSE_FD(im->fd);

Index: im_unix.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/im_unix.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- im_unix.c	23 Apr 2003 20:20:52 -0000	1.61
+++ im_unix.c	16 Jun 2003 19:18:40 -0000	1.62
@@ -69,7 +69,7 @@
  */
 
 int
-im_unix_init(struct i_module *im, char **argv, int argc)
+im_unix_init(i_module_t *im, char **argv, int argc)
 {
 	struct sockaddr_un sunx;
 	char *logger;
@@ -113,7 +113,7 @@
  */
 
 int
-im_unix_read(struct i_module *im, int infd, struct m_msg  *m)
+im_unix_read(i_module_t *im, int infd, m_msg_t  *m)
 {
 	struct sockaddr_un	 fromunix;
 	int			 slen, r, c, mcount;
@@ -180,7 +180,7 @@
  */
 
 int
-im_unix_close( struct i_module *im)
+im_unix_close( i_module_t *im)
 {
 	CLOSE_FD(im->fd);
 

Index: om_classic.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/om_classic.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- om_classic.c	20 May 2003 05:23:42 -0000	1.97
+++ om_classic.c	16 Jun 2003 19:18:40 -0000	1.98
@@ -110,7 +110,7 @@
 	int	f_type;		 /* entry type, see below */
 };
 
-void wallmsg (struct filed *, struct iovec *, struct om_classic_ctx *c);
+void wallmsg (filed_t *, struct iovec *, struct om_classic_ctx *c);
 char *ttymsg(struct iovec *, int , char *, int);
 struct sockaddr	*resolv_name(char *, char *, char *, size_t *);
 
@@ -120,7 +120,7 @@
  */
 
 int
-om_classic_write(struct filed *f, struct m_msg *m, void *ctx)
+om_classic_write(filed_t *f, m_msg_t *m, void *ctx)
 {
 	struct iovec iov[6];
 	struct iovec *v;
@@ -291,8 +291,8 @@
 om_classic_init(
     int argc,
     char **argv,
-    struct filed *f,
-    struct global *global, 
+    filed_t *f,
+    m_global_t *global, 
     void **ctx,
     char **status)
 {
@@ -467,7 +467,7 @@
 }
 
 int
-om_classic_close(struct filed *f, void *ctx)
+om_classic_close(filed_t *f, void *ctx)
 {
 	struct om_classic_ctx *c;
 
@@ -479,7 +479,7 @@
 }
 
 int
-om_classic_flush(struct filed *f, void *ctx)
+om_classic_flush(filed_t *f, void *ctx)
 {
 	/* flush any pending output */
 	if (f->prevcount)
@@ -495,7 +495,7 @@
  *	world, or a list of approved users.
  */
 void
-wallmsg( struct filed *f, struct iovec *iov, struct om_classic_ctx *c)
+wallmsg( filed_t *f, struct iovec *iov, struct om_classic_ctx *c)
 {
 	static int reenter;			/* avoid calling ourselves */
 	FILE *uf;

Index: om_directory.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/om_directory.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- om_directory.c	23 Apr 2003 18:42:30 -0000	1.7
+++ om_directory.c	16 Jun 2003 19:18:40 -0000	1.8
@@ -101,8 +101,8 @@
 
 int
 om_directory_write(
-  /* Current filed struct   */ struct filed* fil,
-  /* The message string     */ struct m_msg* msg,
+  /* Current filed struct   */ filed_t* fil,
+  /* The message string     */ m_msg_t* msg,
   /* Our context            */ void* context)
 {
 
@@ -173,8 +173,8 @@
 om_directory_init (
     int argc,              /* Argumemt count */         
     char* *argv,           /* Argumemt array, like main() */
-    struct filed* f,       /*  Our filed structure */
-    struct global* global, /* Global variables */
+    filed_t* f,       /*  Our filed structure */
+    m_global_t* global, /* Global variables */
     void* *context,        /* Our context */
     char* *status)         /* status */
 {
@@ -310,7 +310,7 @@
  *      -1  BAD
  */
 int
-om_directory_close (struct filed *f, void *context) {
+om_directory_close (filed_t *f, void *context) {
    /*  struct om_directory_context *ctx = (struct om_directory_context *) context; */
    m_dprintf(MSYSLOG_INFORMATIVE, "om_directory_close: Not implemented\n");
 return (1);
@@ -323,7 +323,7 @@
  *     -1  BAD
  */
 int
-om_directory_flush (struct filed *f, void *context) {
+om_directory_flush (filed_t *f, void *context) {
    /*  struct om_directory_context *ctx = (struct om_directory_context *) context; */
    m_dprintf(MSYSLOG_INFORMATIVE, "om_directory_flush: Not implemented\n");
 return (1);

Index: om_mysql.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/om_mysql.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- om_mysql.c	4 Jun 2003 18:30:56 -0000	1.92
+++ om_mysql.c	16 Jun 2003 19:18:40 -0000	1.93
@@ -95,7 +95,7 @@
 #define	OM_MYSQL_FACILITY		0x4
 #define	OM_MYSQL_PRIORITY		0x8
 
-int om_mysql_close(struct filed *, void *);
+int om_mysql_close(filed_t *, void *);
 
 /*
  * Define our prototypes for MySQL functions
@@ -136,7 +136,7 @@
 }
 
 int
-om_mysql_write(struct filed *f, struct m_msg *m, void *ctx)
+om_mysql_write(filed_t *f, m_msg_t *m, void *ctx)
 {
 	struct om_mysql_ctx	*c;
 	char			query[MAX_QUERY], err_buf[100];
@@ -287,8 +287,8 @@
 om_mysql_init(
     int argc,
     char **argv,
-    struct filed *f,
-    struct global *global,
+    filed_t *f,
+    m_global_t *global,
     void **c,
     char **status)
 {
@@ -406,7 +406,7 @@
 
 
 int
-om_mysql_close(struct filed *f, void *ctx)
+om_mysql_close(filed_t *f, void *ctx)
 {
 	struct om_mysql_ctx *c;
 

Index: om_oracle8i.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/om_oracle8i.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- om_oracle8i.c	4 Jun 2003 17:19:41 -0000	1.5
+++ om_oracle8i.c	16 Jun 2003 19:18:40 -0000	1.6
@@ -168,10 +168,10 @@
 static
 int             prepare_query(struct om_oracle8i_ctx *ctx);
 
-int             om_oracle8i_close(struct filed *, void *);
+int             om_oracle8i_close(filed_t *, void *);
 
 int
-om_oracle8i_write(struct filed *f, struct m_msg *m, void *ctx)
+om_oracle8i_write(filed_t *f, m_msg_t *m, void *ctx)
 {
 	struct om_oracle8i_ctx *c;
 	/* These should be preserved between calls, so they can be reused. */
@@ -294,7 +294,7 @@
  */
 
 int
-om_oracle8i_init(int argc, char **argv, struct filed *f, char *prog, void **c,
+om_oracle8i_init(int argc, char **argv, filed_t *f, char *prog, void **c,
 	      char **status)
 {
 	struct om_oracle8i_ctx *ctx;
@@ -380,7 +380,7 @@
 }
 
 int
-om_oracle8i_close(struct filed *f, void *ctx)
+om_oracle8i_close(filed_t *f, void *ctx)
 {
 	struct om_oracle8i_ctx *c = (struct om_oracle8i_ctx *) ctx;
 

Index: om_pgsql.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/om_pgsql.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- om_pgsql.c	4 Jun 2003 17:19:41 -0000	1.57
+++ om_pgsql.c	16 Jun 2003 19:18:40 -0000	1.58
@@ -133,8 +133,8 @@
 om_pgsql_init(
    int argc,
    char **argv,
-   struct filed *f,
-   struct global *global,
+   filed_t *f,
+   m_global_t *global,
    void **c,
    char **status)
 {
@@ -281,7 +281,7 @@
  */
 
 int
-om_pgsql_write(struct filed *f, struct m_msg *m, void *ctx)
+om_pgsql_write(filed_t *f, m_msg_t *m, void *ctx)
 {
 	void	*r;
 	struct	om_pgsql_ctx *c;
@@ -414,13 +414,13 @@
 /*
  * a place holder for flushing the output file descriptor
  */ 
-int om_pgsql_flush(struct filed *f, void *ctx) { return (1); }
+int om_pgsql_flush(filed_t *f, void *ctx) { return (1); }
 
 /*
  * release all resources including closing the file descriptor
  */ 
 int
-om_pgsql_close(struct filed *f, void *ctx) {
+om_pgsql_close(filed_t *f, void *ctx) {
 	struct om_pgsql_ctx *c;
 
 	c = (struct om_pgsql_ctx *) ctx;

Index: om_queue.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/om_queue.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- om_queue.c	9 May 2003 14:38:35 -0000	1.10
+++ om_queue.c	16 Jun 2003 19:18:40 -0000	1.11
@@ -172,8 +172,8 @@
 
 int
 om_queue_write(
-  /* Current filed struct   */ struct filed* fil,
-  /* The message string     */ struct m_msg* msg,
+  /* Current filed struct   */ filed_t* fil,
+  /* The message string     */ m_msg_t* msg,
   /* Our context            */ void* context) {
 
   struct om_queue_context *ctx;
@@ -312,8 +312,8 @@
 om_queue_init (
     int argc,              /* Argumemt count */
     char* *argv,           /* Argumemt array, like main() */
-    struct filed* f,       /*  Our filed structure */ 
-    struct global* global, /* Global variable */  
+    filed_t* f,       /*  Our filed structure */ 
+    m_global_t* global, /* Global variable */  
     void* *context,        /* Our context */     
     char* *status)         /* status */     
 {
@@ -542,7 +542,7 @@
  *      -1  BAD
  */
 int
-om_queue_close (struct filed *f, void *context) {
+om_queue_close (filed_t *f, void *context) {
    /*  struct om_queue_context *ctx = (struct om_queue_context *) context; */
    m_dprintf(MSYSLOG_INFORMATIVE, "om_queue_close: Not implemented\n");
 return (1);
@@ -555,7 +555,7 @@
  *     -1  BAD
  */
 int
-om_queue_flush (struct filed *f, void *context) {
+om_queue_flush (filed_t *f, void *context) {
    /*  struct om_queue_context *ctx = (struct om_queue_context *) context; */
    m_dprintf(MSYSLOG_INFORMATIVE, "om_queue_flush: Not implemented\n");
 return (1);

Index: om_refract.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/om_refract.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- om_refract.c	23 Apr 2003 18:42:32 -0000	1.9
+++ om_refract.c	16 Jun 2003 19:18:40 -0000	1.10
@@ -67,8 +67,8 @@
 om_refract_init(
     int argc,              /* Argumemt count */
     char* *argv,           /* Argumemt array, like main() */
-    struct filed* f,       /*  Our filed structure */ 
-    struct global* global, /* Global variable */  
+    filed_t* f,       /*  Our filed structure */ 
+    m_global_t* global, /* Global variable */  
     void* *context,        /* Our context */     
     char* *status)         /* status */     
 {
@@ -181,8 +181,8 @@
 
 int
 om_refract_write(
-  /* Current filed struct   */ struct filed* fil,
-  /* The message string   */   struct m_msg* msg,
+  /* Current filed struct   */ filed_t* fil,
+  /* The message string   */   m_msg_t* msg,
   /* Our context      */       void* context
 ) {
 
@@ -235,7 +235,7 @@
  */
 
 int
-om_refract_close (struct filed *f, void *context) {
+om_refract_close (filed_t *f, void *context) {
 /*  struct om_refract_context *ctx = (struct om_refract_context *) context; */
   m_dprintf(MSYSLOG_INFORMATIVE, "om_refract_close: Not implemented\n");
   return (1);
@@ -248,7 +248,7 @@
    -1  BAD
  */
 int
-om_refract_flush (struct filed *f, void *context) {
+om_refract_flush (filed_t *f, void *context) {
 /*  struct om_refract_context *ctx = (struct om_refract_context *) context; */
   m_dprintf(MSYSLOG_INFORMATIVE, "om_refract_flush: Not implemented\n");
   return (1);

Index: om_regex.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/om_regex.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- om_regex.c	23 Apr 2003 18:42:33 -0000	1.53
+++ om_regex.c	16 Jun 2003 19:18:40 -0000	1.54
@@ -108,8 +108,8 @@
 int om_regex_init(
  int argc,
  char **argv,
- struct filed *f,
- struct global* global,
+ filed_t *f,
+ m_global_t* global,
  void **ctx,
  char **status
 ) {
@@ -410,7 +410,7 @@
     0  nomatch -> stop logging it
  */
 
-int om_regex_write(struct filed *f, struct m_msg *m, void *ctx)
+int om_regex_write(filed_t *f, m_msg_t *m, void *ctx)
 {
   struct om_regex_ctx *c;
   int i, iflag;
@@ -508,7 +508,7 @@
 }
 
 
-int om_regex_flush(struct filed *f, void *ctx) {
+int om_regex_flush(filed_t *f, void *ctx) {
 
   return (1);
 }
@@ -517,7 +517,7 @@
 /* 
  * Free the compiled regex
  */
-int om_regex_close(struct filed *f, void *ctx) {
+int om_regex_close(filed_t *f, void *ctx) {
 
   struct om_regex_ctx *c;
 

Index: om_snmptrap.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/om_snmptrap.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- om_snmptrap.c	23 Apr 2003 18:42:33 -0000	1.3
+++ om_snmptrap.c	16 Jun 2003 19:18:40 -0000	1.4
@@ -111,7 +111,7 @@
  *			will be the syslog message.
  */
 int
-om_snmptrap_init(int argc, char **argv, struct filed *f, char *prog, void **ctx,
+om_snmptrap_init(int argc, char **argv, filed_t *f, char *prog, void **ctx,
 		 char **status)
 {
 	extern int optreset;	/* Present on some BSD based systems */
@@ -265,14 +265,14 @@
 
 
 int
-om_snmptrap_close(struct filed *f, void *ctx)
+om_snmptrap_close(filed_t *f, void *ctx)
 {
 	return (0);
 }
 
 
 int
-om_snmptrap_write(struct filed *f, struct m_msg *msg, void *ctx)
+om_snmptrap_write(filed_t *f, m_msg_t *msg, void *ctx)
 {
 	struct snmp_session session, *ss;
 	struct sockaddr_in *agent_addr;

Index: om_tcp.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/om_tcp.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- om_tcp.c	23 Apr 2003 18:42:33 -0000	1.30
+++ om_tcp.c	16 Jun 2003 19:18:40 -0000	1.31
@@ -79,7 +79,7 @@
 #define M_ADDHOST	0x01
 
 int connect_tcp(char *, char *);
-int om_tcp_close(struct filed *, void *);
+int om_tcp_close(filed_t *, void *);
 
 /*
  *  INIT -- Initialize om_tcp
@@ -100,8 +100,8 @@
 om_tcp_init(
     int argc,
     char **argv,
-    struct filed *f,
-    struct global *global,
+    filed_t *f,
+    m_global_t *global,
     void **ctx,
     char **status)
 {
@@ -186,7 +186,7 @@
  */
 
 int
-om_tcp_write(struct filed *f, struct m_msg *m, void *ctx)
+om_tcp_write(filed_t *f, m_msg_t *m, void *ctx)
 {
 	struct om_tcp_ctx *c;
 	RETSIGTYPE (*sigsave)(int);
@@ -320,7 +320,7 @@
  */
 
 int
-om_tcp_close(struct filed *f, void *ctx)
+om_tcp_close(filed_t *f, void *ctx)
 {
 	struct om_tcp_ctx *c;
 

Index: om_udp.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/om_udp.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- om_udp.c	23 Apr 2003 18:42:34 -0000	1.8
+++ om_udp.c	16 Jun 2003 19:18:40 -0000	1.9
@@ -94,8 +94,8 @@
 om_udp_init(
   int argc,
   char **argv,
-  struct filed *f,
-  struct global* global,
+  filed_t *f,
+  m_global_t* global,
   void **ctx,
   char **status)
 {
@@ -168,7 +168,7 @@
  */
 
 int
-om_udp_write(struct filed *f, struct m_msg *m, void *ctx)
+om_udp_write(filed_t *f, m_msg_t *m, void *ctx)
 {
 	struct om_udp_ctx *c;
 	char time_buf[16];
@@ -217,7 +217,7 @@
  */
 
 int
-om_udp_close(struct filed *f, void *ctx)
+om_udp_close(filed_t *f, void *ctx)
 {
 	struct om_udp_ctx *c;