Module Name: src
Committed By: jakllsch
Date: Wed Aug 3 15:24:28 UTC 2016
Modified Files:
src/crypto/external/bsd/openssh/dist: utf8.c utf8.h
Log Message:
Add some missing __attribute__((format(printf annotations.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/utf8.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/crypto/external/bsd/openssh/dist/utf8.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/utf8.c
diff -u src/crypto/external/bsd/openssh/dist/utf8.c:1.2 src/crypto/external/bsd/openssh/dist/utf8.c:1.3
--- src/crypto/external/bsd/openssh/dist/utf8.c:1.2 Tue Aug 2 13:45:12 2016
+++ src/crypto/external/bsd/openssh/dist/utf8.c Wed Aug 3 15:24:28 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: utf8.c,v 1.2 2016/08/02 13:45:12 christos Exp $ */
+/* $NetBSD: utf8.c,v 1.3 2016/08/03 15:24:28 jakllsch Exp $ */
/* $OpenBSD: utf8.c,v 1.3 2016/05/30 12:57:21 schwarze Exp $ */
/*
* Copyright (c) 2016 Ingo Schwarze <[email protected]>
@@ -17,7 +17,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: utf8.c,v 1.2 2016/08/02 13:45:12 christos Exp $");
+__RCSID("$NetBSD: utf8.c,v 1.3 2016/08/03 15:24:28 jakllsch Exp $");
/*
* Utility functions for multibyte-character handling,
* in particular to sanitize untrusted strings for terminal output.
@@ -37,7 +37,8 @@ __RCSID("$NetBSD: utf8.c,v 1.2 2016/08/0
static int dangerous_locale(void);
static int grow_dst(char **, size_t *, size_t, char **, size_t);
-static int vasnmprintf(char **, size_t, int *, const char *, va_list);
+static int vasnmprintf(char **, size_t, int *, const char *, va_list)
+ __attribute__((format(printf, 4, 0)));
/*
Index: src/crypto/external/bsd/openssh/dist/utf8.h
diff -u src/crypto/external/bsd/openssh/dist/utf8.h:1.1.1.1 src/crypto/external/bsd/openssh/dist/utf8.h:1.2
--- src/crypto/external/bsd/openssh/dist/utf8.h:1.1.1.1 Tue Aug 2 13:30:06 2016
+++ src/crypto/external/bsd/openssh/dist/utf8.h Wed Aug 3 15:24:28 2016
@@ -19,6 +19,7 @@ int mprintf(const char *, ...)
__attribute__((format(printf, 1, 2)));
int fmprintf(FILE *, const char *, ...)
__attribute__((format(printf, 2, 3)));
-int vfmprintf(FILE *, const char *, va_list);
+int vfmprintf(FILE *, const char *, va_list)
+ __attribute__((format(printf, 2, 0)));
int snmprintf(char *, size_t, int *, const char *, ...)
__attribute__((format(printf, 4, 5)));
