Changeset 66829 in vbox for trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace

Timestamp:

May 8, 2017 4:54:59 PM (8 years ago)

Author:

vboxsync

Message:

dtrace: Adjustments for Visual C++ v12 / Visual Studio 2013. New warnings.

Location:

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common

Files:

• dt_aggregate.c (modified) (5 diffs)
• dt_cc.c (modified) (1 diff)
• dt_consume.c (modified) (1 diff)
• dt_ident.c (modified) (1 diff)

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_aggregate.c

@@ -67 +67 @@
 dt_aggregate_count(int64_t *existing, int64_t *new, size_t size)
 {
-        int i;
+        VBDTTYPE(size_t,int) i;
 
         for (i = 0; i < size / sizeof (int64_t); i++)
@@ -1708 +1708 @@
         bundle = (dt_ahashent_t ***)sorted;
 
-        for (i = 1, start = 0; i <= nentries; i++) {
-                if (i < nentries &&
+        for (i = 1, start = 0; (size_t/*vbox*/)i <= nentries; i++) {
+                if ((size_t/*vbox*/)i < nentries &&
                     dt_aggregate_keycmp(&sorted[i], &sorted[i - 1]) == 0)
                         continue;
@@ -1717 +1717 @@
                  * (i - 1) belongs in one bundle.
                  */
-                assert(i - start <= naggvars);
+                assert((size_t/*vbox*/)i - start <= (size_t/*vbox*/)naggvars);
                 bundlesize = (naggvars + 2) * sizeof (dt_ahashent_t *);
 
@@ -1787 +1787 @@
         data = alloca((naggvars + 1) * sizeof (dtrace_aggdata_t *));
 
-        for (i = 0; i < nbundles; i++) {
+        for (i = 0; (size_t/*vbox*/)i < nbundles; i++) {
                 for (j = 0; j < naggvars; j++)
                         data[j + 1] = NULL;
@@ -1818 +1818 @@
         rval = 0;
 out:
-        for (i = 0; i < nbundles; i++)
+        for (i = 0; (size_t/*vbox*/)i < nbundles; i++)
                 dt_free(dtp, bundle[i]);
 

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_cc.c

@@ -1282 +1282 @@
                          */
                         int obaseval = DTRACE_LQUANTIZE_BASE(oarg);
-                        int onlevels = DTRACE_LQUANTIZE_LEVELS(oarg);
-                        int ostep = DTRACE_LQUANTIZE_STEP(oarg);
+                        VBDTTYPE(unsigned,int) onlevels = DTRACE_LQUANTIZE_LEVELS(oarg);
+                        VBDTTYPE(unsigned,int) ostep = DTRACE_LQUANTIZE_STEP(oarg);
 
                         if (obaseval != baseval) {

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_consume.c

@@ -316 +316 @@
         uint64_t next_try[2];
         uint64_t bit_pairs, pair_shift;
-        int i;
+        VBDTTYPE(uint64_t,int) i;
 
         bit_pairs = dt_nbits_128(square) / 2;

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_ident.c

@@ -353 +353 @@
         }
 
-        if (ap->dn_value >= prp->pr_argc) {
+        if (ap->dn_value >= VBDTCAST(uintmax_t)prp->pr_argc) {
                 xyerror(D_ARGS_IDX, "index %lld is out of range for %s %s[ ]\n",
                     (longlong_t)ap->dn_value, dtrace_desc2str(yypcb->pcb_pdesc,