This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.18-414-g4712799
- From: siddhesh at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 20 Nov 2013 12:47:41 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.18-414-g4712799
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 4712799fbb6812cc73f7bd9c8faa6e7b05c0f5ab (commit)
from 0417b20fe6c671b3a8761a5f8ad59f14d774fa83 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4712799fbb6812cc73f7bd9c8faa6e7b05c0f5ab
commit 4712799fbb6812cc73f7bd9c8faa6e7b05c0f5ab
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Wed Nov 20 18:19:57 2013 +0530
Fix build warning in locarchive.c
diff --git a/ChangeLog b/ChangeLog
index d5a5baf..c0e48df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2013-11-20 Siddhesh Poyarekar <siddhesh@redhat.com>
+ * locale/programs/locarchive.c (open_archive): Add const
+ qualifier to ARCHIVEFNAME and copy default fname to
+ DEFAULT_FNAME.
+
[BZ #15601]
* libio/tst-widetext.input: Rename Oriya to Odia.
* locale/iso-639.def: Likewise.
diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
index e796865..88e1172 100644
--- a/locale/programs/locarchive.c
+++ b/locale/programs/locarchive.c
@@ -564,15 +564,15 @@ open_archive (struct locarhandle *ah, bool readonly)
int retry = 0;
size_t prefix_len = output_prefix ? strlen (output_prefix) : 0;
char default_fname[prefix_len + sizeof (ARCHIVE_NAME)];
- char *archivefname = ah->fname;
+ const char *archivefname = ah->fname;
/* If ah has a non-NULL fname open that otherwise open the default. */
if (archivefname == NULL)
{
archivefname = default_fname;
if (output_prefix)
- memcpy (archivefname, output_prefix, prefix_len);
- strcpy (archivefname + prefix_len, ARCHIVE_NAME);
+ memcpy (default_fname, output_prefix, prefix_len);
+ strcpy (default_fname + prefix_len, ARCHIVE_NAME);
}
while (1)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
locale/programs/locarchive.c | 6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources