Update.

1999-10-06  Ulrich Drepper  <drepper@cygnus.com>

	* locale/programs/ld-ctype.c (ctype_read): Fix typos in last patch.

1999-10-05  Andreas Jaeger  <aj@suse.de>

	* locale/programs/ld-identification.c: Fix typo in comment.
	* locale/programs/ld-messages.c: Likewise.
	* locale/programs/ld-monetary.c: Likewise.
	* locale/programs/ld-name.c: Likewise.

	* locale/programs/ld-collate.c (read_lc_collate): Fix typo in comment.
	(collate_read): Remove unnecessary comparisons with ignore_content.

	* locale/programs/ld-ctype.c (ctype_finish): Loop only over actual
	assigned elements.
	(ctype_read): Remove unnecessary comparisons with ignore_content.
	Fix typos in comments.

	* locale/programs/ld-address.c (STR_ELEM): Remove unnecessary
	comparisons with ignore_content.

	* po/cs.po: Update.

7 files changed, 16 insertions, 13 deletions

diff --git a/locale/programs/ld-address.c b/locale/programs/ld-address.c
index 6dce62b..35f7de8 100644
--- a/locale/programs/ld-address.c
+++ b/locale/programs/ld-address.c
@@ -453,7 +453,7 @@ address_read (struct linereader *ldfile, struct localedef_t *result,
       if (nowtok == tok_eof)
 	break;
 
-      /* Ingore empty lines.  */
+      /* Ignore empty lines.  */
       if (nowtok == tok_eol)
 	{
 	  now = lr_token (ldfile, charmap, NULL);
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index 9057003..27bba55 100644
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -678,7 +678,7 @@ collate_read (struct linereader *ldfile, struct localedef_t *result,
 	  else
 	    {
 	      free (arg->val.str.startmb);
-	      lr_ignore_rest (ldfile, 1);
+	      lr_ignore_rest (ldfile, 0);
 	    }
 	  break;
 
@@ -3135,7 +3135,7 @@ read_lc_collate (struct linereader *ldfile, struct localedef_t *result,
       if (nowtok == tok_eof)
         break;
 
-      /* Ingore empty lines.  */
+      /* Ignore empty lines.  */
       if (nowtok == tok_eol)
         {
           now = lr_token (ldfile, charmap, NULL);
diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index c274c0c..ffc759b 100644
--- a/locale/programs/ld-ctype.c
+++ b/locale/programs/ld-ctype.c
@@ -347,7 +347,7 @@ ctype_finish (struct localedef_t *locale, struct charmap_t *charmap)
   set_class_defaults (ctype, charmap, ctype->repertoire);
 
   /* Check according to table.  */
-  for (cnt = 0; cnt < ctype->class_collection_max; ++cnt)
+  for (cnt = 0; cnt < ctype->class_collection_act; ++cnt)
     {
       uint32_t tmp = ctype->class_collection[cnt];
 
@@ -549,7 +549,7 @@ character '%s' in class `%s' must not be in class `%s'"),
     }
 
   /* Check the input digits.  There must be a multiple of ten available.
-     In each group I could be that one or the other character is missing.
+     In each group it could be that one or the other character is missing.
      In this case the whole group must be removed.  */
   cnt = 0;
   while (cnt < ctype->mbdigits_act)
@@ -610,7 +610,7 @@ no input digits defined and none of the standard names in the charmap"));
     }
 
   /* Check the wide character input digits.  There must be a multiple
-     of ten available.  In each group I could be that one or the other
+     of ten available.  In each group it could be that one or the other
      character is missing.  In this case the whole group must be
      removed.  */
   cnt = 0;
@@ -998,7 +998,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 uint32_t *
 find_idx (struct locale_ctype_t *ctype, uint32_t **table, size_t *max,
 	  size_t *act, uint32_t idx)
@@ -1911,7 +1911,10 @@ with character code range values one must use the absolute ellipsis `...'"));
 	  /* Ignore the rest of the line if we don't need the input of
 	     this line.  */
 	  if (ignore_content)
-	    break;
+	    {
+	      lr_ignore_rest (ldfile, 0);
+	      break;
+	    }
 
 	handle_tok_digit:
 	  class_bit = _ISwdigit;
@@ -2803,7 +2806,7 @@ allocate_arrays (struct locale_ctype_t *ctype, struct charmap_t *charmap,
      We use a very trivial hashing function to store the sparse
      table.  CH % TABSIZE is used as an index.  To solve multiple hits
      we have N planes.  This guarantees a fixed search time for a
-     character [N / 2].  In the following code we determine the minmum
+     character [N / 2].  In the following code we determine the minimum
      value for TABSIZE * N, where TABSIZE >= 256.  */
   size_t min_total = UINT_MAX;
   size_t act_size = 256;
diff --git a/locale/programs/ld-identification.c b/locale/programs/ld-identification.c
index b536ac8..957f12c 100644
--- a/locale/programs/ld-identification.c
+++ b/locale/programs/ld-identification.c
@@ -328,7 +328,7 @@ identification_read (struct linereader *ldfile, struct localedef_t *result,
       if (nowtok == tok_eof)
 	break;
 
-      /* Ingore empty lines.  */
+      /* Ignore empty lines.  */
       if (nowtok == tok_eol)
 	{
 	  now = lr_token (ldfile, charmap, NULL);
diff --git a/locale/programs/ld-messages.c b/locale/programs/ld-messages.c
index 159c9c7..a29cfea 100644
--- a/locale/programs/ld-messages.c
+++ b/locale/programs/ld-messages.c
@@ -269,7 +269,7 @@ messages_read (struct linereader *ldfile, struct localedef_t *result,
       if (nowtok == tok_eof)
 	break;
 
-      /* Ingore empty lines.  */
+      /* Ignore empty lines.  */
       if (nowtok == tok_eol)
 	{
 	  now = lr_token (ldfile, charmap, NULL);
diff --git a/locale/programs/ld-monetary.c b/locale/programs/ld-monetary.c
index 4a8990a..f1b527c 100644
--- a/locale/programs/ld-monetary.c
+++ b/locale/programs/ld-monetary.c
@@ -614,7 +614,7 @@ monetary_read (struct linereader *ldfile, struct localedef_t *result,
       if (nowtok == tok_eof)
 	break;
 
-      /* Ingore empty lines.  */
+      /* Ignore empty lines.  */
       if (nowtok == tok_eol)
 	{
 	  now = lr_token (ldfile, charmap, NULL);
diff --git a/locale/programs/ld-name.c b/locale/programs/ld-name.c
index 4ab0916..9419fdd 100644
--- a/locale/programs/ld-name.c
+++ b/locale/programs/ld-name.c
@@ -250,7 +250,7 @@ name_read (struct linereader *ldfile, struct localedef_t *result,
       if (nowtok == tok_eof)
 	break;
 
-      /* Ingore empty lines.  */
+      /* Ignore empty lines.  */
       if (nowtok == tok_eol)
 	{
 	  now = lr_token (ldfile, charmap, NULL);