aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-01-10 16:01:59 -0800
committerElliott Hughes <enh@google.com>2013-01-10 16:01:59 -0800
commite6e60065ff093ff8c859ab146cf543531cb1967c (patch)
tree41de4f1d0cf5cec9fa72c4ad6d0fed5bf1b00329
parent0d3700d957debe841c385f66a8026ca8b3755815 (diff)
downloadandroid_bionic-e6e60065ff093ff8c859ab146cf543531cb1967c.tar.gz
android_bionic-e6e60065ff093ff8c859ab146cf543531cb1967c.tar.bz2
android_bionic-e6e60065ff093ff8c859ab146cf543531cb1967c.zip
glibc 2.15 treats errno as signed in strerror(3).
And the only reason I hadn't done that in bionic is because I wanted to behave the same as glibc. Change-Id: I2cf1bf0aac82a748cd6305a2cabbac0790058570
-rw-r--r--libc/bionic/strerror_r.cpp2
-rw-r--r--tests/string_test.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/libc/bionic/strerror_r.cpp b/libc/bionic/strerror_r.cpp
index e6a39754e..646cc5239 100644
--- a/libc/bionic/strerror_r.cpp
+++ b/libc/bionic/strerror_r.cpp
@@ -49,7 +49,7 @@ int strerror_r(int error_number, char* buf, size_t buf_len) {
if (error_name != NULL) {
length = snprintf(buf, buf_len, "%s", error_name);
} else {
- length = snprintf(buf, buf_len, "Unknown error %u", error_number);
+ length = snprintf(buf, buf_len, "Unknown error %d", error_number);
}
if (length >= buf_len) {
errno = ERANGE;
diff --git a/tests/string_test.cpp b/tests/string_test.cpp
index 71998d877..d55771cf6 100644
--- a/tests/string_test.cpp
+++ b/tests/string_test.cpp
@@ -39,7 +39,7 @@ TEST(string, strerror) {
ASSERT_STREQ("Operation not permitted", strerror(1));
// Invalid.
- ASSERT_STREQ("Unknown error 4294967295", strerror(-1));
+ ASSERT_STREQ("Unknown error -1", strerror(-1));
ASSERT_STREQ("Unknown error 1234", strerror(1234));
}