aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--string/strcoll_l.c7
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b9ab6a643..1150ec5d2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2015-06-22 Leonhard Holz <leonhard.holz@web.de>
+ * string/strcoll_l.c (STRCOLL): Remove unnecessary memset.
+
* string/strcoll_l.c: Remove unused struct element idxnow.
2015-06-21 Joseph Myers <joseph@codesourcery.com>
diff --git a/string/strcoll_l.c b/string/strcoll_l.c
index 967bbba231..8f1225fc7a 100644
--- a/string/strcoll_l.c
+++ b/string/strcoll_l.c
@@ -315,8 +315,11 @@ STRCOLL (const STRING_TYPE *s1, const STRING_TYPE *s2, __locale_t l)
int result = 0, rule = 0;
coll_seq seq1, seq2;
- memset (&seq1, 0, sizeof (seq1));
- seq2 = seq1;
+ seq1.len = 0;
+ seq1.idxmax = 0;
+ seq1.rule = 0;
+ seq2.len = 0;
+ seq2.idxmax = 0;
for (int pass = 0; pass < nrules; ++pass)
{