Changeset 99527 in vbox

Timestamp:

Apr 25, 2023 6:40:37 PM (2 years ago)

Author:

vboxsync

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

157036

Message:

xpcom/tstTestHashtables: Don't use %c with Unicode CP, because it doesn't handle the encoding right (causing errors when the output of unit tests in the validation kit contains invalid UTF-8 sequences).

File:

• trunk/src/libs/xpcom18a4/xpcom/tests/TestHashtables.cpp (modified) (30 diffs)

trunk/src/libs/xpcom18a4/xpcom/tests/TestHashtables.cpp

@@ -114 +114 @@
 PLDHashOperator
 nsTEnumGo(EntityToUnicodeEntry* aEntry, void* userArg) {
-  printf("  enumerated \"%s\" = %u\n", 
+  printf("  enumerated \"%s\" = %u\n",
          aEntry->mNode->mStr, aEntry->mNode->mUnicode);
 
@@ -202 +202 @@
 PLDHashOperator
 nsCEnumRead(const nsACString& aKey, TestUniChar* aData, void* userArg) {
-  printf("  enumerated \"%s\" = %c\n",
+  printf("  enumerated \"%s\" = %u\n",
          PromiseFlatCString(aKey).get(), aData->GetChar());
   return PL_DHASH_NEXT;
@@ -209 +209 @@
 PLDHashOperator
 nsCEnum(const nsACString& aKey, nsAutoPtr<TestUniChar>& aData, void* userArg) {
-    printf("  enumerated \"%s\" = %c\n", 
+    printf("  enumerated \"%s\" = %u\n",
            PromiseFlatCString(aKey).get(), aData->GetChar());
   return PL_DHASH_NEXT;
@@ -278 +278 @@
   {
     ++refcount_;
-    printf("IFoo@%p::AddRef(), refcount --> %d\n", 
+    printf("IFoo@%p::AddRef(), refcount --> %d\n",
            NS_STATIC_CAST(void*, this), refcount_);
     return refcount_;
@@ -289 +289 @@
     if ( wrap_message )
       printf(">>");
-      
+
     nsrefcnt newrefcount = --refcount_;
     printf("IFoo@%p::Release(), refcount --> %d\n",
@@ -487 +487 @@
     exit (13);
   }
-      
+
   printf("not found; good.\n");
-      
+
   printf("Enumerating:\n");
-  
+
   count = UniToEntity.EnumerateRead(nsDEnumRead, nsnull);
   if (count != ENTITY_COUNT) {
@@ -497 +497 @@
     exit (14);
   }
-  
+
   printf("Clearing...");
   UniToEntity.Clear();
@@ -552 +552 @@
     exit (13);
   }
-      
+
   printf("not found; good.\n");
-      
+
   printf("Enumerating:\n");
-  
+
   count = UniToEntityL.EnumerateRead(nsDEnumRead, nsnull);
   if (count != ENTITY_COUNT) {
@@ -562 +562 @@
     exit (14);
   }
-  
+
   printf("Clearing...");
   UniToEntityL.Clear();
@@ -613 +613 @@
     }
 
-    printf("Found %c\n", myChar->GetChar());
+    printf("Found %u\n", myChar->GetChar());
   }
 
@@ -621 +621 @@
     exit (19);
   }
-      
+
   printf("not found; good.\n");
-      
+
   printf("Enumerating:\n");
-  
+
   count = EntToUniClass.EnumerateRead(nsCEnumRead, nsnull);
   if (count != ENTITY_COUNT) {
@@ -631 +631 @@
     exit (20);
   }
-  
+
   printf("Clearing...\n");
   EntToUniClass.Clear();
@@ -681 +681 @@
     }
 
-    printf("Found %c\n", myChar->GetChar());
+    printf("Found %u\n", myChar->GetChar());
   }
 
@@ -689 +689 @@
     exit (19);
   }
-      
+
   printf("not found; good.\n");
-      
+
   printf("Enumerating:\n");
-  
+
   count = EntToUniClassL.EnumerateRead(nsCEnumRead, nsnull);
   if (count != ENTITY_COUNT) {
@@ -699 +699 @@
     exit (20);
   }
-  
+
   printf("Clearing...\n");
   EntToUniClassL.Clear();
@@ -735 +735 @@
     CreateIFoo(getter_AddRefs(foo));
     foo->SetString(nsDependentCString(gEntities[i].mStr));
-    
-    
+
+
     fooArray.InsertObjectAt(foo, i);
 
@@ -751 +751 @@
   for (i = 0; i < ENTITY_COUNT; ++i) {
     printf("  Getting entry %s...", gEntities[i].mStr);
-    
+
     if (!EntToUniClass2.Get(fooArray[i], &myChar2)) {
       printf("FAILED\n");
@@ -757 +757 @@
     }
 
-    printf("Found %c\n", myChar2);
+    printf("Found %u\n", myChar2);
   }
 
@@ -765 +765 @@
     exit (25);
   }
