X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=h%2Ffmt_scan.h;h=837780c33bf72f67f053e9d6674dbaa46a01b6d4;hb=ea28cc1be7f254842b243b9e297056f47c9cdd70;hp=cece50e002bcf15ffcef91c15a06fc859875c43d;hpb=cafee7a804b8aa53166065e988ec0fc387862fc8;p=mmh

diff --git a/h/fmt_scan.h b/h/fmt_scan.h
index cece50e..837780c 100644
--- a/h/fmt_scan.h
+++ b/h/fmt_scan.h
@@ -1,8 +1,6 @@
 
 /*
  * fmt_scan.h -- definitions for fmt_scan()
- *
- * $Id$
  */
 
 /*
@@ -41,6 +39,7 @@ struct comp {
 #define	CF_TRUE       (1<<0)	/* usually means component is present */
 #define	CF_PARSED     (1<<1)	/* address/date has been parsed */
 #define	CF_DATEFAB    (1<<2)	/* datefield fabricated */
+#define CF_TRIMMED    (1<<3)	/* Component has been trimmed */
 
 extern int fmt_norm;
 
@@ -63,7 +62,8 @@ extern struct comp *wantcomp[128];
 #define FINDCOMP(comp,name) \
 		for (comp = wantcomp[CHASH(name)]; \
 		     comp && strcmp(comp->c_name,name); \
-		     comp = comp->c_next) ;
+		     comp = comp->c_next) \
+		;
 
 /*
  * This structure defines one formatting instruction.
@@ -90,6 +90,9 @@ struct format {
 /*
  * prototypes
  */
-struct format *fmt_scan (struct format *, char *, int, int *);
+struct format *fmt_scan (struct format *, char *, size_t, int, int *);
 char *new_fs (char *, char *, char *);
 int fmt_compile (char *, struct format **);
+char *formataddr(char *, char *);
+char *concataddr(char *, char *);
+extern char *format_string;