GNU ld has prefixed the contents of .gnu.warning.SYMBOL sections

with "warning: " since 2003, so the messages themselves need not
contain the prefix anymore.

From Scott Cheloha
ok jca, deraadt

diff --git a/lib/libc/arch/i386/string/strcat.S b/lib/libc/arch/i386/string/strcat.S
index fb8008e..b22bebb 100644 (file)
--- a/lib/libc/arch/i386/string/strcat.S
+++ b/lib/libc/arch/i386/string/strcat.S
@@ -1,4 +1,4 @@
-/*     $OpenBSD: strcat.S,v 1.9 2015/08/31 02:53:56 guenther Exp $ */
+/*     $OpenBSD: strcat.S,v 1.10 2017/11/28 06:55:49 tb Exp $ */
 /*
  * Written by J.T. Conklin <jtc@netbsd.org>.
  * Public domain.
@@ -9,7 +9,7 @@
 #if defined(APIWARN)
 #APP
        .section .gnu.warning.strcat
-       .ascii "warning: strcat() is almost always misused, please use strlcat()"
+       .ascii "strcat() is almost always misused, please use strlcat()"
 #NO_APP
 #endif
 

diff --git a/lib/libc/arch/i386/string/strcpy.S b/lib/libc/arch/i386/string/strcpy.S
index f72990f..72448da 100644 (file)
--- a/lib/libc/arch/i386/string/strcpy.S
+++ b/lib/libc/arch/i386/string/strcpy.S
@@ -1,4 +1,4 @@
-/*     $OpenBSD: strcpy.S,v 1.9 2015/08/31 02:53:56 guenther Exp $ */
+/*     $OpenBSD: strcpy.S,v 1.10 2017/11/28 06:55:49 tb Exp $ */
 /*
  * Written by J.T. Conklin <jtc@netbsd.org>.
  * Public domain.
@@ -9,7 +9,7 @@
 #if defined(APIWARN)
 #APP
        .section .gnu.warning.strcpy
-       .ascii "warning: strcpy() is almost always misused, please use strlcpy()"
+       .ascii "strcpy() is almost always misused, please use strlcpy()"
 #NO_APP
 #endif
 

diff --git a/lib/libc/compat-43/getwd.c b/lib/libc/compat-43/getwd.c
index 3c85e16..3062d46 100644 (file)
--- a/lib/libc/compat-43/getwd.c
+++ b/lib/libc/compat-43/getwd.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: getwd.c,v 1.11 2013/09/30 12:02:30 millert Exp $ */
+/*     $OpenBSD: getwd.c,v 1.12 2017/11/28 06:55:49 tb Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -46,4 +46,4 @@ getwd(char *buf)
 }
 
 __warn_references(getwd,
-    "warning: getwd() possibly used unsafely; consider using getcwd()");
+    "getwd() possibly used unsafely; consider using getcwd()");

diff --git a/lib/libc/stdio/mktemp.c b/lib/libc/stdio/mktemp.c
index 4b81d5d..ef9a183 100644 (file)
--- a/lib/libc/stdio/mktemp.c
+++ b/lib/libc/stdio/mktemp.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mktemp.c,v 1.38 2015/09/13 08:31:47 guenther Exp $ */
+/*     $OpenBSD: mktemp.c,v 1.39 2017/11/28 06:55:49 tb Exp $ */
 /*
  * Copyright (c) 1996-1998, 2008 Theo de Raadt
  * Copyright (c) 1997, 2008-2009 Todd C. Miller
@@ -119,7 +119,7 @@ _mktemp(char *path)
 }
 
 __warn_references(mktemp,
-    "warning: mktemp() possibly used unsafely; consider using mkstemp()");
+    "mktemp() possibly used unsafely; consider using mkstemp()");
 
 char *
 mktemp(char *path)

diff --git a/lib/libc/stdio/sprintf.c b/lib/libc/stdio/sprintf.c
index 51ddf95..935f9d7 100644 (file)
--- a/lib/libc/stdio/sprintf.c
+++ b/lib/libc/stdio/sprintf.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sprintf.c,v 1.18 2015/10/01 02:32:07 guenther Exp $ */
+/*     $OpenBSD: sprintf.c,v 1.19 2017/11/28 06:55:49 tb Exp $ */
 /*-
  * Copyright (c) 1990, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -39,7 +39,7 @@
 
 #if defined(APIWARN)
 __warn_references(sprintf,
-    "warning: sprintf() is often misused, please use snprintf()");
+    "sprintf() is often misused, please use snprintf()");
 #endif
 
 int

diff --git a/lib/libc/stdio/tempnam.c b/lib/libc/stdio/tempnam.c
index 854b871..d2c848c 100644 (file)
--- a/lib/libc/stdio/tempnam.c
+++ b/lib/libc/stdio/tempnam.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: tempnam.c,v 1.19 2015/08/31 02:53:57 guenther Exp $ */
+/*     $OpenBSD: tempnam.c,v 1.20 2017/11/28 06:55:49 tb Exp $ */
 /*
  * Copyright (c) 1988, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -37,7 +37,7 @@
 #include <unistd.h>
 
 __warn_references(tempnam,
-    "warning: tempnam() possibly used unsafely; consider using mkstemp()");
+    "tempnam() possibly used unsafely; consider using mkstemp()");
 
 char *
 tempnam(const char *dir, const char *pfx)

diff --git a/lib/libc/stdio/tmpnam.c b/lib/libc/stdio/tmpnam.c
index d6dc10e..52cd43d 100644 (file)
--- a/lib/libc/stdio/tmpnam.c
+++ b/lib/libc/stdio/tmpnam.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: tmpnam.c,v 1.11 2015/08/31 02:53:57 guenther Exp $ */
+/*     $OpenBSD: tmpnam.c,v 1.12 2017/11/28 06:55:49 tb Exp $ */
 /*-
  * Copyright (c) 1990, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
@@ -37,7 +37,7 @@
 #include <unistd.h>
 
 __warn_references(tmpnam,
-    "warning: tmpnam() possibly used unsafely; consider using mkstemp()");
+    "tmpnam() possibly used unsafely; consider using mkstemp()");
 
 char *
 tmpnam(char *s)

diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c
index 308ff37..2c8001d 100644 (file)
--- a/lib/libc/stdio/vsprintf.c
+++ b/lib/libc/stdio/vsprintf.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: vsprintf.c,v 1.16 2009/11/09 00:18:28 kurt Exp $ */
+/*     $OpenBSD: vsprintf.c,v 1.17 2017/11/28 06:55:49 tb Exp $ */
 /*-
  * Copyright (c) 1990, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -38,7 +38,7 @@
 
 #if defined(APIWARN)
 __warn_references(vsprintf,
-    "warning: vsprintf() is often misused, please use vsnprintf()");
+    "vsprintf() is often misused, please use vsnprintf()");
 #endif
 
 int

diff --git a/lib/libc/stdlib/rand.c b/lib/libc/stdlib/rand.c
index f4a8d20..97964f6 100644 (file)
--- a/lib/libc/stdlib/rand.c
+++ b/lib/libc/stdlib/rand.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rand.c,v 1.17 2016/10/22 19:19:34 tb Exp $ */
+/*     $OpenBSD: rand.c,v 1.18 2017/11/28 06:55:49 tb Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -44,7 +44,7 @@ DEF_WEAK(rand_r);
 
 #if defined(APIWARN)
 __warn_references(rand_r,
-    "warning: rand_r() is not random, it is deterministic.");
+    "rand_r() is not random, it is deterministic.");
 #endif
 
 int
@@ -57,7 +57,7 @@ rand(void)
 
 #if defined(APIWARN)
 __warn_references(rand,
-    "warning: rand() may return deterministic values, is that what you want?");
+    "rand() may return deterministic values, is that what you want?");
 #endif
 
 void

diff --git a/lib/libc/stdlib/random.c b/lib/libc/stdlib/random.c
index 41d5f64..62a0c24 100644 (file)
--- a/lib/libc/stdlib/random.c
+++ b/lib/libc/stdlib/random.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: random.c,v 1.30 2016/04/05 04:29:21 guenther Exp $ */
+/*     $OpenBSD: random.c,v 1.31 2017/11/28 06:55:49 tb Exp $ */
 /*
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.
@@ -415,5 +415,5 @@ random(void)
 
 #if defined(APIWARN)
 __warn_references(random,
-    "warning: random() may return deterministic values, is that what you want?");
+    "random() may return deterministic values, is that what you want?");
 #endif

diff --git a/lib/libc/string/stpcpy.c b/lib/libc/string/stpcpy.c
index d88afac..5a86541 100644 (file)
--- a/lib/libc/string/stpcpy.c
+++ b/lib/libc/string/stpcpy.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: stpcpy.c,v 1.2 2014/07/09 17:08:21 naddy Exp $        */
+/*     $OpenBSD: stpcpy.c,v 1.3 2017/11/28 06:55:49 tb Exp $   */
 
 /*
  * Copyright (c) 1988 Regents of the University of California.
@@ -33,7 +33,7 @@
 
 #if defined(APIWARN)
 __warn_references(stpcpy,
-    "warning: stpcpy() is dangerous; do not use it");
+    "stpcpy() is dangerous; do not use it");
 #endif
 
 char *

diff --git a/lib/libc/string/strcat.c b/lib/libc/string/strcat.c
index 646c9c2..73da22f 100644 (file)
--- a/lib/libc/string/strcat.c
+++ b/lib/libc/string/strcat.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: strcat.c,v 1.9 2014/06/10 04:17:37 deraadt Exp $      */
+/*     $OpenBSD: strcat.c,v 1.10 2017/11/28 06:55:49 tb Exp $  */
 
 /*
  * Copyright (c) 1988 Regents of the University of California.
@@ -33,7 +33,7 @@
 
 #if defined(APIWARN)
 __warn_references(strcat,
-    "warning: strcat() is almost always misused, please use strlcat()");
+    "strcat() is almost always misused, please use strlcat()");
 #endif
 
 char *

diff --git a/lib/libc/string/strcpy.c b/lib/libc/string/strcpy.c
index 5a9001e..290eefe 100644 (file)
--- a/lib/libc/string/strcpy.c
+++ b/lib/libc/string/strcpy.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: strcpy.c,v 1.9 2014/06/10 04:17:37 deraadt Exp $      */
+/*     $OpenBSD: strcpy.c,v 1.10 2017/11/28 06:55:49 tb Exp $  */
 
 /*
  * Copyright (c) 1988 Regents of the University of California.
@@ -33,7 +33,7 @@
 
 #if defined(APIWARN)
 __warn_references(strcpy,
-    "warning: strcpy() is almost always misused, please use strlcpy()");
+    "strcpy() is almost always misused, please use strlcpy()");
 #endif
 
 char *

diff --git a/lib/libc/string/wcscat.c b/lib/libc/string/wcscat.c
index 5ddb510..0525c3c 100644 (file)
--- a/lib/libc/string/wcscat.c
+++ b/lib/libc/string/wcscat.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: wcscat.c,v 1.4 2015/09/12 16:23:14 guenther Exp $     */
+/*     $OpenBSD: wcscat.c,v 1.5 2017/11/28 06:55:49 tb Exp $   */
 /*     $NetBSD: wcscat.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */
 
 /*-
@@ -33,7 +33,7 @@
 
 #if defined(APIWARN)
 __warn_references(wcscat,
-    "warning: wcscat() is almost always misused, please use wcslcat()");
+    "wcscat() is almost always misused, please use wcslcat()");
 #endif
 
 wchar_t *

diff --git a/lib/libc/string/wcscpy.c b/lib/libc/string/wcscpy.c
index 75fdb75..f772752 100644 (file)
--- a/lib/libc/string/wcscpy.c
+++ b/lib/libc/string/wcscpy.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: wcscpy.c,v 1.4 2005/08/08 08:05:37 espie Exp $        */
+/*     $OpenBSD: wcscpy.c,v 1.5 2017/11/28 06:55:49 tb Exp $   */
 /*     $NetBSD: wcscpy.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */
 
 /*-
@@ -33,7 +33,7 @@
 
 #if defined(APIWARN)
 __warn_references(wcscpy,
-    "warning: wcscpy() is almost always misused, please use wcslcpy()");
+    "wcscpy() is almost always misused, please use wcslcpy()");
 #endif
 
 wchar_t *

diff --git a/lib/libcrypto/evp/evp_enc.c b/lib/libcrypto/evp/evp_enc.c
index d0a5eb2..1b1e9da 100644 (file)
--- a/lib/libcrypto/evp/evp_enc.c
+++ b/lib/libcrypto/evp/evp_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp_enc.c,v 1.36 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: evp_enc.c,v 1.37 2017/11/28 06:55:49 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -258,7 +258,7 @@ EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
 }
 
 __warn_references(EVP_CipherFinal,
-    "warning: EVP_CipherFinal is often misused, please use EVP_CipherFinal_ex and EVP_CIPHER_CTX_cleanup");
+    "EVP_CipherFinal is often misused, please use EVP_CipherFinal_ex and EVP_CIPHER_CTX_cleanup");
 
 int
 EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
@@ -368,7 +368,7 @@ EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
 }
 
 __warn_references(EVP_EncryptFinal,
-    "warning: EVP_EncryptFinal is often misused, please use EVP_EncryptFinal_ex and EVP_CIPHER_CTX_cleanup");
+    "EVP_EncryptFinal is often misused, please use EVP_EncryptFinal_ex and EVP_CIPHER_CTX_cleanup");
 
 int
 EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
@@ -483,7 +483,7 @@ EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
 }
 
 __warn_references(EVP_DecryptFinal,
-    "warning: EVP_DecryptFinal is often misused, please use EVP_DecryptFinal_ex and EVP_CIPHER_CTX_cleanup");
+    "EVP_DecryptFinal is often misused, please use EVP_DecryptFinal_ex and EVP_CIPHER_CTX_cleanup");
 
 int
 EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)