Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix last change

And optimize a bit.
  • Loading branch information...
commit adcd5c15d2a37794d021104160b425ff61f88219 1 parent 7ea72f9
@drepper drepper authored
Showing with 12 additions and 17 deletions.
  1. +12 −17 string/xpg-strerror.c
View
29 string/xpg-strerror.c
@@ -19,20 +19,10 @@
#include <assert.h>
#include <errno.h>
-#include <libintl.h>
#include <stdio.h>
#include <string.h>
#include <sys/param.h>
-#include <stdio-common/_itoa.h>
-/* It is critical here that we always use the `dcgettext' function for
- the message translation. Since <libintl.h> only defines the macro
- `dgettext' to use `dcgettext' for optimizing programs this is not
- always guaranteed. */
-#ifndef dgettext
-# include <locale.h> /* We need LC_MESSAGES. */
-# define dgettext(domainname, msgid) dcgettext (domainname, msgid, LC_MESSAGES)
-#endif
/* Fill buf with a string describing the errno code in ERRNUM. */
int
@@ -41,13 +31,18 @@ __xpg_strerror_r (int errnum, char *buf, size_t buflen)
const char *estr = __strerror_r (errnum, buf, buflen);
size_t estrlen = strlen (estr);
- if (errnum < 0 || errnum >= _sys_nerr_internal
- || _sys_errlist_internal[errnum] == NULL)
- return EINVAL;
-
- assert (estr != buf);
-/* Terminate the string in any case. */
- *((char *) __mempcpy (buf, estr, MIN (buflen - 1, estrlen))) = '\0';
+ if (estr == buf)
+ {
+ assert (errnum < 0 || errnum >= _sys_nerr_internal
+ || _sys_errlist_internal[errnum] == NULL);
+ return EINVAL;
+ }
+ assert (errnum >= 0 && errnum < _sys_nerr_internal
+ && _sys_errlist_internal[errnum] != NULL);
+
+ /* Terminate the string in any case. */
+ if (buflen > 0)
+ *((char *) __mempcpy (buf, estr, MIN (buflen - 1, estrlen))) = '\0';
return buflen <= estrlen ? ERANGE : 0;
}
Please sign in to comment.
Something went wrong with that request. Please try again.