From: Bruno Haible Date: Sun, 15 Sep 2024 13:16:52 +0000 (+0200) Subject: unigbrk tests: Modernize code. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=60748cab5bc917a544b126e4fc1e04c074d86904;p=gnulib.git unigbrk tests: Modernize code. * tests/unigbrk/test-uc-grapheme-breaks.c (main): Reduce the scope of local variables. Add comments. * tests/unigbrk/test-uc-is-grapheme-break.c (main): Likewise. --- diff --git a/ChangeLog b/ChangeLog index d8396afb00..56ff30e8ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2024-09-15 Bruno Haible + + unigbrk tests: Modernize code. + * tests/unigbrk/test-uc-grapheme-breaks.c (main): Reduce the scope of + local variables. Add comments. + * tests/unigbrk/test-uc-is-grapheme-break.c (main): Likewise. + 2024-09-15 Bruno Haible unilbrk: Fix conflicts between rules. diff --git a/tests/unigbrk/test-uc-grapheme-breaks.c b/tests/unigbrk/test-uc-grapheme-breaks.c index e3f0005899..49eed04c30 100644 --- a/tests/unigbrk/test-uc-grapheme-breaks.c +++ b/tests/unigbrk/test-uc-grapheme-breaks.c @@ -97,9 +97,9 @@ int main (int argc, char *argv[]) { const char *filename; - char line[1024]; FILE *stream; int lineno; + char line[1024]; if (argc != 2) { @@ -118,22 +118,23 @@ main (int argc, char *argv[]) } lineno = 0; - while (fgets (line, sizeof line, stream)) + while (fgets (line, sizeof (line), stream)) { - char *comment; - const char *p; - ucs4_t s[16]; - char breaks[16]; - size_t i = 0; - lineno++; - comment = strchr (line, '#'); + /* Cut off the trailing comment, if any. */ + char *comment = strchr (line, '#'); if (comment != NULL) *comment = '\0'; + /* Is the remaining line blank? */ if (line[strspn (line, " \t\r\n")] == '\0') continue; + const char *p; + ucs4_t s[16]; + char breaks[16]; + size_t i = 0; + s[0] = 0; p = line; do diff --git a/tests/unigbrk/test-uc-is-grapheme-break.c b/tests/unigbrk/test-uc-is-grapheme-break.c index 92674a07fb..939b09b3a9 100644 --- a/tests/unigbrk/test-uc-is-grapheme-break.c +++ b/tests/unigbrk/test-uc-is-grapheme-break.c @@ -59,10 +59,10 @@ int main (int argc, char *argv[]) { const char *filename; - char line[1024]; - int exit_code; FILE *stream; + int exit_code; int lineno; + char line[1024]; if (argc != 2) { @@ -82,9 +82,18 @@ main (int argc, char *argv[]) exit_code = 0; lineno = 0; - while (fgets (line, sizeof line, stream)) + while (fgets (line, sizeof (line), stream)) { - char *comment; + lineno++; + + /* Cut off the trailing comment, if any. */ + char *comment = strchr (line, '#'); + if (comment != NULL) + *comment = '\0'; + /* Is the remaining line blank? */ + if (line[strspn (line, " \t\r\n")] == '\0') + continue; + const char *p; ucs4_t prev; int last_char_prop; @@ -95,14 +104,6 @@ main (int argc, char *argv[]) bool emoji_modifier_sequence_before_last_char; size_t ri_count; - lineno++; - - comment = strchr (line, '#'); - if (comment != NULL) - *comment = '\0'; - if (line[strspn (line, " \t\r\n")] == '\0') - continue; - last_char_prop = -1; incb_consonant_extended = false; incb_consonant_extended_linker = false;