[src/trunk]: src/external/cddl/osnet/dist/cmd/dtrace Add some __printflike an...

[roy <roy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a4717dd5e223
branches:  trunk
changeset: 343449:a4717dd5e223
user:      roy <roy%NetBSD.org@localhost>
date:      Thu Feb 04 20:05:53 2016 +0000

description:
Add some __printflike and __dead love. Init some structs fully.

diffstat:

 external/cddl/osnet/dist/cmd/dtrace/dtrace.c |  24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diffs (107 lines):

diff -r 1f74bf8903cd -r a4717dd5e223 external/cddl/osnet/dist/cmd/dtrace/dtrace.c
--- a/external/cddl/osnet/dist/cmd/dtrace/dtrace.c      Thu Feb 04 18:47:14 2016 +0000
+++ b/external/cddl/osnet/dist/cmd/dtrace/dtrace.c      Thu Feb 04 20:05:53 2016 +0000
@@ -173,7 +173,7 @@
        return (E_USAGE);
 }
 
-static void
+static void __printflike(1, 0)
 verror(const char *fmt, va_list ap)
 {
        int error = errno;
@@ -186,7 +186,7 @@
 }
 
 /*PRINTFLIKE1*/
-static void
+static void __printflike(1, 2) __dead
 fatal(const char *fmt, ...)
 {
        va_list ap;
@@ -199,7 +199,7 @@
 }
 
 /*PRINTFLIKE1*/
-static void
+static void __printflike(1, 2) __dead
 dfatal(const char *fmt, ...)
 {
 #if !defined(sun) && defined(NEED_ERRLOC)
@@ -239,7 +239,7 @@
 }
 
 /*PRINTFLIKE1*/
-static void
+static void __printflike(1, 2)
 error(const char *fmt, ...)
 {
        va_list ap;
@@ -250,7 +250,7 @@
 }
 
 /*PRINTFLIKE1*/
-static void
+static void __printflike(1, 2)
 notice(const char *fmt, ...)
 {
        va_list ap;
@@ -264,7 +264,7 @@
 }
 
 /*PRINTFLIKE1*/
-static void
+static void __printflike(1, 2)
 oprintf(const char *fmt, ...)
 {
        va_list ap;
@@ -770,7 +770,7 @@
 }
 
 /*ARGSUSED*/
-static void
+static void __dead
 prochandler(struct ps_prochandle *P, const char *msg, void *arg)
 {
 fatal("DOODAD in function %s, file %s, line %d\n",__FUNCTION__,__FILE__,__LINE__);
@@ -896,7 +896,7 @@
            { "AGGFORMAT",      DTRACE_BUFDATA_AGGFORMAT },
            { "AGGLAST",        DTRACE_BUFDATA_AGGLAST },
            { "???",            UINT32_MAX },
-           { NULL }
+           { NULL,             0 }
        };
 
        if (bufdata->dtbda_probe != NULL) {
@@ -1052,7 +1052,7 @@
                        (void) snprintf(name, sizeof (name), "%s:%s",
                            pd->dtpd_func, pd->dtpd_name);
 
-                       oprintf("%3d %6d %32s ", cpu, pd->dtpd_id, name);
+                       oprintf("%3d %6d %32s ", (int)cpu, pd->dtpd_id, name);
                }
        } else {
                int indent = data->dtpda_indent;
@@ -1072,7 +1072,7 @@
                            data->dtpda_prefix, pd->dtpd_func);
                }
 
-               oprintf("%3d %-41s ", cpu, name);
+               oprintf("%3d %-41s ", (int)cpu, name);
        }
 
        return (DTRACE_CONSUME_THIS);
@@ -1092,11 +1092,11 @@
                { "aggregation size", "aggsize", 0 },
                { "speculation size", "specsize", 0 },
                { "dynamic variable size", "dynvarsize", 0 },
-               { NULL }
+               { NULL, NULL, 0 }
        }, rates[] = {
                { "cleaning rate", "cleanrate", 0 },
                { "status rate", "statusrate", 0 },
-               { NULL }
+               { NULL, NULL ,0 }
        };
 
        for (i = 0; bufs[i].name != NULL; i++) {