From: Jakub Jelinek <jakub@redhat.com>
To: Ulrich Drepper <drepper@redhat.com>
Cc: Glibc hackers <libc-hacker@sources.redhat.com>
Subject: [PATCH] Always use __extern_always_inline functions in string.h fortification
Date: Wed, 03 Oct 2007 14:05:00 -0000 [thread overview]
Message-ID: <20071003140759.GE2896@sunsite.mff.cuni.cz> (raw)
Hi!
These are the last places where we used macros (except varargs checking
when __va_arg_pack is not defined). With the artificial attribute and
virtual call backtrace in diagnostics there is no reason not to use
the inlines unconditionally.
2007-10-03 Jakub Jelinek <jakub@redhat.com>
* string/bits/string3.h (memcpy, memmove, mempcpy, memset, bcopy,
bzero, strcpy, stpcpy, strncpy, strcat, strncat): Use
__extern_always_inline functions unconditionally, drop macros.
--- libc/string/bits/string3.h.jj 2007-09-15 17:18:50.000000000 +0200
+++ libc/string/bits/string3.h 2007-10-03 14:01:16.000000000 +0200
@@ -45,65 +45,27 @@ __warndecl (__warn_memset_zero_len,
#endif
-#ifdef __cplusplus
__extern_always_inline void *
__NTH (memcpy (void *__restrict __dest, __const void *__restrict __src,
size_t __len))
{
return __builtin___memcpy_chk (__dest, __src, __len, __bos0 (__dest));
}
-#else
-# define memcpy(dest, src, len) \
- ((__bos0 (dest) != (size_t) -1) \
- ? __builtin___memcpy_chk (dest, src, len, __bos0 (dest)) \
- : __memcpy_ichk (dest, src, len))
-static __always_inline void *
-__NTH (__memcpy_ichk (void *__restrict __dest, __const void *__restrict __src,
- size_t __len))
-{
- return __builtin___memcpy_chk (__dest, __src, __len, __bos0 (__dest));
-}
-#endif
-#ifdef __cplusplus
__extern_always_inline void *
__NTH (memmove (void *__restrict __dest, __const void *__restrict __src,
size_t __len))
{
return __builtin___memmove_chk (__dest, __src, __len, __bos0 (__dest));
}
-#else
-# define memmove(dest, src, len) \
- ((__bos0 (dest) != (size_t) -1) \
- ? __builtin___memmove_chk (dest, src, len, __bos0 (dest)) \
- : __memmove_ichk (dest, src, len))
-static __always_inline void *
-__NTH (__memmove_ichk (void *__dest, __const void *__src, size_t __len))
-{
- return __builtin___memmove_chk (__dest, __src, __len, __bos0 (__dest));
-}
-#endif
#ifdef __USE_GNU
-# ifdef __cplusplus
__extern_always_inline void *
__NTH (mempcpy (void *__restrict __dest, __const void *__restrict __src,
size_t __len))
{
return __builtin___mempcpy_chk (__dest, __src, __len, __bos0 (__dest));
}
-# else
-# define mempcpy(dest, src, len) \
- ((__bos0 (dest) != (size_t) -1) \
- ? __builtin___mempcpy_chk (dest, src, len, __bos0 (dest)) \
- : __mempcpy_ichk (dest, src, len))
-static __always_inline void *
-__NTH (__mempcpy_ichk (void *__restrict __dest,
- __const void *__restrict __src, size_t __len))
-{
- return __builtin___mempcpy_chk (__dest, __src, __len, __bos0 (__dest));
-}
-# endif
#endif
@@ -112,7 +74,6 @@ __NTH (__mempcpy_ichk (void *__restrict
especially problematic if the intended fill value is zero. In this
case no work is done at all. We detect these problems by referring
non-existing functions. */
-#ifdef __cplusplus
__extern_always_inline void *
__NTH (memset (void *__dest, int __ch, size_t __len))
{
@@ -123,103 +84,43 @@ __NTH (memset (void *__dest, int __ch, s
}
return __builtin___memset_chk (__dest, __ch, __len, __bos0 (__dest));
}
-#else
-# define memset(dest, ch, len) \
- (__builtin_constant_p (len) && (len) == 0 \
- ? (__warn_memset_zero_len (), (void) (ch), (void) (len), (void *) (dest)) \
- : ((__bos0 (dest) != (size_t) -1) \
- ? __builtin___memset_chk (dest, ch, len, __bos0 (dest)) \
- : __memset_ichk (dest, ch, len)))
-static __always_inline void *
-__NTH (__memset_ichk (void *__dest, int __ch, size_t __len))
-{
- return __builtin___memset_chk (__dest, __ch, __len, __bos0 (__dest));
-}
-#endif
#ifdef __USE_BSD
-# ifdef __cplusplus
__extern_always_inline void
__NTH (bcopy (__const void *__restrict __src, void *__restrict __dest,
size_t __len))
{
- __builtin___memmove_chk (__dest, __src, __len, __bos0 (__dest));
+ (void) __builtin___memmove_chk (__dest, __src, __len, __bos0 (__dest));
}
+
__extern_always_inline void
__NTH (bzero (void *__dest, size_t __len))
{
- __builtin___memset_chk (__dest, '\0', __len, __bos0 (__dest));
+ (void) __builtin___memset_chk (__dest, '\0', __len, __bos0 (__dest));
}
-# else
-# define bcopy(src, dest, len) ((void) \
- ((__bos0 (dest) != (size_t) -1) \
- ? __builtin___memmove_chk (dest, src, len, __bos0 (dest)) \
- : __memmove_ichk (dest, src, len)))
-# define bzero(dest, len) ((void) \
- ((__bos0 (dest) != (size_t) -1) \
- ? __builtin___memset_chk (dest, '\0', len, __bos0 (dest)) \
- : __memset_ichk (dest, '\0', len)))
-# endif
#endif
-#ifdef __cplusplus
__extern_always_inline char *
__NTH (strcpy (char *__restrict __dest, __const char *__restrict __src))
{
return __builtin___strcpy_chk (__dest, __src, __bos (__dest));
}
-#else
-# define strcpy(dest, src) \
- ((__bos (dest) != (size_t) -1) \
- ? __builtin___strcpy_chk (dest, src, __bos (dest)) \
- : __strcpy_ichk (dest, src))
-static __always_inline char *
-__NTH (__strcpy_ichk (char *__restrict __dest, __const char *__restrict __src))
-{
- return __builtin___strcpy_chk (__dest, __src, __bos (__dest));
-}
-#endif
#ifdef __USE_GNU
-# ifdef __cplusplus
__extern_always_inline char *
__NTH (stpcpy (char *__restrict __dest, __const char *__restrict __src))
{
return __builtin___stpcpy_chk (__dest, __src, __bos (__dest));
}
-# else
-# define stpcpy(dest, src) \
- ((__bos (dest) != (size_t) -1) \
- ? __builtin___stpcpy_chk (dest, src, __bos (dest)) \
- : __stpcpy_ichk (dest, src))
-static __always_inline char *
-__NTH (__stpcpy_ichk (char *__restrict __dest, __const char *__restrict __src))
-{
- return __builtin___stpcpy_chk (__dest, __src, __bos (__dest));
-}
-# endif
#endif
-#ifdef __cplusplus
__extern_always_inline char *
__NTH (strncpy (char *__restrict __dest, __const char *__restrict __src,
size_t __len))
{
return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
}
-#else
-# define strncpy(dest, src, len) \
- ((__bos (dest) != (size_t) -1) \
- ? __builtin___strncpy_chk (dest, src, len, __bos (dest)) \
- : __strncpy_ichk (dest, src, len))
-static __always_inline char *
-__NTH (__strncpy_ichk (char *__restrict __dest, __const char *__restrict __src,
- size_t __len))
-{
- return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
-}
-#endif
// XXX We have no corresponding builtin yet.
extern char *__stpncpy_chk (char *__dest, __const char *__src, size_t __n,
@@ -238,41 +139,16 @@ __NTH (stpncpy (char *__dest, __const ch
}
-#ifdef __cplusplus
__extern_always_inline char *
__NTH (strcat (char *__restrict __dest, __const char *__restrict __src))
{
return __builtin___strcat_chk (__dest, __src, __bos (__dest));
}
-#else
-# define strcat(dest, src) \
- ((__bos (dest) != (size_t) -1) \
- ? __builtin___strcat_chk (dest, src, __bos (dest)) \
- : __strcat_ichk (dest, src))
-static __always_inline char *
-__NTH (__strcat_ichk (char *__restrict __dest, __const char *__restrict __src))
-{
- return __builtin___strcat_chk (__dest, __src, __bos (__dest));
-}
-#endif
-#ifdef __cplusplus
__extern_always_inline char *
__NTH (strncat (char *__restrict __dest, __const char *__restrict __src,
size_t __len))
{
return __builtin___strncat_chk (__dest, __src, __len, __bos (__dest));
}
-#else
-# define strncat(dest, src, len) \
- ((__bos (dest) != (size_t) -1) \
- ? __builtin___strncat_chk (dest, src, len, __bos (dest)) \
- : __strncat_ichk (dest, src, len))
-static __always_inline char *
-__NTH (__strncat_ichk (char *__restrict __dest, __const char *__restrict __src,
- size_t __len))
-{
- return __builtin___strncat_chk (__dest, __src, __len, __bos (__dest));
-}
-#endif
Jakub
reply other threads:[~2007-10-03 14:05 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071003140759.GE2896@sunsite.mff.cuni.cz \
--to=jakub@redhat.com \
--cc=drepper@redhat.com \
--cc=libc-hacker@sources.redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).