Use a macro for all utils that do not take arguments

Signed-off-by: Mattias Andrée <m@maandree.se>

42 files changed, 58 insertions, 615 deletions

diff --git a/common.h b/common.h
index 9b30011..7e42a49 100644
--- a/common.h
+++ b/common.h
@@ -11,3 +11,20 @@
 void writeall(const char *s, size_t n);
 void writechar(uint_least32_t cp);
 int convert(enum libcharconv_result (*conv)(const char *, size_t, size_t *, uint_least32_t *, size_t *));
+
+
+#define SIMPLE(FUNCTION)\
+	USAGE("");\
+	\
+	int\
+	main(int argc, char *argv[])\
+	{\
+		ARGBEGIN {\
+		default:\
+			usage();\
+		} ARGEND;\
+		if (argc)\
+			usage();\
+		\
+		return convert(&FUNCTION);\
+	}
diff --git a/convert-to-bold-fraktur.c b/convert-to-bold-fraktur.c
index b9a302e..8475f61 100644
--- a/convert-to-bold-fraktur.c
+++ b/convert-to-bold-fraktur.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_bold_fraktur);
-}
+SIMPLE(libcharconv_bold_fraktur)
diff --git a/convert-to-bold-italic.c b/convert-to-bold-italic.c
index 95a8832..73f7981 100644
--- a/convert-to-bold-italic.c
+++ b/convert-to-bold-italic.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_bold_italic);
-}
+SIMPLE(libcharconv_bold_italic)
diff --git a/convert-to-bold-script.c b/convert-to-bold-script.c
index f3a374e..2953703 100644
--- a/convert-to-bold-script.c
+++ b/convert-to-bold-script.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_bold_script);
-}
+SIMPLE(libcharconv_bold_script)
diff --git a/convert-to-bold.c b/convert-to-bold.c
index fc91c7d..16d2b1c 100644
--- a/convert-to-bold.c
+++ b/convert-to-bold.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_bold);
-}
+SIMPLE(libcharconv_bold)
diff --git a/convert-to-bracketed.c b/convert-to-bracketed.c
index 1314677..c49203c 100644
--- a/convert-to-bracketed.c
+++ b/convert-to-bracketed.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_bracketed);
-}
+SIMPLE(libcharconv_bracketed)
diff --git a/convert-to-braille.c b/convert-to-braille.c
index c5513c9..8b494e3 100644
--- a/convert-to-braille.c
+++ b/convert-to-braille.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_braille);
-}
+SIMPLE(libcharconv_braille)
diff --git a/convert-to-buhid.c b/convert-to-buhid.c
index 639943f..7a1412a 100644
--- a/convert-to-buhid.c
+++ b/convert-to-buhid.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_buhid);
-}
+SIMPLE(libcharconv_buhid)
diff --git a/convert-to-clock-faces.c b/convert-to-clock-faces.c
index 78647c7..f449768 100644
--- a/convert-to-clock-faces.c
+++ b/convert-to-clock-faces.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_clock_faces);
-}
+SIMPLE(libcharconv_clock_faces)
diff --git a/convert-to-crop-marks.c b/convert-to-crop-marks.c
index cc33009..bef14ab 100644
--- a/convert-to-crop-marks.c
+++ b/convert-to-crop-marks.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_crop_marks);
-}
+SIMPLE(libcharconv_crop_marks)
diff --git a/convert-to-cypriot.c b/convert-to-cypriot.c
index 6a981a7..843e1aa 100644
--- a/convert-to-cypriot.c
+++ b/convert-to-cypriot.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_cypriot);
-}
+SIMPLE(libcharconv_cypriot)
diff --git a/convert-to-dice.c b/convert-to-dice.c
index 02c84bd..4dd261b 100644
--- a/convert-to-dice.c
+++ b/convert-to-dice.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_dice);
-}
+SIMPLE(libcharconv_dice)
diff --git a/convert-to-double-struck-italic.c b/convert-to-double-struck-italic.c
index 2be3e61..76f4156 100644
--- a/convert-to-double-struck-italic.c
+++ b/convert-to-double-struck-italic.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_double_struck_italic);
-}
+SIMPLE(libcharconv_double_struck_italic)
diff --git a/convert-to-double-struck.c b/convert-to-double-struck.c
index ef962cc..a1331e5 100644
--- a/convert-to-double-struck.c
+++ b/convert-to-double-struck.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_double_struck);
-}
+SIMPLE(libcharconv_double_struck)
diff --git a/convert-to-draughts.c b/convert-to-draughts.c
index b93814e..eea50b8 100644
--- a/convert-to-draughts.c
+++ b/convert-to-draughts.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_draughts);
-}
+SIMPLE(libcharconv_draughts)
diff --git a/convert-to-fraktur.c b/convert-to-fraktur.c
index 9e5b72e..51438a6 100644
--- a/convert-to-fraktur.c
+++ b/convert-to-fraktur.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_fraktur);
-}
+SIMPLE(libcharconv_fraktur)
diff --git a/convert-to-gender-symbols.c b/convert-to-gender-symbols.c
index 1ec89ab..a020550 100644
--- a/convert-to-gender-symbols.c
+++ b/convert-to-gender-symbols.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_gender_symbols);
-}
+SIMPLE(libcharconv_gender_symbols)
diff --git a/convert-to-italic.c b/convert-to-italic.c
index 88edcad..d26670b 100644
--- a/convert-to-italic.c
+++ b/convert-to-italic.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_italic);
-}
+SIMPLE(libcharconv_italic)
diff --git a/convert-to-latin.c b/convert-to-latin.c
index c992b5f..71bd2bb 100644
--- a/convert-to-latin.c
+++ b/convert-to-latin.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_latin);
-}
+SIMPLE(libcharconv_latin)
diff --git a/convert-to-lisu.c b/convert-to-lisu.c
index 3a8320a..27c35be 100644
--- a/convert-to-lisu.c
+++ b/convert-to-lisu.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_lisu);
-}
+SIMPLE(libcharconv_lisu)
diff --git a/convert-to-lycian.c b/convert-to-lycian.c
index 23caae1..2aecd47 100644
--- a/convert-to-lycian.c
+++ b/convert-to-lycian.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_lycian);
-}
+SIMPLE(libcharconv_lycian)
diff --git a/convert-to-lydian.c b/convert-to-lydian.c
index 989def7..143f49a 100644
--- a/convert-to-lydian.c
+++ b/convert-to-lydian.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_lydian);
-}
+SIMPLE(libcharconv_lydian)
diff --git a/convert-to-monospace.c b/convert-to-monospace.c
index 33e114c..4050171 100644
--- a/convert-to-monospace.c
+++ b/convert-to-monospace.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_monospace);
-}
+SIMPLE(libcharconv_monospace)
diff --git a/convert-to-ocr.c b/convert-to-ocr.c
index c0cfab0..798933a 100644
--- a/convert-to-ocr.c
+++ b/convert-to-ocr.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_ocr);
-}
+SIMPLE(libcharconv_ocr)
diff --git a/convert-to-region-indicators.c b/convert-to-region-indicators.c
index 38758db..86a047d 100644
--- a/convert-to-region-indicators.c
+++ b/convert-to-region-indicators.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_region_indicators);
-}
+SIMPLE(libcharconv_region_indicators)
diff --git a/convert-to-replacement.c b/convert-to-replacement.c
index 6407b52..666843b 100644
--- a/convert-to-replacement.c
+++ b/convert-to-replacement.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_replacement);
-}
+SIMPLE(libcharconv_replacement)
diff --git a/convert-to-sans-serif-bold-italic.c b/convert-to-sans-serif-bold-italic.c
index 9b711f5..a18b695 100644
--- a/convert-to-sans-serif-bold-italic.c
+++ b/convert-to-sans-serif-bold-italic.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_sans_serif_bold_italic);
-}
+SIMPLE(libcharconv_sans_serif_bold_italic)
diff --git a/convert-to-sans-serif-bold.c b/convert-to-sans-serif-bold.c
index 88e9627..8f1e9ce 100644
--- a/convert-to-sans-serif-bold.c
+++ b/convert-to-sans-serif-bold.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_sans_serif_bold);
-}
+SIMPLE(libcharconv_sans_serif_bold)
diff --git a/convert-to-sans-serif-italic.c b/convert-to-sans-serif-italic.c
index 1b1013e..7fa3a6a 100644
--- a/convert-to-sans-serif-italic.c
+++ b/convert-to-sans-serif-italic.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_sans_serif_italic);
-}
+SIMPLE(libcharconv_sans_serif_italic)
diff --git a/convert-to-sans-serif.c b/convert-to-sans-serif.c
index c3d822f..340a58e 100644
--- a/convert-to-sans-serif.c
+++ b/convert-to-sans-serif.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_sans_serif);
-}
+SIMPLE(libcharconv_sans_serif)
diff --git a/convert-to-script.c b/convert-to-script.c
index 730efd4..4f33509 100644
--- a/convert-to-script.c
+++ b/convert-to-script.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_script);
-}
+SIMPLE(libcharconv_script)
diff --git a/convert-to-segmented.c b/convert-to-segmented.c
index b3b783c..68bb6a4 100644
--- a/convert-to-segmented.c
+++ b/convert-to-segmented.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_segmented);
-}
+SIMPLE(libcharconv_segmented)
diff --git a/convert-to-shogi.c b/convert-to-shogi.c
index 1b45b90..1e073cf 100644
--- a/convert-to-shogi.c
+++ b/convert-to-shogi.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_shogi);
-}
+SIMPLE(libcharconv_shogi)
diff --git a/convert-to-subscript.c b/convert-to-subscript.c
index 6f39c92..ef3221b 100644
--- a/convert-to-subscript.c
+++ b/convert-to-subscript.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_subscript);
-}
+SIMPLE(libcharconv_subscript)
diff --git a/convert-to-superscript.c b/convert-to-superscript.c
index 62037ec..7c5252a 100644
--- a/convert-to-superscript.c
+++ b/convert-to-superscript.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_superscript);
-}
+SIMPLE(libcharconv_superscript)
diff --git a/convert-to-tags.c b/convert-to-tags.c
index 000d4b9..ce5a7a6 100644
--- a/convert-to-tags.c
+++ b/convert-to-tags.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_tags);
-}
+SIMPLE(libcharconv_tags)
diff --git a/convert-to-variation-selectors.c b/convert-to-variation-selectors.c
index 285d888..48df964 100644
--- a/convert-to-variation-selectors.c
+++ b/convert-to-variation-selectors.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_variation_selectors);
-}
+SIMPLE(libcharconv_variation_selectors)
diff --git a/convert-to-yijing-digrams.c b/convert-to-yijing-digrams.c
index 5240adf..685911c 100644
--- a/convert-to-yijing-digrams.c
+++ b/convert-to-yijing-digrams.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_yijing_digrams);
-}
+SIMPLE(libcharconv_yijing_digrams)
diff --git a/convert-to-yijing-hexagrams.c b/convert-to-yijing-hexagrams.c
index 16b0da7..4697e00 100644
--- a/convert-to-yijing-hexagrams.c
+++ b/convert-to-yijing-hexagrams.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_yijing_hexagrams);
-}
+SIMPLE(libcharconv_yijing_hexagrams)
diff --git a/convert-to-yijing-monograms.c b/convert-to-yijing-monograms.c
index e4a8ce1..0c9b249 100644
--- a/convert-to-yijing-monograms.c
+++ b/convert-to-yijing-monograms.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_yijing_monograms);
-}
+SIMPLE(libcharconv_yijing_monograms)
diff --git a/convert-to-yijing-tetragrams.c b/convert-to-yijing-tetragrams.c
index 2c0c2dd..b985a93 100644
--- a/convert-to-yijing-tetragrams.c
+++ b/convert-to-yijing-tetragrams.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_yijing_tetragrams);
-}
+SIMPLE(libcharconv_yijing_tetragrams)
diff --git a/convert-to-yijing-trigrams.c b/convert-to-yijing-trigrams.c
index c135119..48a96c3 100644
--- a/convert-to-yijing-trigrams.c
+++ b/convert-to-yijing-trigrams.c
@@ -1,18 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 #include "common.h"
 
-USAGE("");
-
-
-int
-main(int argc, char *argv[])
-{
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
-	if (argc)
-		usage();
-
-	return convert(&libcharconv_yijing_trigrams);
-}
+SIMPLE(libcharconv_yijing_trigrams)