儲存庫 vbox 的更動 63129

時間撮記:

2016-8-7 下午01:13:28 (8 年 以前)

作者:

vboxsync

訊息:

dtrace: warnings

位置:

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv

檔案:

• cmd/dtrace/dtrace.c (修改) (4 筆差異)
• common/ctf/ctf_create.c (修改) (2 筆差異)
• common/ctf/ctf_lookup.c (修改) (1 筆差異)
• common/ctf/ctf_open.c (修改) (2 筆差異)
• lib/libdtrace/common/dt_aggregate.c (修改) (1 筆差異)
• lib/libdtrace/common/dt_consume.c (修改) (2 筆差異)
• lib/libdtrace/common/dt_regset.c (修改) (1 筆差異)
• lib/libdtrace/common/dt_subr.c (修改) (1 筆差異)

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/cmd/dtrace/dtrace.c

@@ -400 +400 @@
                 fatal("failed to allocate memory for %s", fname);
 
-        if (read(fd, buf, sz) != sz)
+        if ((size_t/*vbox*/)read(fd, buf, sz) != sz)
                 fatal("failed to read %s", fname);
 
@@ -430 +430 @@
                  */
                 if (i != mark) {
-                        if (write(fd, &buf[mark], i - mark) != i - mark)
+                        if ((size_t/*vbox*/)write(fd, &buf[mark], i - mark) != i - mark)
                                 fatal("failed to write to %s", fname);
                 }
@@ -450 +450 @@
 
         if (mark < sz) {
-                if (write(fd, &buf[mark], sz - mark) != sz - mark)
+                if ((size_t/*vbox*/)write(fd, &buf[mark], sz - mark) != sz - mark)
                         fatal("failed to write to %s", fname);
         }
@@ -476 +476 @@
                 fatal("failed to allocate memory for %s", fname);
 
-        if (read(fd, buf, sz) != sz)
+        if ((size_t/*vbox*/)read(fd, buf, sz) != sz)
                 fatal("failed to read %s", fname);
 

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/common/ctf/ctf_create.c

@@ -513 +513 @@
 
         for (dtd = ctf_list_next(&fp->ctf_dtdefs); dtd != NULL; dtd = ntd) {
-                if (dtd->dtd_type <= fp->ctf_dtoldid)
+                if (dtd->dtd_type <= (intptr_t /*vbox*/)fp->ctf_dtoldid)
                         continue; /* skip types that have been committed */
 
@@ -1165 +1165 @@
         if (dst_type == CTF_ERR && name[0] != '\0') {
                 for (dtd = ctf_list_prev(&dst_fp->ctf_dtdefs); dtd != NULL &&
-                    dtd->dtd_type > dst_fp->ctf_dtoldid;
+                    dtd->dtd_type > (intptr_t /*vbox*/)dst_fp->ctf_dtoldid;
                     dtd = ctf_list_prev(dtd)) {
                         if ((uint_t)CTF_INFO_KIND(dtd->dtd_data.ctt_info) == kind &&

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/common/ctf/ctf_lookup.c

@@ -234 +234 @@
 
         type = CTF_TYPE_TO_INDEX(type);
-        if (type > 0 && type <= fp->ctf_typemax) {
+        if (type > 0 && type <= (intptr_t/*vbox*/)fp->ctf_typemax) {
                 *fpp = fp; /* function returns ending CTF container */
                 return (LCTF_INDEX_TO_TYPEPTR(fp, type));

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/common/ctf/ctf_open.c

@@ -491 +491 @@
                          */
                         if (CTF_TYPE_ISCHILD(tp->ctt_type) == child &&
-                            CTF_TYPE_TO_INDEX(tp->ctt_type) <= fp->ctf_typemax)
+                            CTF_TYPE_TO_INDEX(tp->ctt_type) <= (intptr_t/*vbox*/)fp->ctf_typemax)
                                 fp->ctf_ptrtab[
                                     CTF_TYPE_TO_INDEX(tp->ctt_type)] = id;
@@ -536 +536 @@
                             strcmp(ctf_strptr(fp, tp->ctt_name), "") == 0 &&
                             CTF_TYPE_ISCHILD(tp->ctt_type) == child &&
-                            CTF_TYPE_TO_INDEX(tp->ctt_type) <= fp->ctf_typemax)
+                            CTF_TYPE_TO_INDEX(tp->ctt_type) <= (intptr_t /*vbox*/)fp->ctf_typemax)
                                 fp->ctf_ptrtab[
                                     CTF_TYPE_TO_INDEX(tp->ctt_type)] = dst;

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

@@ -1680 +1680 @@
         }
 
-        assert(i == nentries);
+        assert((size_t/*vbox*/)i == nentries);
 
         /*

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

@@ -731 +731 @@
          * assume that it's something else and just print the bytes.
          */
+#ifdef VBOX
+        size_t i, j;
+        int margin = 5;
+#else
         int i, j, margin = 5;
+#endif
         char *c = (char *)addr;
 
@@ -1045 +1050 @@
                 if (str != NULL) {
                         str += strlen(str) + 1;
-                        if (str - strbase >= strsize)
+                        if ((uintptr_t/*vbox*/)(str - strbase) >= strsize)
                                 str = NULL;
                 }

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

@@ -107 +107 @@
 dt_regset_free(dt_regset_t *drp, int reg)
 {
-        assert(reg > 0 && reg < drp->dr_size);
+        assert(reg > 0 && (unsigned /*vbox*/)reg < drp->dr_size);
         assert(BT_TEST(drp->dr_bitmap, reg) != 0);
         BT_CLEAR(drp->dr_bitmap, reg);

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

@@ -703 +703 @@
                         avail = dtp->dt_buffered_size - dtp->dt_buffered_offs;
 
-                        if (needed + 1 < avail)
+                        if ((size_t/*vbox*/)needed + 1 < avail)
                                 break;