* locale/programs/ld-time.c (time_finish): Use %Z instead of %z.

	* locale/programs/ld-ctype.c (ctype_finish, ctype_class_new): Likewise.

diff --git a/ChangeLog b/ChangeLog
index cf808626de44713e2fbf995b2fda1b25cc33bd9f..89bd16dd91d68c6508038495de91dafc56d59c91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-03-20  Roland McGrath  <roland@baalperazim.frob.com>
 
+       * locale/programs/ld-time.c (time_finish): Use %Z instead of %z.
+       * locale/programs/ld-ctype.c (ctype_finish, ctype_class_new): Likewise.
+
        * scripts/versions.awk: Fixed version renaming code to distinguish
        libraries properly.
 

diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index b0b9144c1409ae51ae0f3262fc3dab0328758576..21f271f706053087cc63f0d00ff3f66fb95e216d 100644 (file)
--- a/locale/programs/ld-ctype.c
+++ b/locale/programs/ld-ctype.c
@@ -466,7 +466,7 @@ character L'\\u%0*x' in class `%s' must not be in class `%s'"),
                          {
                            char buf[17];
 
-                           sprintf (buf, "\\%zo", cnt);
+                           snprintf (buf, sizeof buf, "\\%Zo", cnt);
 
                            if (!be_quiet)
                              error (0, 0, _("\
@@ -481,7 +481,7 @@ character '%s' in class `%s' must be in class `%s'"),
                          {
                            char buf[17];
 
-                           sprintf (buf, "\\%zo", cnt);
+                           snprintf (buf, sizeof buf, "\\%Zo", cnt);
 
                            if (!be_quiet)
                              error (0, 0, _("\
@@ -1051,7 +1051,7 @@ ctype_class_new (struct linereader *lr, struct locale_ctype_t *ctype,
   if (ctype->nr_charclass == MAX_NR_CHARCLASS)
     /* Exit code 2 is prescribed in P1003.2b.  */
     error (2, 0, _("\
-implementation limit: no more than %zd character classes allowed"),
+implementation limit: no more than %Zd character classes allowed"),
           MAX_NR_CHARCLASS);
 
   ctype->classnames[ctype->nr_charclass++] = name;
@@ -3051,7 +3051,7 @@ allocate_arrays (struct locale_ctype_t *ctype, struct charmap_t *charmap,
 {
   size_t idx;
   size_t width_table_size;
-  
+
   /* First we have to decide how we organize the arrays.  It is easy
      for a one-byte character set.  But multi-byte character set
      cannot be stored flat because the chars might be sparsely used.

diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c
index 2bed14f7b1d27bd899be23b96ecc493a04e3beaf..99e029c755b4a16701b1bcf728b96a481cfaf047 100644 (file)
--- a/locale/programs/ld-time.c
+++ b/locale/programs/ld-time.c
@@ -219,8 +219,9 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
          if (*str != '+' && *str != '-')
            {
              if (!be_quiet)
-               error (0, 0, _("%s: direction flag in string %zd in `era' field"
-                              " is not '+' nor '-'"),
+               error (0, 0,
+                      _("%s: direction flag in string %Zd in `era' field"
+                        " is not '+' nor '-'"),
                       "LC_TIME", idx + 1);
              /* Default arbitrarily to '+'.  */
              time->era_entries[idx].direction = '+';
@@ -230,8 +231,9 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
          if (*++str != ':')
            {
              if (!be_quiet)
-               error (0, 0, _("%s: direction flag in string %zd in `era' field"
-                              " is not a single character"),
+               error (0, 0,
+                      _("%s: direction flag in string %Zd in `era' field"
+                        " is not a single character"),
                       "LC_TIME", idx + 1);
              (void) strsep (&str, ":");
            }
@@ -243,7 +245,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
          if (endp == str)
            {
              if (!be_quiet)
-               error (0, 0, _("%s: invalid number for offset in string %zd in"
+               error (0, 0, _("%s: invalid number for offset in string %Zd in"
                               " `era' field"),
                       "LC_TIME", idx + 1);
              (void) strsep (&str, ":");
@@ -252,7 +254,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
            {
              if (!be_quiet)
                error (0, 0, _("%s: garbage at end of offset value in"
-                              " string %zd in `era' field"),
+                              " string %Zd in `era' field"),
                       "LC_TIME", idx + 1);
              (void) strsep (&str, ":");
            }
@@ -302,7 +304,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
                {
                invalid_start_date:
                  if (!be_quiet)
-                   error (0, 0, _("%s: invalid starting date in string %zd in"
+                   error (0, 0, _("%s: invalid starting date in string %Zd in"
                                   " `era' field"),
                           "LC_TIME", idx + 1);
                  (void) strsep (&str, ":");
@@ -312,7 +314,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
                garbage_start_date:
                  if (!be_quiet)
                    error (0, 0, _("%s: garbage at end of starting date "
-                                  "in string %zd in `era' field "),
+                                  "in string %Zd in `era' field "),
                           "LC_TIME", idx + 1);
                  (void) strsep (&str, ":");
                }
@@ -331,7 +333,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
                           && !__isleap (time->era_entries[idx].start_date[0])))
                      && !be_quiet)
                          error (0, 0, _("%s: starting date is invalid in"
-                                        " string %zd in `era' field"),
+                                        " string %Zd in `era' field"),
                                 "LC_TIME", idx + 1);
                }
            }
@@ -379,7 +381,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
                {
                invalid_stop_date:
                  if (!be_quiet)
-                   error (0, 0, _("%s: invalid stopping date in string %zd in"
+                   error (0, 0, _("%s: invalid stopping date in string %Zd in"
                                   " `era' field"),
                           "LC_TIME", idx + 1);
                  (void) strsep (&str, ":");
@@ -389,7 +391,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
                garbage_stop_date:
                  if (!be_quiet)
                    error (0, 0, _("%s: garbage at end of stopping date "
-                                  "in string %zd in `era' field"),
+                                  "in string %Zd in `era' field"),
                           "LC_TIME", idx + 1);
                  (void) strsep (&str, ":");
                }
@@ -408,7 +410,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
                           && !__isleap (time->era_entries[idx].stop_date[0])))
                      && !be_quiet)
                          error (0, 0, _("%s: stopping date is invalid in"
-                                        " string %zd in `era' field"),
+                                        " string %Zd in `era' field"),
                                 "LC_TIME", idx + 1);
                }
            }
@@ -416,7 +418,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
          if (str == NULL || *str == '\0')
            {
              if (!be_quiet)
-               error (0, 0, _("%s: missing era name in string %zd in `era'"
+               error (0, 0, _("%s: missing era name in string %Zd in `era'"
                               " field"), "LC_TIME", idx + 1);
              time->era_entries[idx].name =
                time->era_entries[idx].format = "";
@@ -428,7 +430,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
              if (str == NULL || *str == '\0')
                {
                  if (!be_quiet)
-                   error (0, 0, _("%s: missing era format in string %zd"
+                   error (0, 0, _("%s: missing era format in string %Zd"
                                   " in `era' field"),
                           "LC_TIME", idx + 1);
                  time->era_entries[idx].name =