From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 18 Sep 2007 19:31:02 +0000 (+0000)
Subject: * locale/programs/charmap-dir.c (charmap_aliases): Use %ms instead of
X-Git-Tag: cvs/fedora-glibc-20070920T0007~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76c0bea7a329ca94035de1801be77e24beecc1fd;p=thirdparty%2Fglibc.git

* locale/programs/charmap-dir.c (charmap_aliases): Use %ms instead of

%as in fscanf format strings.
	* locale/programs/charmap-dir.c (charmap_aliases): Use %ms instead of
	%as in fscanf format strings.
---

diff --git a/ChangeLog b/ChangeLog
index 4e318cf4ce5..a7db139e7bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-09-18  Jakub Jelinek  <jakub@redhat.com>
 
+	* locale/programs/charmap-dir.c (charmap_aliases): Use %ms instead of
+	%as in fscanf format strings.
+
 	* sysdeps/sparc/sparc32/elf/start.S: Remove cfi_* markup.
 	* sysdeps/sparc/sparc64/elf/start.S: Likewise.
 	* sysdeps/unix/sysv/linux/sparc/sparc32/clone.S (__thread_start): Likewise.
diff --git a/locale/programs/charmap-dir.c b/locale/programs/charmap-dir.c
index e192eddde3d..776f01e78b5 100644
--- a/locale/programs/charmap-dir.c
+++ b/locale/programs/charmap-dir.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000, 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001, 2002, 2003, 2005, 2007
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
@@ -264,8 +265,8 @@ charmap_aliases (const char *directory, const char *name)
       char *alias = NULL;
       char junk[BUFSIZ];
 
-      if (fscanf (stream, " <code_set_name> %as", &alias) == 1
-          || fscanf (stream, "%% alias %as", &alias) == 1)
+      if (fscanf (stream, " <code_set_name> %ms", &alias) == 1
+          || fscanf (stream, "%% alias %ms", &alias) == 1)
         {
           aliases = (char **) xrealloc (aliases,
                                         (naliases + 2) * sizeof (char *));