ossp-pkg/lmtp2nntp/lmtp2nntp_common.h 1.2 -> 1.3
--- lmtp2nntp_common.h 2003/01/30 19:42:12 1.2
+++ lmtp2nntp_common.h 2003/02/06 13:50:08 1.3
@@ -26,13 +26,6 @@
** lmtp2nntp_common.h: common stuff
*/
-/*
- * FIXME this stuff actually should be not global/common! It was mainly
- * a temporary fix to allow code migration from lmtp2nntp_main.c's
- * getopt switch to lmtp2nntp_config.[ch]. Unfortunately it is very hard
- * to move this remaining stuff into local contexts.
- */
-
#ifndef __LMTP2NNTP_COMMON_H__
#define __LMTP2NNTP_COMMON_H__
@@ -46,8 +39,7 @@
size_t prefixlen;
sa_addr_t *saa;
};
-struct nntp_st;
-typedef struct nntp_st nntp_t;
+
#include "lmtp2nntp_nntp.h"
struct ns {
sa_addr_t *saa;
@@ -56,40 +48,13 @@
nntp_rc_t rc;
l2_channel_t *l2;
};
+
struct session {
int lhlo_seen;
char *lhlo_domain;
};
-#include <sys/utsname.h>
-
-struct headerrule_st;
-typedef struct headerrule_st headerrule_t;
-#include <pcre.h>
-struct headerrule_st {
- headerrule_t *next;
- int pri;
- char *regex;
- char *name;
- char *val;
- pcre *pcreRegex;
- pcre_extra *pcreExtra;
-};
-headerrule_t *FIXME1;
-
-struct headerdata_st;
-typedef struct headerdata_st headerdata_t;
-struct headerdata_st {
- headerdata_t *prev;
- headerdata_t *next;
- char *name;
- int ndata; /* =0 means data is invalid, =1 means use data.s, >1 means use data.m */
- union {
- char *s;
- char **m;
- } data;
-};
-headerdata_t *FIXME2;
+#include <sys/utsname.h>
typedef struct {
l2_context_t ctx;
val_t *prival;
@@ -165,4 +130,3 @@
extern void logbook(l2_channel_t *, l2_level_t, const char *, ...);
#endif /* __LMTP2NNTP_COMMON_H__ */
-
|
|
