From cfc1014c6eb2311b908169a16c17bd6af0348dd9 Mon Sep 17 00:00:00 2001
From: Alex Lyon <arcterus@mail.com>
Date: Fri, 9 Mar 2018 20:50:19 -0800
Subject: [PATCH] string: fix a couple minor issues in strncmp()
---
src/string/src/lib.rs | 2 +-
tests/string/strncmp.c | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/string/src/lib.rs b/src/string/src/lib.rs
index ce2a68c7..c7178b5c 100644
--- a/src/string/src/lib.rs
+++ b/src/string/src/lib.rs
@@ -161,7 +161,7 @@ pub unsafe extern "C" fn strncmp(s1: *const c_char, s2: *const c_char, n: usize)
for (&a, &b) in s1.iter().zip(s2.iter()) {
let val = (a as c_int) - (b as c_int);
- if val != 0 || a == 0 {
+ if a != b || a == 0 {
return val;
}
}
diff --git a/tests/string/strncmp.c b/tests/string/strncmp.c
index 3e96e5c3..efb2bea9 100644
--- a/tests/string/strncmp.c
+++ b/tests/string/strncmp.c
@@ -9,7 +9,5 @@ int main(int argc, char* argv[]) {
printf("%d\n", strncmp("a", "c", 1));
printf("%d\n", strncmp("a", "a", 2));
- puts("test");
-
return 0;
}
--
GitLab