Module Name: src
Committed By: roy
Date: Thu Feb 4 17:40:55 UTC 2016
Modified Files:
src/external/cddl/osnet/dist/tools/ctf/cvt: ctf.c ctfconvert.c
ctftools.h st_parse.c
Log Message:
More printflike and dead fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/cddl/osnet/dist/tools/ctf/cvt/ctf.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dist/tools/ctf/cvt/ctfconvert.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/cddl/osnet/dist/tools/ctf/cvt/ctftools.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/cddl/osnet/dist/tools/ctf/cvt/st_parse.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/tools/ctf/cvt/ctf.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/ctf.c:1.9 src/external/cddl/osnet/dist/tools/ctf/cvt/ctf.c:1.10
--- src/external/cddl/osnet/dist/tools/ctf/cvt/ctf.c:1.9 Wed Oct 21 13:43:49 2015
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/ctf.c Thu Feb 4 17:40:55 2016
@@ -81,7 +81,7 @@ struct ctf_buf {
static int target_requires_swap;
/*PRINTFLIKE1*/
-static void __printflike(1, 2)
+static void __printflike(1, 2) __dead
parseterminate(const char *fmt, ...)
{
static char msgbuf[1024]; /* sigh */
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/ctfconvert.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/ctfconvert.c:1.3 src/external/cddl/osnet/dist/tools/ctf/cvt/ctfconvert.c:1.4
--- src/external/cddl/osnet/dist/tools/ctf/cvt/ctfconvert.c:1.3 Wed Feb 24 21:53:26 2010
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/ctfconvert.c Thu Feb 4 17:40:55 2016
@@ -76,7 +76,7 @@ terminate_cleanup(void)
#endif
}
-static void
+static void __dead
handle_sig(int sig)
{
terminate("Caught signal %d - exiting\n", sig);
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/ctftools.h
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/ctftools.h:1.4 src/external/cddl/osnet/dist/tools/ctf/cvt/ctftools.h:1.5
--- src/external/cddl/osnet/dist/tools/ctf/cvt/ctftools.h:1.4 Sat Feb 7 20:30:03 2015
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/ctftools.h Thu Feb 4 17:40:55 2016
@@ -440,11 +440,11 @@ int findelfsecidx(Elf *, const char *, c
size_t elf_ptrsz(Elf *);
char *mktmpname(const char *, const char *);
void terminate(const char *, ...) __printflike(1, 2) __dead;
-void aborterr(const char *, ...) __printflike(1, 2);
+void aborterr(const char *, ...) __printflike(1, 2) __dead;
void set_terminate_cleanup(void (*)(void));
-void elfterminate(const char *, const char *, ...) __printflike(2, 3);
+void elfterminate(const char *, const char *, ...) __printflike(2, 3) __dead;
void warning(const char *, ...) __printflike(1, 2);
-void vadebug(int, const char *, va_list);
+void vadebug(int, const char *, va_list) __printflike(2, 0);
void debug(int, const char *, ...) __printflike(2, 3);
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/st_parse.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/st_parse.c:1.5 src/external/cddl/osnet/dist/tools/ctf/cvt/st_parse.c:1.6
--- src/external/cddl/osnet/dist/tools/ctf/cvt/st_parse.c:1.5 Sat Feb 7 20:30:03 2015
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/st_parse.c Thu Feb 4 17:40:55 2016
@@ -1125,7 +1125,7 @@ compute_sum(const char *w)
return (HASH(sum));
}
-static void
+static void __dead
reset(void)
{
longjmp(resetbuf, 1);
