From 9d46fa4d8c5fbde1d6520f7635d6f83e8c3653df Mon Sep 17 00:00:00 2001
From: Tom Almeida <tommoa256@gmail.com>
Date: Wed, 14 Mar 2018 08:48:56 +0800
Subject: [PATCH] Missed having both loops look at themselves. I'm not sure how
long this has been here.
---
src/string/src/lib.rs | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/string/src/lib.rs b/src/string/src/lib.rs
index ca56dff00..b97f8773f 100644
--- a/src/string/src/lib.rs
+++ b/src/string/src/lib.rs
@@ -8,6 +8,8 @@ extern crate errno;
extern crate platform;
extern crate stdlib;
+pub use compiler_builtins::mem::*;
+
use platform::types::*;
use errno::*;
use core::cmp;
@@ -135,9 +137,9 @@ pub unsafe extern "C" fn strcspn(s1: *const c_char, s2: *const c_char) -> c_ulon
}
i = 0; // reset
- while *s2.offset(i) != 0 {
- if byteset[(*s2.offset(i) as usize) / (8 * byteset.len())]
- & 1 << (*s2.offset(i) as usize % (8 * byteset.len())) > 0
+ while *s1.offset(i) != 0 {
+ if byteset[(*s1.offset(i) as usize) / (8 * byteset.len())]
+ & 1 << (*s1.offset(i) as usize % (8 * byteset.len())) > 0
{
break;
}
@@ -287,9 +289,9 @@ pub unsafe extern "C" fn strspn(s1: *const c_char, s2: *const c_char) -> c_ulong
}
i = 0; // reset
- while *s2.offset(i) != 0 {
- if byteset[(*s2.offset(i) as usize) / (8 * byteset.len())]
- & 1 << (*s2.offset(i) as usize % (8 * byteset.len())) < 1
+ while *s1.offset(i) != 0 {
+ if byteset[(*s1.offset(i) as usize) / (8 * byteset.len())]
+ & 1 << (*s1.offset(i) as usize % (8 * byteset.len())) < 1
{
break;
}
--
GitLab