Changeset 102506 in vbox for trunk/src/libs/xpcom18a4

Timestamp:

Dec 6, 2023 3:10:52 PM (15 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

160650

Message:

libs/xpcom: Fixed some warnings. bugref:10545

Location:

trunk/src/libs/xpcom18a4/xpcom

Files:

• components/nsComponentManager.cpp (modified) (1 diff)
• reflect/xptcall/tests/TestXPTCInvoke.cpp (modified) (19 diffs)

trunk/src/libs/xpcom18a4/xpcom/components/nsComponentManager.cpp

@@ -1237 +1237 @@
             { 0 }
         };
-        for (int i=0; abusedContracts[i] && *abusedContracts[i]; i++) {
+        for (int i=0; i < RT_ELEMENTS(abusedContracts) && *abusedContracts[i]; i++) {
             nsFactoryEntry *entry = nsnull;
             nsContractIDTableEntry* contractIDTableEntry =

trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp

@@ -152 +152 @@
     NS_IMETHOD AddManyManyFloats(float p1, float p2, float p3, float p4,
                                  float p5, float p6, float p7, float p8,
-                                 float p9, float p10, float p11, float p12, 
-                                 float p13, float p14, float p15, float p16, 
-                                 float p17, float p18, float p19, float p20, 
+                                 float p9, float p10, float p11, float p12,
+                                 float p13, float p14, float p15, float p16,
+                                 float p17, float p18, float p19, float p20,
                                  float *retval) = 0;
 
@@ -198 +198 @@
 
     NS_IMETHOD AddMixedInts(PRInt64 p1, PRInt32 p2, PRInt64 p3, PRInt32 p4,
-                            PRInt32 p5, PRInt64 p6, PRInt32 p7, PRInt32 p8,
-                            PRInt64 p9, PRInt32 p10, PRInt64* retval);
+                PRInt32 p5, PRInt64 p6, PRInt32 p7, PRInt32 p8,
+                PRInt64 p9, PRInt32 p10, PRInt64* retval);
 
     NS_IMETHOD AddMixedInts2(PRInt32 p1, PRInt64 p2, PRInt32 p3, PRInt64 p4,
-                             PRInt64 p5, PRInt32 p6, PRInt64 p7, PRInt64 p8,
-                             PRInt32 p9, PRInt64 p10, PRInt64* retval);
+                 PRInt64 p5, PRInt32 p6, PRInt64 p7, PRInt64 p8,
+                 PRInt32 p9, PRInt64 p10, PRInt64* retval);
 
     NS_IMETHOD AddMixedFloats(float p1, float p2, double p3, double p4,
@@ -212 +212 @@
     NS_IMETHOD AddManyManyFloats(float p1, float p2, float p3, float p4,
                                  float p5, float p6, float p7, float p8,
-                                 float p9, float p10, float p11, float p12, 
-                                 float p13, float p14, float p15, float p16, 
-                                 float p17, float p18, float p19, float p20, 
+                                 float p9, float p10, float p11, float p12,
+                                 float p13, float p14, float p15, float p16,
+                                 float p17, float p18, float p19, float p20,
                                  float *retval);
 
@@ -263 +263 @@
 {
 #ifdef DEBUG_TESTINVOKE
-    printf("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n", 
+    printf("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",
            p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);
 #endif
@@ -286 +286 @@
 {
 #ifdef DEBUG_TESTINVOKE
-    printf("%lf, %lf, %lf, %lf, %lf, %lf, %lf, %lf, %lf, %lf\n", 
+    printf("%lf, %lf, %lf, %lf, %lf, %lf, %lf, %lf, %lf, %lf\n",
            p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);
 #endif
@@ -299 +299 @@
 {
 #ifdef DEBUG_TESTINVOKE
-    printf("%f, %f, %f, %f, %f, %f, %f, %f, %f, %f\n", 
+    printf("%f, %f, %f, %f, %f, %f, %f, %f, %f, %f\n",
            p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);
 #endif
@@ -313 +313 @@
 {
 #ifdef DEBUG_TESTINVOKE
-    printf("%f, %f, %lf, %lf, %f, %f, %lf, %lf, %f, %lf, %f\n", 
+    printf("%f, %f, %lf, %lf, %f, %f, %lf, %lf, %f, %lf, %f\n",
            p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);
 #endif
@@ -323 +323 @@
 InvokeTestTarget::AddManyManyFloats(float p1, float p2, float p3, float p4,
                                     float p5, float p6, float p7, float p8,
-                                    float p9, float p10, float p11, float p12, 
-                                    float p13, float p14, float p15, float p16, 
+                                    float p9, float p10, float p11, float p12,
+                                    float p13, float p14, float p15, float p16,
                                     float p17, float p18, float p19, float p20,
                                     float *retval)
@@ -330 +330 @@
 #ifdef DEBUG_TESTINVOKE
     printf("%f, %f, %f, %f, %f, %f, %f, %f, %f, %f, "
-           "%f, %f, %f, %f, %f, %f, %f, %f, %f, %f\n", 
+           "%f, %f, %f, %f, %f, %f, %f, %f, %f, %f\n",
            p1, p2, p3, p4, p5, p6, p7, p8, p9, p10,
            p11, p12, p13, p14, p15, p16, p17, p18, p19, p20);
@@ -341 +341 @@
 NS_IMETHODIMP
 InvokeTestTarget::AddMixedInts(PRInt64 p1, PRInt32 p2, PRInt64 p3, PRInt32 p4,
-                               PRInt32 p5, PRInt64 p6, PRInt32 p7, PRInt32 p8,
-                               PRInt64 p9, PRInt32 p10, PRInt64* retval)
+                   PRInt32 p5, PRInt64 p6, PRInt32 p7, PRInt32 p8,
+                   PRInt64 p9, PRInt32 p10, PRInt64* retval)
 {
     *retval = p1 + p2 + p3 + p4 + p5 + p6 + p7 + p8 + p9 + p10;
@@ -350 +350 @@
 NS_IMETHODIMP
 InvokeTestTarget::AddMixedInts2(PRInt32 p1, PRInt64 p2, PRInt32 p3, PRInt64 p4,
-                                PRInt64 p5, PRInt32 p6, PRInt64 p7, PRInt64 p8,
-                                PRInt32 p9, PRInt64 p10, PRInt64* retval)
+                PRInt64 p5, PRInt32 p6, PRInt64 p7, PRInt64 p8,
+                PRInt32 p9, PRInt64 p10, PRInt64* retval)
 {
     *retval = p1 + p2 + p3 + p4 + p5 + p6 + p7 + p8 + p9 + p10;
@@ -361 +361 @@
 {
     const char milk[] = "milk";
-    char *ret = (char*)nsMemory::Alloc(sizeof(milk));
+    const size_t cb = sizeof(milk);
+    char *ret = (char*)nsMemory::Alloc(cb);
     if (!ret)
       return NS_ERROR_OUT_OF_MEMORY;
-    strncpy(ret, milk, sizeof(milk));
+    strncpy(ret, milk, cb);
     printf("\t%s %s", s1, s2);
     *retval = ret;
@@ -445 +446 @@
      else
          bufprintf("\tFAILED");
- 
+
      if(NS_SUCCEEDED(test->AddMixedInts2(1,2,3,4,5,6,7,8,9,10,&out64)))
      {
@@ -847 +848 @@
     if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 12, 11, var)))
         bufprintf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %d\n",
-               (int)var[10].val.i64);
+           (int)var[10].val.i64);
     else
         bufprintf("\tFAILED");
@@ -898 +899 @@
     if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 13, 11, var)))
         bufprintf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %d\n",
-               (int)var[10].val.i64);
+           (int)var[10].val.i64);
     else
         bufprintf("\tFAILED");
@@ -964 +965 @@
     var[1].type = nsXPTType::T_CHAR_STR;
     var[1].flags = 0;
-    
+
     var[2].val.p = 0;
     var[2].type = nsXPTType::T_CHAR_STR;
     var[2].flags = nsXPTCVariant::PTR_IS_DATA;
     var[2].ptr = &var[2].val.p;
-    
+
     if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 15, 3, var)))
     {
@@ -1443 +1444 @@
 
     printf("Speed test...\n\n");
-    printf("Doing %d direct call iterations...\n", count); 
+    printf("Doing %d direct call iterations...\n", count);
     start = RTTimeNanoTS();
     for(i = count; i; i--)
@@ -1449 +1450 @@
     interval_direct = RTTimeNanoTS() - start;
 
-    printf("Doing %d invoked call iterations...\n", count); 
+    printf("Doing %d invoked call iterations...\n", count);
     start = RTTimeNanoTS();
     for(i = count; i; i--)
@@ -1455 +1456 @@
     interval_invoke = RTTimeNanoTS() - start;
 
-    printf(" direct took %0.2f seconds\n", 
+    printf(" direct took %0.2f seconds\n",
             (double)interval_direct/(double)RT_NS_1SEC);
-    printf(" invoke took %0.2f seconds\n", 
+    printf(" invoke took %0.2f seconds\n",
             (double)interval_invoke/(double)RT_NS_1SEC);
-    printf(" So, invoke overhead was ~ %0.2f seconds (~ %0.0f%%)\n", 
+    printf(" So, invoke overhead was ~ %0.2f seconds (~ %0.0f%%)\n",
             (double)(interval_invoke-interval_direct)/(double)RT_NS_1SEC,
             (double)(interval_invoke-interval_direct)/(double)interval_invoke*100);
-}        
+}