Skip to content

Commit

Permalink
* locale/programs/charmap-dir.c (charmap_aliases): Use %ms instead of
Browse files Browse the repository at this point in the history
%as in fscanf format strings.
	* locale/programs/charmap-dir.c (charmap_aliases): Use %ms instead of
	%as in fscanf format strings.
  • Loading branch information
Jakub Jelinek committed Sep 18, 2007
1 parent 0068056 commit 76c0bea
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
7 changes: 4 additions & 3 deletions locale/programs/charmap-dir.c
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 *));
Expand Down

0 comments on commit 76c0bea

Please sign in to comment.