aboutsummaryrefslogtreecommitdiff
path: root/locale/programs
diff options
context:
space:
mode:
Diffstat (limited to 'locale/programs')
-rw-r--r--locale/programs/ld-ctype.c10
-rw-r--r--locale/programs/ld-messages.c4
-rw-r--r--locale/programs/ld-monetary.c6
-rw-r--r--locale/programs/ld-time.c48
4 files changed, 25 insertions, 43 deletions
diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index 3c0c8e870d..6ce48b7996 100644
--- a/locale/programs/ld-ctype.c
+++ b/locale/programs/ld-ctype.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
@@ -268,7 +268,7 @@ ctype_finish (struct localedef_t *locale, struct charset_t *charset)
if (!be_quiet)
error (0, 0, _("\
character %s'%s' in class `%s' must be in class `%s'"), value > 256 ? "L" : "",
- cp, valid_table[cls1].name,
+ buf, valid_table[cls1].name,
valid_table[cls2].name);
}
break;
@@ -293,7 +293,7 @@ character %s'%s' in class `%s' must be in class `%s'"), value > 256 ? "L" : "",
if (!be_quiet)
error (0, 0, _("\
character %s'%s' in class `%s' must not be in class `%s'"),
- value > 256 ? "L" : "", cp,
+ value > 256 ? "L" : "", buf,
valid_table[cls1].name,
valid_table[cls2].name);
}
@@ -882,7 +882,7 @@ implementation limit: no more than %d character maps allowed"),
/* We have to be prepared that TABLE, MAX, and ACT can be NULL. This
- is possible if we only want ot extend the name array. */
+ is possible if we only want to extend the name array. */
static u_int32_t *
find_idx (struct locale_ctype_t *ctype, u_int32_t **table, size_t *max,
size_t *act, unsigned int idx)
@@ -896,7 +896,7 @@ find_idx (struct locale_ctype_t *ctype, u_int32_t **table, size_t *max,
if (ctype->charnames[cnt] == idx)
break;
- /* We have to distinguish two cases: the names is found or not. */
+ /* We have to distinguish two cases: the name is found or not. */
if (cnt == ctype->charnames_act)
{
/* Extend the name array. */
diff --git a/locale/programs/ld-messages.c b/locale/programs/ld-messages.c
index e52f5413e2..288979f454 100644
--- a/locale/programs/ld-messages.c
+++ b/locale/programs/ld-messages.c
@@ -91,7 +91,7 @@ messages_finish (struct localedef_t *locale)
int result;
regex_t re;
- /* Test whether it are correct regular expressions. */
+ /* Test whether it is a correct regular expression. */
result = regcomp (&re, messages->yesexpr, REG_EXTENDED);
if (result != 0 && !be_quiet)
{
@@ -115,7 +115,7 @@ no correct regular expression for field `%s' in category `%s': %s"),
int result;
regex_t re;
- /* Test whether it are correct regular expressions. */
+ /* Test whether it is a correct regular expression. */
result = regcomp (&re, messages->noexpr, REG_EXTENDED);
if (result != 0 && !be_quiet)
{
diff --git a/locale/programs/ld-monetary.c b/locale/programs/ld-monetary.c
index 6c7c3c3cfd..a74486ad60 100644
--- a/locale/programs/ld-monetary.c
+++ b/locale/programs/ld-monetary.c
@@ -62,7 +62,7 @@ struct locale_monetary_t
};
-/* The content iof the field int_curr_symbol has to be taken from
+/* The contents of the field int_curr_symbol have to be taken from
ISO-4217. We test for correct values. */
#define DEFINE_INT_CURR(str) str,
static const char *const valid_int_curr[] =
@@ -174,8 +174,8 @@ value for field `%s' in category `%s' must be in range %d...%d"), \
#cat, "LC_MONETARY", min, max)
#if 0
- /* The following two test are not really necessary because all values
- the variable could have are valid. */
+ /* The following two tests are not really necessary because all values
+ the variable could have are valid. */
TEST_ELEM (int_frac_digits, -128, 127); /* No range check. */
TEST_ELEM (frac_digits, -128, 127); /* No range check. */
#endif
diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c
index 399f7a77ab..bee0b0ea64 100644
--- a/locale/programs/ld-time.c
+++ b/locale/programs/ld-time.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
@@ -357,8 +357,11 @@ time_finish (struct localedef_t *locale)
if (!be_quiet)
error (0, 0, _("missing era name in string %d in `era' field"
" in category `%s'"), idx + 1, "LC_TIME");
- time->era_entries[idx].name =
- time->era_entries[idx].format = "";
+ /* Make sure that name and format are adjacent strings
+ in memory. */
+ time->era_entries[idx].name = "\0";
+ time->era_entries[idx].format
+ = time->era_entries[idx].name + 1;
}
else
{
@@ -370,8 +373,11 @@ time_finish (struct localedef_t *locale)
error (0, 0, _("missing era format in string %d in `era'"
" field in category `%s'"),
idx + 1, "LC_TIME");
- time->era_entries[idx].name =
- time->era_entries[idx].format = "";
+ /* Make sure that name and format are adjacent strings
+ in memory. */
+ time->era_entries[idx].name = "\0";
+ time->era_entries[idx].format
+ = time->era_entries[idx].name + 1;
}
else
time->era_entries[idx].format = str;
@@ -589,22 +595,10 @@ time_output (struct localedef_t *locale, const char *output_path)
iov[2 + cnt].iov_len = sizeof (int32_t);
++cnt;
iov[2 + cnt].iov_base = (void *) &ERA_B1[num].start_date[0];
- iov[2 + cnt].iov_len = sizeof (int32_t);
- ++cnt;
- iov[2 + cnt].iov_base = (void *) &ERA_B1[num].start_date[1];
- iov[2 + cnt].iov_len = sizeof (int32_t);
- ++cnt;
- iov[2 + cnt].iov_base = (void *) &ERA_B1[num].start_date[2];
- iov[2 + cnt].iov_len = sizeof (int32_t);
+ iov[2 + cnt].iov_len = 3 * sizeof (int32_t);
++cnt;
iov[2 + cnt].iov_base = (void *) &ERA_B1[num].stop_date[0];
- iov[2 + cnt].iov_len = sizeof (int32_t);
- ++cnt;
- iov[2 + cnt].iov_base = (void *) &ERA_B1[num].stop_date[1];
- iov[2 + cnt].iov_len = sizeof (int32_t);
- ++cnt;
- iov[2 + cnt].iov_base = (void *) &ERA_B1[num].stop_date[2];
- iov[2 + cnt].iov_len = sizeof (int32_t);
+ iov[2 + cnt].iov_len = 3 * sizeof (int32_t);
++cnt;
l = (strchr (ERA_B1[num].format, '\0') - ERA_B1[num].name) + 1;
@@ -631,22 +625,10 @@ time_output (struct localedef_t *locale, const char *output_path)
iov[2 + cnt].iov_len = sizeof (int32_t);
++cnt;
iov[2 + cnt].iov_base = (void *) &ERA_B2[num].start_date[0];
- iov[2 + cnt].iov_len = sizeof (int32_t);
- ++cnt;
- iov[2 + cnt].iov_base = (void *) &ERA_B2[num].start_date[1];
- iov[2 + cnt].iov_len = sizeof (int32_t);
- ++cnt;
- iov[2 + cnt].iov_base = (void *) &ERA_B2[num].start_date[2];
- iov[2 + cnt].iov_len = sizeof (int32_t);
+ iov[2 + cnt].iov_len = 3 * sizeof (int32_t);
++cnt;
iov[2 + cnt].iov_base = (void *) &ERA_B2[num].stop_date[0];
- iov[2 + cnt].iov_len = sizeof (int32_t);
- ++cnt;
- iov[2 + cnt].iov_base = (void *) &ERA_B2[num].stop_date[1];
- iov[2 + cnt].iov_len = sizeof (int32_t);
- ++cnt;
- iov[2 + cnt].iov_base = (void *) &ERA_B2[num].stop_date[2];
- iov[2 + cnt].iov_len = sizeof (int32_t);
+ iov[2 + cnt].iov_len = 3 * sizeof (int32_t);
++cnt;
l = (strchr (ERA_B2[num].format, '\0') - ERA_B2[num].name) + 1;
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 09:47:55 +0000