-      
+
   printf("not found; good.\n");
-      
+
   printf("Enumerating:\n");
-  
+
   count = EntToUniClass2.EnumerateRead(nsIEnum2Read, nsnull);
   if (count != ENTITY_COUNT) {
@@ -775 +775 @@
     exit (26);
   }
-  
+
   printf("Clearing...\n");
   EntToUniClass2.Clear();
@@ -809 +809 @@
     CreateIFoo(getter_AddRefs(foo));
     foo->SetString(nsDependentCString(gEntities[i].mStr));
-    
+
     if (!UniToEntClass2.Put(gEntities[i].mUnicode, foo)) {
       printf("FAILED\n");
@@ -821 +821 @@
   for (i = 0; i < ENTITY_COUNT; ++i) {
     printf("  Getting entry %s...", gEntities[i].mStr);
-    
+
     nsCOMPtr<IFoo> myEnt;
     if (!UniToEntClass2.Get(gEntities[i].mUnicode, getter_AddRefs(myEnt))) {
@@ -827 +827 @@
       exit (30);
     }
-    
+
     nsCAutoString str;
     myEnt->GetString(str);
@@ -839 +839 @@
     exit (31);
   }
-      
+
   printf("not found; good.\n");
-      
+
   printf("Enumerating:\n");
-  
+
   count = UniToEntClass2.EnumerateRead(nsIEnumRead, nsnull);
   if (count != ENTITY_COUNT) {
@@ -849 +849 @@
     exit (32);
   }
-  
+
   printf("Clearing...\n");
   UniToEntClass2.Clear();
@@ -883 +883 @@
     CreateIFoo(getter_AddRefs(foo));
     foo->SetString(nsDependentCString(gEntities[i].mStr));
-    
+
     if (!UniToEntClass2L.Put(gEntities[i].mUnicode, foo)) {
       printf("FAILED\n");
@@ -895 +895 @@
   for (i = 0; i < ENTITY_COUNT; ++i) {
     printf("  Getting entry %s...", gEntities[i].mStr);
-    
+
     nsCOMPtr<IFoo> myEnt;
     if (!UniToEntClass2L.Get(gEntities[i].mUnicode, getter_AddRefs(myEnt))) {
@@ -901 +901 @@
       exit (30);
     }
-    
+
     nsCAutoString str;
     myEnt->GetString(str);
@@ -912 +912 @@
     exit (31);
   }
-      
+
   printf("not found; good.\n");
-      
+
   printf("Enumerating:\n");
-  
+
   count = UniToEntClass2L.EnumerateRead(nsIEnumRead, nsnull);
   if (count != ENTITY_COUNT) {
@@ -922 +922 @@
     exit (32);
   }
-  
+
   printf("Clearing...\n");
   UniToEntClass2L.Clear();