Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[BZ #4925]
	* debug/pcprofiledump.c: Turn on internationalization by calling
	setlocale.  Patch mostly by Benno Schulenberg.
  • Loading branch information
Ulrich Drepper committed Aug 21, 2007
1 parent 55ea879 commit 45dc3ad
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
@@ -1,5 +1,9 @@
2007-08-21 Ulrich Drepper <drepper@redhat.com>

[BZ #4925]
* debug/pcprofiledump.c: Turn on internationalization by calling
setlocale. Patch mostly by Benno Schulenberg.

[BZ #4936]
* iconv/gconv.c (__gconv): If flush was successful, clear rest of
the state.
Expand Down
17 changes: 11 additions & 6 deletions debug/pcprofiledump.c
@@ -1,5 +1,5 @@
/* Dump information generated by PC profiling.
Copyright (C) 1999, 2002 Free Software Foundation, Inc.
Copyright (C) 1999, 2002, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
Expand Down Expand Up @@ -37,6 +37,7 @@

#include "../version.h"

#define PACKAGE _libc_intl_domainname

#ifndef _
# define _(Str) gettext (Str)
Expand Down Expand Up @@ -75,14 +76,17 @@ static struct argp argp =
int
main (int argc, char *argv[])
{
int fd;
int remaining;
int must_swap;
uint32_t word;
/* Set locale via LC_ALL. */
setlocale (LC_ALL, "");

/* Set the text message domain. */
textdomain (PACKAGE);

/* Parse and process arguments. */
int remaining;
argp_parse (&argp, argc, argv, 0, &remaining, NULL);

int fd;
if (remaining == argc)
fd = STDIN_FILENO;
else if (remaining + 1 != argc)
Expand All @@ -102,11 +106,12 @@ main (int argc, char *argv[])

/* Read the first 4-byte word. It contains the information about
the word size and the endianess. */
uint32_t word;
if (TEMP_FAILURE_RETRY (read (fd, &word, 4)) != 4)
error (EXIT_FAILURE, errno, _("cannot read header"));

/* Check whether we have to swap the byte order. */
must_swap = (word & 0xfffffff0) == bswap_32 (0xdeb00000);
int must_swap = (word & 0xfffffff0) == bswap_32 (0xdeb00000);
if (must_swap)
word = bswap_32 (word);

Expand Down

0 comments on commit 45dc3ad

Please sign in to comment.