oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

move same ifdef magic from roken-common.h.in to here, use strerror()

Browse Source
This commit is contained in:
Love Hornquist Astrand
2010-03-11 23:35:00 -08:00
parent 7d9335ce69
commit 6da28e73eb
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/roken/strerror_r.c
View File

@@ -33,7 +33,7 @@
#include <config.h> #include <config.h>
#if !defined(HAVE_STRERROR_R) && !defined(STRERROR_R_PROTO_COMPATIBLE) #if (!defined(HAVE_STRERROR_R) && !defined(strerror_r)) || (!defined(STRERROR_R_PROTO_COMPATIBLE) && defined(HAVE_STRERROR_R))
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@@ -58,11 +58,6 @@ rk_strerror_r(int eno, char * strerrbuf, size_t buflen)
#else /* _MSC_VER */ #else /* _MSC_VER */
#ifndef HAVE_STRERROR_R
extern int sys_nerr;
extern char *sys_errlist[];
#endif
int ROKEN_LIB_FUNCTION int ROKEN_LIB_FUNCTION
rk_strerror_r(int eno, char *strerrbuf, size_t buflen) rk_strerror_r(int eno, char *strerrbuf, size_t buflen)
{ {
@@ -76,11 +71,7 @@ rk_strerror_r(int eno, char *strerrbuf, size_t buflen)
return 0; return 0;
#else #else
int ret; int ret;
if(eno < 0 || eno >= sys_nerr) { ret = strlcpy(strerrbuf, buflen, strerror(eno));
snprintf(strerrbuf, buflen, "Error %d occurred.", eno);
return EINVAL;
}
ret = snprintf(strerrbuf, buflen, "%s", sys_errlist[eno]);
if (ret > buflen) if (ret > buflen)
return ERANGE; return ERANGE;
return 0; return 0;