examples/sndfile-metadata-set.c : Clean up handling of bext command line params.

1 files changed, 14 insertions, 54 deletions

diff --git a/examples/sndfile-metadata-set.c b/examples/sndfile-metadata-set.c
index e48e4dc..4df1eb4 100644
--- a/examples/sndfile-metadata-set.c
+++ b/examples/sndfile-metadata-set.c
@@ -118,68 +118,28 @@ main (int argc, char *argv [])
 			continue ;
 			} ;
 
-		if (strcmp (argv [k], "--bext-description") == 0)
-		{	k ++ ;
-			if (k == argc) missing_param (argv [k - 1]) ;
-
-			info.description = argv [k] ;
-			continue ;
-			} ;
-
-		if (strcmp (argv [k], "--bext-originator") == 0)
-		{	k ++ ;
-			if (k == argc) missing_param (argv [k - 1]) ;
-
-			info.originator = argv [k] ;
-			continue ;
-			} ;
-
-		if (strcmp (argv [k], "--bext-orig-ref") == 0)
-		{	k ++ ;
-			if (k == argc) missing_param (argv [k - 1]) ;
-
-			info.originator_reference = argv [k] ;
-			continue ;
-			} ;
-
-		if (strcmp (argv [k], "--bext-umid") == 0)
-		{	k ++ ;
-			if (k == argc) missing_param (argv [k - 1]) ;
-
-			info.umid = argv [k] ;
-			continue ;
-			} ;
-
-		if (strcmp (argv [k], "--bext-orig-date") == 0)
-		{	k ++ ;
-			if (k == argc) missing_param (argv [k - 1]) ;
-
-			info.origination_date = argv [k] ;
-			continue ;
-			} ;
-
-		if (strcmp (argv [k], "--bext-orig-time") == 0)
-		{	k ++ ;
-			if (k == argc) missing_param (argv [k - 1]) ;
-
-			info.origination_time = argv [k] ;
-			puts (info.origination_time) ;
-			continue ;
+#define HANDLE_BEXT_ARG(cmd,field) \
+		if (strcmp (argv [k], cmd) == 0) \
+		{	k ++ ; \
+			if (k == argc) missing_param (argv [k - 1]) ; \
+			info.field = argv [k] ; \
+			continue ; \
 			} ;
 
-		if (strcmp (argv [k], "--bext-coding-hist") == 0)
-		{	k ++ ;
-			if (k == argc) missing_param (argv [k - 1]) ;
-
-			info.coding_history = argv [k] ;
-			continue ;
-			} ;
+		HANDLE_BEXT_ARG ("--bext-description", description) ;
+		HANDLE_BEXT_ARG ("--bext-originator", originator) ;
+		HANDLE_BEXT_ARG ("--bext-orig-ref", originator_reference) ;
+		HANDLE_BEXT_ARG ("--bext-umid", umid) ;
+		HANDLE_BEXT_ARG ("--bext-orig-date", origination_date) ;
+		HANDLE_BEXT_ARG ("--bext-orig-time", origination_time) ;
+		HANDLE_BEXT_ARG ("--bext-coding-hist", coding_history) ;
 
 		if (strcmp (argv [k], "--bext-coding-hist-append") == 0)
 		{	k ++ ;
 			if (k == argc) missing_param (argv [k - 1]) ;
 
 			info.coding_history = argv [k] ;
+			info.coding_hist_append = 1 ;
 			continue ;
 			} ;