From 249e18cd0e69c7afc53c8dd127cf35197c001c9b Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Mon, 1 Oct 2018 15:47:14 +0200
Subject: [PATCH] Remove unnecessary trailing comma in struct initializers.

* gettext-tools/src/msgattrib.c (long_options): Remove trailing comma in
initializer.
* gettext-tools/src/msgcat.c (long_options): Likewise.
* gettext-tools/src/msgcomm.c (long_options): Likewise.
* gettext-tools/src/msgconv.c (long_options): Likewise.
* gettext-tools/src/msgen.c (long_options): Likewise.
* gettext-tools/src/msgfilter.c (long_options): Likewise.
* gettext-tools/src/msgmerge.c (long_options): Likewise.
* gettext-tools/src/msgunfmt.c (long_options): Likewise.
* gettext-tools/src/msguniq.c (long_options): Likewise.
* gettext-tools/src/xgettext.c (long_options): Likewise.
---
 gettext-tools/src/msgattrib.c | 2 +-
 gettext-tools/src/msgcat.c    | 6 +++---
 gettext-tools/src/msgcomm.c   | 6 +++---
 gettext-tools/src/msgconv.c   | 2 +-
 gettext-tools/src/msgen.c     | 2 +-
 gettext-tools/src/msgfilter.c | 2 +-
 gettext-tools/src/msgmerge.c  | 4 ++--
 gettext-tools/src/msgunfmt.c  | 2 +-
 gettext-tools/src/msguniq.c   | 2 +-
 gettext-tools/src/xgettext.c  | 2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/gettext-tools/src/msgattrib.c b/gettext-tools/src/msgattrib.c
index 6ffd2581c..ff38dc666 100644
--- a/gettext-tools/src/msgattrib.c
+++ b/gettext-tools/src/msgattrib.c
@@ -119,7 +119,7 @@ static const struct option long_options[] =
   { "translated", no_argument, NULL, CHAR_MAX + 1 },
   { "untranslated", no_argument, NULL, CHAR_MAX + 2 },
   { "version", no_argument, NULL, 'V' },
-  { "width", required_argument, NULL, 'w', },
+  { "width", required_argument, NULL, 'w' },
   { NULL, 0, NULL, 0 }
 };
 
diff --git a/gettext-tools/src/msgcat.c b/gettext-tools/src/msgcat.c
index 438ada42b..f35a4f852 100644
--- a/gettext-tools/src/msgcat.c
+++ b/gettext-tools/src/msgcat.c
@@ -87,9 +87,9 @@ static const struct option long_options[] =
   { "unique", no_argument, NULL, 'u' },
   { "use-first", no_argument, NULL, CHAR_MAX + 1 },
   { "version", no_argument, NULL, 'V' },
-  { "width", required_argument, NULL, 'w', },
-  { "more-than", required_argument, NULL, '>', },
-  { "less-than", required_argument, NULL, '<', },
+  { "width", required_argument, NULL, 'w' },
+  { "more-than", required_argument, NULL, '>' },
+  { "less-than", required_argument, NULL, '<' },
   { NULL, 0, NULL, 0 }
 };
 
diff --git a/gettext-tools/src/msgcomm.c b/gettext-tools/src/msgcomm.c
index a65797d83..9f7b0b236 100644
--- a/gettext-tools/src/msgcomm.c
+++ b/gettext-tools/src/msgcomm.c
@@ -88,9 +88,9 @@ static const struct option long_options[] =
   { "to-code", required_argument, NULL, 't' },
   { "unique", no_argument, NULL, 'u' },
   { "version", no_argument, NULL, 'V' },
-  { "width", required_argument, NULL, 'w', },
-  { "more-than", required_argument, NULL, '>', },
-  { "less-than", required_argument, NULL, '<', },
+  { "width", required_argument, NULL, 'w' },
+  { "more-than", required_argument, NULL, '>' },
+  { "less-than", required_argument, NULL, '<' },
   { NULL, 0, NULL, 0 }
 };
 
diff --git a/gettext-tools/src/msgconv.c b/gettext-tools/src/msgconv.c
index f9ddfe2b4..409b4cb43 100644
--- a/gettext-tools/src/msgconv.c
+++ b/gettext-tools/src/msgconv.c
@@ -82,7 +82,7 @@ static const struct option long_options[] =
   { "style", required_argument, NULL, CHAR_MAX + 5 },
   { "to-code", required_argument, NULL, 't' },
   { "version", no_argument, NULL, 'V' },
