summaryrefslogtreecommitdiffstats
path: root/gettext-tools/src
diff options
context:
space:
mode:
Diffstat (limited to 'gettext-tools/src')
-rw-r--r--gettext-tools/src/ChangeLog8
-rw-r--r--gettext-tools/src/read-desktop.c15
2 files changed, 14 insertions, 9 deletions
diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 0a4dbdb..7a96c18 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,11 @@
+2015-01-16 Daiki Ueno <ueno@gnu.org>
+
+ desktop: Avoid useless warning for group header
+ Reported by Marek Černocký at:
+ <https://savannah.gnu.org/bugs/?44005>
+ * read-desktop.c (desktop_lex): Fix "invalid non-blank
+ character" check after reading a group header.
+
2015-01-13 Daiki Ueno <ueno@gnu.org>
* x-c.c (phase5_get): Reset raw_expected at the beginning of the
diff --git a/gettext-tools/src/read-desktop.c b/gettext-tools/src/read-desktop.c
index 8f9243b..be574ce 100644
--- a/gettext-tools/src/read-desktop.c
+++ b/gettext-tools/src/read-desktop.c
@@ -271,16 +271,13 @@ desktop_lex (token_ty *tp)
break;
}
/* Skip until newline. */
- if (c != '\n')
+ while (c != '\n' && c != EOF)
{
- for (;;)
- {
- if (c == '\n' || c == EOF)
- break;
- if (!c_isspace (c))
- non_blank = true;
- c = phase2_getc ();
- }
+ c = phase2_getc ();
+ if (c == EOF)
+ break;
+ if (!c_isspace (c))
+ non_blank = true;
}
if (non_blank)
po_xerror (PO_SEVERITY_WARNING, NULL,