Module Name: src
Committed By: joerg
Date: Sun Jul 22 21:05:26 UTC 2012
Modified Files:
src/include/ssp: string.h
Log Message:
Always provide *_chk prototypes. Fixes DBG=-g build of libc.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/include/ssp/string.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/ssp/string.h
diff -u src/include/ssp/string.h:1.4 src/include/ssp/string.h:1.5
--- src/include/ssp/string.h:1.4 Tue Nov 17 20:47:59 2009
+++ src/include/ssp/string.h Sun Jul 22 21:05:26 2012
@@ -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(strcpy, char
__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)