-  { "width", required_argument, NULL, 'w', },
+  { "width", required_argument, NULL, 'w' },
   { NULL, 0, NULL, 0 }
 };
 
diff --git a/gettext-tools/src/msgen.c b/gettext-tools/src/msgen.c
index 2ba7a5d98..38190f746 100644
--- a/gettext-tools/src/msgen.c
+++ b/gettext-tools/src/msgen.c
@@ -79,7 +79,7 @@ static const struct option long_options[] =
   { "stringtable-output", no_argument, NULL, CHAR_MAX + 3 },
   { "style", required_argument, NULL, CHAR_MAX + 6 },
   { "version", no_argument, NULL, 'V' },
-  { "width", required_argument, NULL, 'w', },
+  { "width", required_argument, NULL, 'w' },
   { NULL, 0, NULL, 0 }
 };
 
diff --git a/gettext-tools/src/msgfilter.c b/gettext-tools/src/msgfilter.c
index 18ed609ba..ae64240d8 100644
--- a/gettext-tools/src/msgfilter.c
+++ b/gettext-tools/src/msgfilter.c
@@ -112,7 +112,7 @@ static const struct option long_options[] =
   { "stringtable-output", no_argument, NULL, CHAR_MAX + 5 },
   { "style", required_argument, NULL, CHAR_MAX + 7 },
   { "version", no_argument, NULL, 'V' },
-  { "width", required_argument, NULL, 'w', },
+  { "width", required_argument, NULL, 'w' },
   { NULL, 0, NULL, 0 }
 };
 
diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
index 8e50fb6c3..90c2b69a1 100644
--- a/gettext-tools/src/msgmerge.c
+++ b/gettext-tools/src/msgmerge.c
@@ -111,7 +111,7 @@ static const struct option long_options[] =
   { "add-location", optional_argument, NULL, 'n' },
   { "backup", required_argument, NULL, CHAR_MAX + 1 },
   { "color", optional_argument, NULL, CHAR_MAX + 9 },
-  { "compendium", required_argument, NULL, 'C', },
+  { "compendium", required_argument, NULL, 'C' },
   { "directory", required_argument, NULL, 'D' },
   { "escape", no_argument, NULL, 'E' },
   { "force-po", no_argument, &force_po, 1 },
@@ -139,7 +139,7 @@ static const struct option long_options[] =
   { "update", no_argument, NULL, 'U' },
   { "verbose", no_argument, NULL, 'v' },
   { "version", no_argument, NULL, 'V' },
-  { "width", required_argument, NULL, 'w', },
+  { "width", required_argument, NULL, 'w' },
   { NULL, 0, NULL, 0 }
 };
 
diff --git a/gettext-tools/src/msgunfmt.c b/gettext-tools/src/msgunfmt.c
index ae4437ca8..565e14bca 100644
--- a/gettext-tools/src/msgunfmt.c
+++ b/gettext-tools/src/msgunfmt.c
@@ -100,7 +100,7 @@ static const struct option long_options[] =
   { "tcl", no_argument, NULL, CHAR_MAX + 1 },
   { "verbose", no_argument, NULL, 'v' },
   { "version", no_argument, NULL, 'V' },
-  { "width", required_argument, NULL, 'w', },
+  { "width", required_argument, NULL, 'w' },
   { NULL, 0, NULL, 0 }
 };
 
diff --git a/gettext-tools/src/msguniq.c b/gettext-tools/src/msguniq.c
index 301acdbff..22f7c83d7 100644
--- a/gettext-tools/src/msguniq.c
+++ b/gettext-tools/src/msguniq.c
@@ -85,7 +85,7 @@ static const struct option long_options[] =
   { "unique", no_argument, NULL, 'u' },
   { "use-first", no_argument, NULL, CHAR_MAX + 1 },
   { "version", no_argument, NULL, 'V' },
-  { "width", required_argument, NULL, 'w', },
+  { "width", required_argument, NULL, 'w' },
   { NULL, 0, NULL, 0 }
 };
 
diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index 968472dac..00d5a946b 100644
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -274,7 +274,7 @@ static const struct option long_options[] =
   { "style", required_argument, NULL, CHAR_MAX + 15 },
   { "trigraphs", no_argument, NULL, 'T' },
   { "version", no_argument, NULL, 'V' },
-  { "width", required_argument, NULL, 'w', },
+  { "width", required_argument, NULL, 'w' },
   { NULL, 0, NULL, 0 }
 };
 
-- 
2.47.3