X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/59620a0948c8b5a2782400580d1487fb4b9b8d39..d6e398f9c:/h/fmt_scan.h?ds=sidebyside

diff --git a/h/fmt_scan.h b/h/fmt_scan.h
index e499d51d..4d768b7b 100644
--- a/h/fmt_scan.h
+++ b/h/fmt_scan.h
@@ -37,6 +37,8 @@ struct comp {
 #define	CT_ADDR       (1<<0)	/* referenced as address    */
 #define	CT_DATE       (1<<1)	/* referenced as date       */
 
+#define CT_BITS       "\020\01ADDR\02DATE"
+
 /*
  * c_flags bits
  */
@@ -45,7 +47,7 @@ struct comp {
 #define	CF_DATEFAB    (1<<2)	/* datefield fabricated */
 #define CF_TRIMMED    (1<<3)	/* Component has been trimmed */
 
-extern int fmt_norm;
+#define CF_BITS       "\020\01TRUE\02PARSED\03CF_DATEFAB\04TRIMMED"
 
 /*
  * This structure defines one formatting instruction.
@@ -87,12 +89,13 @@ struct format {
 
 typedef char * (*formataddr_cb)(char *, char *);
 typedef char * (*concataddr_cb)(char *, char *);
-typedef void (*trace_cb)(void *, int, int, char *, char *);
+typedef void (*trace_cb)(void *, struct format *, int, char *, char *);
 
 struct fmt_callbacks {
     formataddr_cb	formataddr;
     concataddr_cb	concataddr;
-    trace_cb		trace;
+    trace_cb		trace_func;
+    void *		trace_context;
 };
 
 /*