diff options
| author | Liubov Dmitrieva <ldmitrie@sourceware.org> | 2013-08-29 17:08:14 +0400 |
|---|---|---|
| committer | Liubov Dmitrieva <ldmitrie@sourceware.org> | 2013-10-23 19:07:36 +0400 |
| commit | f93ec08c4a30887c516ea7a6d4c2d8af8d541e03 (patch) | |
| tree | efd6ea50f64b8bad263a9002163a3b10a60f1e33 | |
| parent | 0e036f35e545b187f4ee71bb48cffb8e9cc855b9 (diff) | |
| download | glibc-f93ec08c4a30887c516ea7a6d4c2d8af8d541e03.tar glibc-f93ec08c4a30887c516ea7a6d4c2d8af8d541e03.tar.gz glibc-f93ec08c4a30887c516ea7a6d4c2d8af8d541e03.tar.bz2 glibc-f93ec08c4a30887c516ea7a6d4c2d8af8d541e03.zip | |
Inappropriate code style for Intel MPX in string/strcpy.c and wcsmbc/wcscpy.c
Fix the code if MPX is enabled.
| -rw-r--r-- | string/strcpy.c | 9 | ||||
| -rw-r--r-- | wcsmbs/wcscpy.c | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/string/strcpy.c b/string/strcpy.c index b71f7536bc..04278eceb9 100644 --- a/string/strcpy.c +++ b/string/strcpy.c @@ -26,6 +26,7 @@ char * strcpy (dest, src) char *dest; const char *src; +#ifndef __CHKP__ { char c; char *s = (char *) src; @@ -40,4 +41,12 @@ strcpy (dest, src) return dest; } +#else +{ + const char *ret = dest; + while ((*dest++ = *src++) != '\0'); + return ret; +} +#endif + libc_hidden_builtin_def (strcpy) diff --git a/wcsmbs/wcscpy.c b/wcsmbs/wcscpy.c index 3b1e0c6245..3113cf589c 100644 --- a/wcsmbs/wcscpy.c +++ b/wcsmbs/wcscpy.c @@ -25,6 +25,7 @@ wchar_t * wcscpy (dest, src) wchar_t *dest; const wchar_t *src; +#ifndef __CHKP__ { wint_t c; wchar_t *wcp; @@ -56,3 +57,11 @@ wcscpy (dest, src) return dest; } +#else +{ + const wchar_t *ret = dest; + while ((*dest++ = *src++) != L'\0'); + return ret; + +} +#endif |