summaryrefslogtreecommitdiffstats
path: root/gettext-tools/src
diff options
context:
space:
mode:
Diffstat (limited to 'gettext-tools/src')
-rw-r--r--gettext-tools/src/format-c.c2
-rw-r--r--gettext-tools/src/format-lisp.c6
-rw-r--r--gettext-tools/src/hostname.c2
-rw-r--r--gettext-tools/src/message.c2
-rw-r--r--gettext-tools/src/msgattrib.c2
-rw-r--r--gettext-tools/src/msgcat.c10
-rw-r--r--gettext-tools/src/msgcomm.c10
-rw-r--r--gettext-tools/src/msgmerge.c8
-rw-r--r--gettext-tools/src/msguniq.c8
-rw-r--r--gettext-tools/src/po-lex.c2
-rw-r--r--gettext-tools/src/po-time.c22
-rw-r--r--gettext-tools/src/urlget.c2
-rw-r--r--gettext-tools/src/write-po.c10
-rw-r--r--gettext-tools/src/x-awk.c4
-rw-r--r--gettext-tools/src/x-c.c12
-rw-r--r--gettext-tools/src/x-elisp.c2
-rw-r--r--gettext-tools/src/x-librep.c2
-rw-r--r--gettext-tools/src/x-php.c4
-rw-r--r--gettext-tools/src/x-python.c4
-rw-r--r--gettext-tools/src/x-tcl.c2
-rw-r--r--gettext-tools/src/xgettext.c6
21 files changed, 61 insertions, 61 deletions
diff --git a/gettext-tools/src/format-c.c b/gettext-tools/src/format-c.c
index 117cc8c..ca17288 100644
--- a/gettext-tools/src/format-c.c
+++ b/gettext-tools/src/format-c.c
@@ -751,7 +751,7 @@ format_parse (const char *format, char **invalid_reason)
spec.allocated = spec.unnumbered_arg_count;
spec.unnumbered = (struct unnumbered_arg *) xmalloc (spec.allocated * sizeof (struct unnumbered_arg));
for (i = 0; i < spec.unnumbered_arg_count; i++)
- spec.unnumbered[i].type = numbered[i].type;
+ spec.unnumbered[i].type = numbered[i].type;
free (numbered);
numbered_arg_count = 0;
}
diff --git a/gettext-tools/src/format-lisp.c b/gettext-tools/src/format-lisp.c
index f78ebbf..067d9b1 100644
--- a/gettext-tools/src/format-lisp.c
+++ b/gettext-tools/src/format-lisp.c
@@ -417,7 +417,7 @@ normalize_outermost_list (struct format_arg_list *list)
n = list->initial.count;
for (i = j = 0; i < n; i++)
if (j > 0
- && equal_element (&list->initial.element[i],
+ && equal_element (&list->initial.element[i],
&list->initial.element[j-1]))
{
list->initial.element[j-1].repcount +=
@@ -435,7 +435,7 @@ normalize_outermost_list (struct format_arg_list *list)
n = list->repeated.count;
for (i = j = 0; i < n; i++)
if (j > 0
- && equal_element (&list->repeated.element[i],
+ && equal_element (&list->repeated.element[i],
&list->repeated.element[j-1]))
{
list->repeated.element[j-1].repcount +=
@@ -2469,7 +2469,7 @@ parse_upto (const char **formatp,
unsigned int paramcount = 0;
struct param *params = NULL;
- /* Count number of directives. */
+ /* Count number of directives. */
spec->directives++;
/* Parse parameters. */
diff --git a/gettext-tools/src/hostname.c b/gettext-tools/src/hostname.c
index 67e6072..8b4902b 100644
--- a/gettext-tools/src/hostname.c
+++ b/gettext-tools/src/hostname.c
@@ -178,7 +178,7 @@ main (int argc, char *argv[])
This is free software; see the source for copying conditions. There is NO\n\
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
"),
- "2001-2003");
+ "2001-2003");
printf (_("Written by %s.\n"), "Bruno Haible");
exit (EXIT_SUCCESS);
}
diff --git a/gettext-tools/src/message.c b/gettext-tools/src/message.c
index 516b856..f3845a0 100644
--- a/gettext-tools/src/message.c
+++ b/gettext-tools/src/message.c
@@ -612,7 +612,7 @@ msgdomain_list_search (msgdomain_list_ty *mdlp, const char *msgid)
mdp = mdlp->item[j];
mp = message_list_search (mdp->messages, msgid);
if (mp)
- return mp;
+ return mp;
}
return NULL;
}
diff --git a/gettext-tools/src/msgattrib.c b/gettext-tools/src/msgattrib.c
index 7e33689..0e78d9f 100644
--- a/gettext-tools/src/msgattrib.c
+++ b/gettext-tools/src/msgattrib.c
@@ -178,7 +178,7 @@ main (int argc, char **argv)
case 'F':
sort_by_filepos = true;
- break;
+ break;
case 'h':
do_help = true;
diff --git a/gettext-tools/src/msgcat.c b/gettext-tools/src/msgcat.c
index 1211aa2..f78ee2b 100644
--- a/gettext-tools/src/msgcat.c
+++ b/gettext-tools/src/msgcat.c
@@ -175,7 +175,7 @@ main (int argc, char **argv)
case 'F':
sort_by_filepos = true;
- break;
+ break;
case 'h':
do_help = true;
@@ -215,8 +215,8 @@ main (int argc, char **argv)
break;
case 'u':
- less_than = 2;
- break;
+ less_than = 2;
+ break;
case 'V':
do_version = true;
@@ -275,8 +275,8 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
/* Check the message selection criteria for sanity. */
if (more_than >= less_than || less_than < 2)
error (EXIT_FAILURE, 0,
- _("impossible selection criteria specified (%d < n < %d)"),
- more_than, less_than);
+ _("impossible selection criteria specified (%d < n < %d)"),
+ more_than, less_than);
/* Determine list of files we have to process. */
if (files_from != NULL)
diff --git a/gettext-tools/src/msgcomm.c b/gettext-tools/src/msgcomm.c
index 5f18297..6a6c41b 100644
--- a/gettext-tools/src/msgcomm.c
+++ b/gettext-tools/src/msgcomm.c
@@ -173,7 +173,7 @@ main (int argc, char *argv[])
case 'F':
sort_by_filepos = true;
- break;
+ break;
case 'h':
do_help = true;
@@ -212,8 +212,8 @@ main (int argc, char *argv[])
break;
case 'u':
- less_than = 2;
- break;
+ less_than = 2;
+ break;
case 'V':
do_version = true;
@@ -292,8 +292,8 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
less_than = INT_MAX;
if (more_than >= less_than || less_than < 2)
error (EXIT_FAILURE, 0,
- _("impossible selection criteria specified (%d < n < %d)"),
- more_than, less_than);
+ _("impossible selection criteria specified (%d < n < %d)"),
+ more_than, less_than);
/* Read input files, then filter, convert and merge messages. */
allow_duplicates = true;
diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
index 0ff0262..502dd09 100644
--- a/gettext-tools/src/msgmerge.c
+++ b/gettext-tools/src/msgmerge.c
@@ -193,8 +193,8 @@ main (int argc, char **argv)
break;
case 'F':
- sort_by_filepos = true;
- break;
+ sort_by_filepos = true;
+ break;
case 'h':
do_help = true;
@@ -229,8 +229,8 @@ main (int argc, char **argv)
break;
case 's':
- sort_by_msgid = true;
- break;
+ sort_by_msgid = true;
+ break;
case 'U':
update_mode = true;
diff --git a/gettext-tools/src/msguniq.c b/gettext-tools/src/msguniq.c
index c12e870..6e7ff9e 100644
--- a/gettext-tools/src/msguniq.c
+++ b/gettext-tools/src/msguniq.c
@@ -133,7 +133,7 @@ main (int argc, char **argv)
break;
case 'd':
- more_than = 1;
+ more_than = 1;
less_than = INT_MAX;
break;
@@ -151,7 +151,7 @@ main (int argc, char **argv)
case 'F':
sort_by_filepos = true;
- break;
+ break;
case 'h':
do_help = true;
@@ -190,9 +190,9 @@ main (int argc, char **argv)
break;
case 'u':
- more_than = 0;
+ more_than = 0;
less_than = 2;
- break;
+ break;
case 'V':
do_version = true;
diff --git a/gettext-tools/src/po-lex.c b/gettext-tools/src/po-lex.c
index f355540..7e7f250 100644
--- a/gettext-tools/src/po-lex.c
+++ b/gettext-tools/src/po-lex.c
@@ -177,7 +177,7 @@ memcpy_small (void *dst, const void *src, size_t n)
*q = *p;
if (--n > 0)
- do *++q = *++p; while (--n > 0);
+ do *++q = *++p; while (--n > 0);
}
}
diff --git a/gettext-tools/src/po-time.c b/gettext-tools/src/po-time.c
index 6583395..8973fe3 100644
--- a/gettext-tools/src/po-time.c
+++ b/gettext-tools/src/po-time.c
@@ -1,5 +1,5 @@
/* PO/POT file timestamps.
- Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
+ Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
This program is free software; you can redistribute it and/or modify
@@ -36,18 +36,18 @@ difftm (const struct tm *a, const struct tm *b)
int by = b->tm_year + TM_YEAR_ORIGIN - 1;
/* Some compilers cannot handle this as a single return statement. */
long days = (
- /* difference in day of year */
- a->tm_yday - b->tm_yday
- /* + intervening leap days */
- + ((ay >> 2) - (by >> 2))
- - (ay / 100 - by / 100)
- + ((ay / 100 >> 2) - (by / 100 >> 2))
- /* + difference in years * 365 */
- + (long) (ay - by) * 365l);
+ /* difference in day of year */
+ a->tm_yday - b->tm_yday
+ /* + intervening leap days */
+ + ((ay >> 2) - (by >> 2))
+ - (ay / 100 - by / 100)
+ + ((ay / 100 >> 2) - (by / 100 >> 2))
+ /* + difference in years * 365 */
+ + (long) (ay - by) * 365l);
return 60l * (60l * (24l * days + (a->tm_hour - b->tm_hour))
- + (a->tm_min - b->tm_min))
- + (a->tm_sec - b->tm_sec);
+ + (a->tm_min - b->tm_min))
+ + (a->tm_sec - b->tm_sec);
}
diff --git a/gettext-tools/src/urlget.c b/gettext-tools/src/urlget.c
index 3adb5a2..19592aa 100644
--- a/gettext-tools/src/urlget.c
+++ b/gettext-tools/src/urlget.c
@@ -135,7 +135,7 @@ main (int argc, char *argv[])
This is free software; see the source for copying conditions. There is NO\n\
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
"),
- "2001-2003");
+ "2001-2003");
printf (_("Written by %s.\n"), "Bruno Haible");
exit (EXIT_SUCCESS);
}
diff --git a/gettext-tools/src/write-po.c b/gettext-tools/src/write-po.c
index 4befb10..9992ddb 100644
--- a/gettext-tools/src/write-po.c
+++ b/gettext-tools/src/write-po.c
@@ -400,7 +400,7 @@ memcpy_small (void *dst, const void *src, size_t n)
*q = *p;
if (--n > 0)
- do *++q = *++p; while (--n > 0);
+ do *++q = *++p; while (--n > 0);
}
}
@@ -475,9 +475,9 @@ wrap (FILE *fp, const char *line_prefix, const char *name, const char *value,
do
{
/* The \a and \v escapes were added by the ANSI C Standard.
- Prior to the Standard, most compilers did not have them.
- Because we need the same program on all platforms we don't provide
- support for them here. Thus we only support \b\f\n\r\t. */
+ Prior to the Standard, most compilers did not have them.
+ Because we need the same program on all platforms we don't provide
+ support for them here. Thus we only support \b\f\n\r\t. */
# define is_escape(c) \
((c) == '\b' || (c) == '\f' || (c) == '\n' || (c) == '\r' || (c) == '\t')
@@ -747,7 +747,7 @@ internationalized messages should not contain the `\\%c' escape sequence"),
this is the first line, and if the indented style is being
used. INDENT-F. */
if (line_prefix != NULL)
- fputs (line_prefix, fp);
+ fputs (line_prefix, fp);
if (first_line)
{
fputs (name, fp);
diff --git a/gettext-tools/src/x-awk.c b/gettext-tools/src/x-awk.c
index 3f8346f..40d1194 100644
--- a/gettext-tools/src/x-awk.c
+++ b/gettext-tools/src/x-awk.c
@@ -716,8 +716,8 @@ extract_parenthesized (message_list_ty *mlp,
if (extract_all)
continue;
if (state
- ? extract_parenthesized (mlp, next_commas_to_skip,
- next_plural_commas)
+ ? extract_parenthesized (mlp, next_commas_to_skip,
+ next_plural_commas)
: extract_parenthesized (mlp, -1, 0))
return true;
state = 0;
diff --git a/gettext-tools/src/x-c.c b/gettext-tools/src/x-c.c
index 47f6b72..05797fb 100644
--- a/gettext-tools/src/x-c.c
+++ b/gettext-tools/src/x-c.c
@@ -580,8 +580,8 @@ phase7_getc ()
return '\b';
/* The \e escape is preculiar to gcc, and assumes an ASCII
- character set (or superset). We don't provide support for it
- here. */
+ character set (or superset). We don't provide support for it
+ here. */
case 'f':
return '\f';
@@ -945,8 +945,8 @@ phase5_get (token_ty *tp)
default:
/* We could carefully recognize each of the 2 and 3 character
- operators, but it is not necessary, as we only need to recognize
- gettext invocations. Don't bother. */
+ operators, but it is not necessary, as we only need to recognize
+ gettext invocations. Don't bother. */
tp->type = token_type_symbol;
return;
}
@@ -1387,8 +1387,8 @@ extract_parenthesized (message_list_ty *mlp,
if (extract_all)
continue;
if (state
- ? extract_parenthesized (mlp, next_commas_to_skip,
- next_plural_commas)
+ ? extract_parenthesized (mlp, next_commas_to_skip,
+ next_plural_commas)
: extract_parenthesized (mlp, -1, 0))
return true;
state = 0;
diff --git a/gettext-tools/src/x-elisp.c b/gettext-tools/src/x-elisp.c
index 625d79f..9c0fb94 100644
--- a/gettext-tools/src/x-elisp.c
+++ b/gettext-tools/src/x-elisp.c
@@ -526,7 +526,7 @@ do_getc_escaped (int c, bool in_string)
case '^':
c = do_getc ();
if (c == EOF)
- return EOF;
+ return EOF;
if (c == '\\')
{
c = do_getc ();
diff --git a/gettext-tools/src/x-librep.c b/gettext-tools/src/x-librep.c
index 3af8beb..82d5bf2 100644
--- a/gettext-tools/src/x-librep.c
+++ b/gettext-tools/src/x-librep.c
@@ -525,7 +525,7 @@ do_getc_escaped (int c)
case '^':
c = do_getc ();
if (c == EOF)
- return EOF;
+ return EOF;
return c & 0x1f;
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7':
diff --git a/gettext-tools/src/x-php.c b/gettext-tools/src/x-php.c
index b589fcf..fc7bd24 100644
--- a/gettext-tools/src/x-php.c
+++ b/gettext-tools/src/x-php.c
@@ -1238,8 +1238,8 @@ extract_parenthesized (message_list_ty *mlp,
if (extract_all)
continue;
if (state
- ? extract_parenthesized (mlp, next_commas_to_skip,
- next_plural_commas)
+ ? extract_parenthesized (mlp, next_commas_to_skip,
+ next_plural_commas)
: extract_parenthesized (mlp, -1, 0))
return true;
state = 0;
diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c
index e2c69c4..3c562a2 100644
--- a/gettext-tools/src/x-python.c
+++ b/gettext-tools/src/x-python.c
@@ -1037,8 +1037,8 @@ extract_parenthesized (message_list_ty *mlp,
if (extract_all)
continue;
if (state
- ? extract_parenthesized (mlp, next_commas_to_skip,
- next_plural_commas)
+ ? extract_parenthesized (mlp, next_commas_to_skip,
+ next_plural_commas)
: extract_parenthesized (mlp, -1, 0))
return true;
state = 0;
diff --git a/gettext-tools/src/x-tcl.c b/gettext-tools/src/x-tcl.c
index e9866a7..b36b799 100644
--- a/gettext-tools/src/x-tcl.c
+++ b/gettext-tools/src/x-tcl.c
@@ -521,7 +521,7 @@ do_getc_escaped ()
{
int n = c - '0';
- c = phase1_getc ();
+ c = phase1_getc ();
if (c != EOF)
{
if (c >= '0' && c <= '7')
diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index 9caa7e2..1b83d0e 100644
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -313,7 +313,7 @@ main (int argc, char *argv[])
break;
case 'F':
sort_by_filepos = true;
- break;
+ break;
case 'h':
do_help = true;
break;
@@ -565,7 +565,7 @@ This version was built without iconv()."),
fname = file_list->item[cnt];
if (extractor)
- this_file_extractor = extractor;
+ this_file_extractor = extractor;
else
{
const char *extension;
@@ -1342,7 +1342,7 @@ construct_header ()
if (msgid_bugs_address != NULL && msgid_bugs_address[0] == '\0')
multiline_warning (xasprintf (_("warning: ")),
- xstrdup (_("\
+ xstrdup (_("\
The option --msgid-bugs-address was not specified.\n\
If you are using a `Makevars' file, please specify\n\
the MSGID_BUGS_ADDRESS variable there; otherwise please\n\
generated by cgit v1.1 at 2025-01-11 08:55:39 +0000