X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8c6e995a43e71e012ae133ff8ebea5719d9117fe..28ebf6bb835e9954c0f959b56c8abac2bf3decd5:/uip/fmttest.c?ds=inline

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 568b5597..e3308384 100644
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -5,12 +5,35 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/fmt_scan.h>
-#include <h/fmt_compile.h>
-#include <h/utils.h>
-#include <h/scansbr.h>
-#include <h/addrsbr.h>
+#include "h/mh.h"
+#include "sbr/fmt_new.h"
+#include "scansbr.h"
+#include "sbr/m_name.h"
+#include "sbr/m_getfld.h"
+#include "sbr/getarguments.h"
+#include "sbr/seq_setprev.h"
+#include "sbr/seq_save.h"
+#include "sbr/smatch.h"
+#include "sbr/snprintb.h"
+#include "sbr/getcpy.h"
+#include "sbr/m_convert.h"
+#include "sbr/getfolder.h"
+#include "sbr/folder_read.h"
+#include "sbr/folder_free.h"
+#include "sbr/context_save.h"
+#include "sbr/context_replace.h"
+#include "sbr/context_find.h"
+#include "sbr/brkstring.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/seq_getnum.h"
+#include "sbr/error.h"
+#include "h/fmt_scan.h"
+#include "h/fmt_compile.h"
+#include "h/utils.h"
+#include "h/addrsbr.h"
 #include "h/done.h"
 #include "sbr/m_maildir.h"
 #include "sbr/terminal.h"
@@ -450,6 +473,7 @@ process_addresses(struct format *fmt, struct msgs_array *addrs,
 
 	    fmt_scan(fmt, buffer, outwidth, dat, cb);
 	    fputs(charstring_buffer(buffer), stdout);
+            charstring_clear(buffer);
 	    mlistfree();
 
             free(p->pq_text);
@@ -676,6 +700,7 @@ finished:
     }
     fmt_scan(fmt, buffer, outwidth, dat, cb);
     fputs(charstring_buffer (buffer), stdout);
+    charstring_clear(buffer);
     mlistfree();
 }
 
@@ -709,6 +734,7 @@ process_raw(struct format *fmt, struct msgs_array *text, charstring_t buffer,
 
 	fmt_scan(fmt, buffer, outwidth, dat, cb);
 	fputs(charstring_buffer (buffer), stdout);
+        charstring_clear(buffer);
 	mlistfree();
     }
 }