From 76c0bea7a329ca94035de1801be77e24beecc1fd Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 18 Sep 2007 19:31:02 +0000 Subject: [PATCH] * 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. --- ChangeLog | 3 +++ locale/programs/charmap-dir.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e318cf..a7db139 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-09-18 Jakub Jelinek + * 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 e192edd..776f01e 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, " %as", &alias) == 1 - || fscanf (stream, "%% alias %as", &alias) == 1) + if (fscanf (stream, " %ms", &alias) == 1 + || fscanf (stream, "%% alias %ms", &alias) == 1) { aliases = (char **) xrealloc (aliases, (naliases + 2) * sizeof (char *)); -- 2.7.4