Changeset 32717 in vbox for trunk/src/libs/xpcom18a4/xpcom/reflect/xptinfo

Timestamp:

Sep 23, 2010 12:52:36 PM (14 years ago)

Author:

vboxsync

Message:

XPCOM: stderr usage fixes for debug builds

File:

• trunk/src/libs/xpcom18a4/xpcom/reflect/xptinfo/src/xptiManifest.cpp (modified) (36 diffs)

trunk/src/libs/xpcom18a4/xpcom/reflect/xptinfo/src/xptiManifest.cpp

@@ -59 +59 @@
 /***************************************************************************/
 
-static PRBool 
+static PRBool
 GetCurrentAppDirString(xptiInterfaceInfoManager* aMgr, nsACString &aStr)
 {
@@ -69 +69 @@
 }
 
-static PRBool 
-CurrentAppDirMatchesPersistentDescriptor(xptiInterfaceInfoManager* aMgr, 
+static PRBool
+CurrentAppDirMatchesPersistentDescriptor(xptiInterfaceInfoManager* aMgr,
                                          const char *inStr)
 {
@@ -84 +84 @@
     if(NS_FAILED(rv))
         return PR_FALSE;
-    
+
     PRBool matches;
     rv = appDir->Equals(descDir, &matches);
@@ -108 +108 @@
                                  iidStr,
                                  (int) typelib.GetFileIndex(),
-                                 (int) (typelib.IsZip() ? 
+                                 (int) (typelib.IsZip() ?
                                  typelib.GetZipItemIndex() : -1),
                                  (int) entry->GetScriptableFlag());
@@ -129 +129 @@
     PRIntn interfaceCount = 0;
     nsCAutoString appDirString;
-    
+
     nsCOMPtr<nsILocalFile> tempFile;
     if(!aMgr->GetCloneOfManifestLocation(getter_AddRefs(tempFile)) || !tempFile)
@@ -160 +160 @@
         goto out;
 
-    if(!PR_fprintf(fd, "%d,%s,%d,%d\n", 
+    if(!PR_fprintf(fd, "%d,%s,%d,%d\n",
                        0, g_TOKEN_Version, g_VERSION_MAJOR, g_VERSION_MINOR))
         goto out;
@@ -168 +168 @@
         goto out;
 
-    if(!PR_fprintf(fd, "%d,%s,%s\n", 
+    if(!PR_fprintf(fd, "%d,%s,%s\n",
                        1, g_TOKEN_AppDir, appDirString.get()))
         goto out;
@@ -174 +174 @@
     // write Directories list
 
-    if(!PR_fprintf(fd, "\n[%s,%d]\n", 
-                       g_TOKEN_Directories, 
+    if(!PR_fprintf(fd, "\n[%s,%d]\n",
+                       g_TOKEN_Directories,
                        (int) aWorkingSet->GetDirectoryCount()))
         goto out;
@@ -181 +181 @@
     for(i = 0; i < aWorkingSet->GetDirectoryCount(); i++)
     {
-        nsCOMPtr<nsILocalFile> dir;        
+        nsCOMPtr<nsILocalFile> dir;
         nsCAutoString str;
 
@@ -191 +191 @@
         if(str.IsEmpty())
             goto out;
-        
+
         if(!PR_fprintf(fd, "%d,%s\n", (int) i, str.get()))
             goto out;
@@ -198 +198 @@
     // write Files list
 
-    if(!PR_fprintf(fd, "\n[%s,%d]\n", 
-                       g_TOKEN_Files, 
+    if(!PR_fprintf(fd, "\n[%s,%d]\n",
+                       g_TOKEN_Files,
                        (int) aWorkingSet->GetFileCount()))
         goto out;
@@ -208 +208 @@
 
         LL_L2UI(size32, file.GetSize());
-    
+
         if(!PR_fprintf(fd, "%d,%s,%d,%u,%lld\n",
                            (int) i,
@@ -219 +219 @@
     // write ArchiveItems list
 
-    if(!PR_fprintf(fd, "\n[%s,%d]\n", 
-                       g_TOKEN_ArchiveItems, 
+    if(!PR_fprintf(fd, "\n[%s,%d]\n",
+                       g_TOKEN_ArchiveItems,
                        (int) aWorkingSet->GetZipItemCount()))
         goto out;
@@ -236 +236 @@
     interfaceCount = aWorkingSet->mNameTable->entryCount;
 
-    if(!PR_fprintf(fd, "\n[%s,%d]\n", 
-                       g_TOKEN_Interfaces, 
+    if(!PR_fprintf(fd, "\n[%s,%d]\n",
+                       g_TOKEN_Interfaces,
                        (int) interfaceCount))
         goto out;
 
     if(interfaceCount != (PRIntn)
-        PL_DHashTableEnumerate(aWorkingSet->mNameTable, 
+        PL_DHashTableEnumerate(aWorkingSet->mNameTable,
                                xpti_InterfaceWriter, fd))
         goto out;
@@ -256 +256 @@
     if(fd)
         PR_Close(fd);
-    
+
     if(succeeded)
     {
@@ -263 +263 @@
         if(!aMgr->GetCloneOfManifestLocation(getter_AddRefs(mainFile)) || !mainFile)
             return PR_FALSE;
-    
+
         PRBool exists;
         if(NS_FAILED(mainFile->Exists(&exists)))
@@ -270 +270 @@
         if(exists && NS_FAILED(mainFile->Remove(PR_FALSE)))
             return PR_FALSE;
-    
+
         nsCOMPtr<nsIFile> parent;
         mainFile->GetParent(getter_AddRefs(parent));
-            
+
         // MoveTo means rename.
         if(NS_FAILED(tempFile->MoveToNative(parent, originalLeafName)))
@@ -280 +280 @@
 
     return succeeded;
-}        
+}
 
 /***************************************************************************/
 /***************************************************************************/
 
-static char* 
+static char*
 ReadManifestIntoMemory(xptiInterfaceInfoManager* aMgr,
                        PRUint32* pLength)
@@ -302 +302 @@
     {
         static PRBool shown = PR_FALSE;
-        
+
         nsCAutoString path;
         if(!shown && NS_SUCCEEDED(aFile->GetNativePath(path)) && !path.IsEmpty())
         {
-            printf("Type Manifest File: %s\n", path.get());
-            shown = PR_TRUE;        
-        } 
-    }            
+            fprintf(stderr, "Type Manifest File: %s\n", path.get());
+            shown = PR_TRUE;
+        }
+    }
 #endif
 
@@ -319 +319 @@
         return nsnull;
 
-    // All exits from on here should be via 'goto out' 
+    // All exits from on here should be via 'goto out'
 
     if(NS_FAILED(aFile->OpenNSPRFileDesc(PR_RDONLY, 0444, &fd)) || !fd)
@@ -333 +333 @@
         PR_Close(fd);
 
-    if(!success)     
+    if(!success)
     {
         delete [] whole;
@@ -340 +340 @@
 
     *pLength = flen;
-    return whole;    
+    return whole;
 }
 
 static
-PRBool ReadSectionHeader(nsManifestLineReader& reader, 
+PRBool ReadSectionHeader(nsManifestLineReader& reader,
                          const char *token, int minCount, int* count)
 {
@@ -369 +369 @@
             if((*count = atoi(values[1])) < minCount)
                 break;
-            
+
             return PR_TRUE;
         }
@@ -406 +406 @@
     reader.Init(whole, flen);
 
-    // All exits from here on should be via 'goto out' 
-    
+    // All exits from here on should be via 'goto out'
+
     // Look for "Header" section
 
@@ -481 +481 @@
         PRUint32 searchPathCount;
         searchPath->Count(&searchPathCount);
-        
+
         if(dirCount != (int) searchPathCount)
             goto out;
@@ -492 +492 @@
         if(!reader.NextLine())
             goto out;
-       
+
         // index,directoryname
         if(2 != reader.ParseLine(values, lengths, 2))
@@ -503 +503 @@
         // directoryname
         if(!aWorkingSet->DirectoryAtMatchesPersistentDescriptor(i, values[1]))
-            goto out;    
+            goto out;
     }
 
@@ -514 +514 @@
     // Alloc room in the WorkingSet for the filearray.
 
-    if(!aWorkingSet->NewFileArray(fileCount))   
-        goto out;    
+    if(!aWorkingSet->NewFileArray(fileCount))
+        goto out;
 
     // Read the file records
@@ -551 +551 @@
         if(LL_IS_ZERO(date))
             goto out;
-        
+
         // Append a new file record to the array.
 
@@ -566 +566 @@
 
     if(zipItemCount)
-        if(!aWorkingSet->NewZipItemArray(zipItemCount))   
-            goto out;    
+        if(!aWorkingSet->NewZipItemArray(zipItemCount))
+            goto out;
 
     // Read the zipItem records
@@ -587 +587 @@
         if(!*values[1])
             goto out;
-        
+
         // Append a new zipItem record to the array.
 
@@ -641 +641 @@
         if(flags != 0 && flags != 1)
             goto out;
-        
+
         // Build an InterfaceInfo and hook it in.
 
@@ -648 +648 @@
         else
             typelibRecord.Init(fileIndex, zipItemIndex);
-        
+
         entry = xptiInterfaceEntry::NewEntry(values[1], lengths[1],
-                                             iid, typelibRecord, 
+                                             iid, typelibRecord,
                                              aWorkingSet);
         if(!entry)
-            goto out;    
-        
+            goto out;
+
         entry->SetScriptableFlag(flags==1);
 
@@ -660 +660 @@
 
         hashEntry = (xptiHashEntry*)
-            PL_DHashTableOperate(aWorkingSet->mNameTable, 
+            PL_DHashTableOperate(aWorkingSet->mNameTable,
                                  entry->GetTheName(), PL_DHASH_ADD);
         if(hashEntry)
             hashEntry->value = entry;
-    
+
         // Add our entry to the name hashtable.
 
         hashEntry = (xptiHashEntry*)
-            PL_DHashTableOperate(aWorkingSet->mIIDTable, 
+            PL_DHashTableOperate(aWorkingSet->mIIDTable,
                                  entry->GetTheIID(), PL_DHASH_ADD);
         if(hashEntry)
@@ -690 +690 @@
     }
     return succeeded;
-}        
-
-// static 
+}
+
+// static
 PRBool xptiManifest::Delete(xptiInterfaceInfoManager* aMgr)
 {
@@ -705 +705 @@
     if(exists && NS_FAILED(aFile->Remove(PR_FALSE)))
         return PR_FALSE;
-    
+
     return PR_TRUE;
 }