Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/include/ssp Always provide *_chk prototypes. Fixes DBG=-g bu...



details:   https://anonhg.NetBSD.org/src/rev/8ab5e18136f5
branches:  trunk
changeset: 780413:8ab5e18136f5
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sun Jul 22 21:05:26 2012 +0000

description:
Always provide *_chk prototypes. Fixes DBG=-g build of libc.

diffstat:

 include/ssp/string.h |  19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diffs (40 lines):

diff -r cbd891670155 -r 8ab5e18136f5 include/ssp/string.h
--- a/include/ssp/string.h      Sun Jul 22 21:04:44 2012 +0000
+++ b/include/ssp/string.h      Sun Jul 22 21:05:26 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: string.h,v 1.4 2009/11/17 20:47:59 drochner Exp $      */
+/*     $NetBSD: string.h,v 1.5 2012/07/22 21:05:26 joerg Exp $ */
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -33,6 +33,16 @@
 
 #include <ssp/ssp.h>
 
+__BEGIN_DECLS
+void *__memcpy_chk(void *, const void *, size_t, size_t);
+void *__memmove_chk(void *, void *, size_t, size_t);
+void *__memset_chk(void *, int, size_t, size_t);
+char *__strcat_chk(char *, const char *, size_t);
+char *__strcpy_chk(char *, const char *, size_t);
+char *__strncat_chk(char *, const char *, size_t, size_t);
+char *__strncpy_chk(char *, const char *, size_t, size_t);
+__END_DECLS
+
 #if __SSP_FORTIFY_LEVEL > 0
 
 #define __ssp_bos_check3(fun, dst, src, len) \
@@ -74,13 +84,6 @@
 __ssp_bos_icheck2_restrict(strcat, char *, const char *)
 __ssp_bos_icheck3_restrict(strncpy, char *, const char *)
 __ssp_bos_icheck3_restrict(strncat, char *, const char *)
-void *__memcpy_chk(void *, const void *, size_t, size_t);
-void *__memmove_chk(void *, void *, size_t, size_t);
-void *__memset_chk(void *, int, size_t, size_t);
-char *__strcat_chk(char *, const char *, size_t);
-char *__strcpy_chk(char *, const char *, size_t);
-char *__strncat_chk(char *, const char *, size_t, size_t);
-char *__strncpy_chk(char *, const char *, size_t, size_t);
 __END_DECLS
 
 #define memcpy(dst, src, len) __ssp_bos_check3(memcpy, dst, src, len)



Home | Main Index | Thread Index | Old Index