generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "More pthreads cleanup."

Browse Source 
This reverts commit 2a1bb4e646

Change-Id: Ia443d0748015c8e9fc3121e40e68258616767b51
This commit is contained in:
Elliott Hughes
2013-02-12 06:06:22 +00:00
committed by Gerrit Code Review
parent 2a1bb4e646
commit 6f94de3ca4
17 changed files with 291 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libc/bionic/strerror_r.cpp
View File

@@ -7,8 +7,6 @@
#include <stdio.h>
#include <string.h>
#include "private/ErrnoRestorer.h"
struct Pair {
int code;
const char* msg;
@@ -44,7 +42,7 @@ extern "C" __LIBC_HIDDEN__ const char* __strsignal_lookup(int signal_number) {
}
int strerror_r(int error_number, char* buf, size_t buf_len) {
ErrnoRestorer errno_restorer;
int saved_errno = errno;
size_t length;
const char* error_name = __strerror_lookup(error_number);
@@ -54,10 +52,11 @@ int strerror_r(int error_number, char* buf, size_t buf_len) {
length = snprintf(buf, buf_len, "Unknown error %d", error_number);
}
if (length >= buf_len) {
errno_restorer.override(ERANGE);
errno = ERANGE;
return -1;
}
errno = saved_errno;
return 0;
}