Module Name: src
Committed By: roy
Date: Thu Feb 4 16:58:11 UTC 2016
Modified Files:
src/external/cddl/osnet/dist/common/ctf: ctf_decl.c ctf_impl.h
src/external/cddl/osnet/dist/lib/libctf/common: ctf_subr.c
Log Message:
Correct a prior patch by moving __printflike marking from the .c files
to the .h ones.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dist/common/ctf/ctf_decl.c
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/dist/common/ctf/ctf_impl.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/cddl/osnet/dist/lib/libctf/common/ctf_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/common/ctf/ctf_decl.c
diff -u src/external/cddl/osnet/dist/common/ctf/ctf_decl.c:1.3 src/external/cddl/osnet/dist/common/ctf/ctf_decl.c:1.4
--- src/external/cddl/osnet/dist/common/ctf/ctf_decl.c:1.3 Thu Feb 4 15:23:29 2016
+++ src/external/cddl/osnet/dist/common/ctf/ctf_decl.c Thu Feb 4 16:58:11 2016
@@ -171,7 +171,7 @@ ctf_decl_push(ctf_decl_t *cd, ctf_file_t
}
/*PRINTFLIKE2*/
-void __printflike(2, 3)
+void
ctf_decl_sprintf(ctf_decl_t *cd, const char *format, ...)
{
size_t len = (size_t)(cd->cd_end - cd->cd_ptr);
Index: src/external/cddl/osnet/dist/common/ctf/ctf_impl.h
diff -u src/external/cddl/osnet/dist/common/ctf/ctf_impl.h:1.2 src/external/cddl/osnet/dist/common/ctf/ctf_impl.h:1.3
--- src/external/cddl/osnet/dist/common/ctf/ctf_impl.h:1.2 Thu Sep 24 14:18:24 2015
+++ src/external/cddl/osnet/dist/common/ctf/ctf_impl.h Thu Feb 4 16:58:11 2016
@@ -303,7 +303,7 @@ extern ctf_dtdef_t *ctf_dtd_lookup(ctf_f
extern void ctf_decl_init(ctf_decl_t *, char *, size_t);
extern void ctf_decl_fini(ctf_decl_t *);
extern void ctf_decl_push(ctf_decl_t *, ctf_file_t *, ctf_id_t);
-extern void ctf_decl_sprintf(ctf_decl_t *, const char *, ...);
+extern void ctf_decl_sprintf(ctf_decl_t *, const char *, ...) __printflike(2,3);
extern const char *ctf_strraw(ctf_file_t *, uint_t);
extern const char *ctf_strptr(ctf_file_t *, uint_t);
@@ -323,7 +323,7 @@ extern void ctf_free(void *, size_t);
extern char *ctf_strdup(const char *);
extern const char *ctf_strerror(int);
-extern void ctf_dprintf(const char *, ...);
+extern void ctf_dprintf(const char *, ...) __printflike(1, 2);
extern void *ctf_zopen(int *);
Index: src/external/cddl/osnet/dist/lib/libctf/common/ctf_subr.c
diff -u src/external/cddl/osnet/dist/lib/libctf/common/ctf_subr.c:1.4 src/external/cddl/osnet/dist/lib/libctf/common/ctf_subr.c:1.5
--- src/external/cddl/osnet/dist/lib/libctf/common/ctf_subr.c:1.4 Thu Feb 4 15:23:29 2016
+++ src/external/cddl/osnet/dist/lib/libctf/common/ctf_subr.c Thu Feb 4 16:58:11 2016
@@ -73,7 +73,7 @@ ctf_strerror(int err)
}
/*PRINTFLIKE1*/
-void __printflike(1, 2)
+void
ctf_dprintf(const char *format, ...)
{
if (_libctf_debug) {
