Changeset 85222 in vbox for trunk/src/VBox/Main/xml/ovfreader.cpp

Timestamp:

Jul 11, 2020 4:16:39 PM (4 years ago)

Author:

vboxsync

Message:

Main/ovfreader: Clang 11 complains about a bunch of unused members, so I've #if'ed them out. Also a signedness issue with line numbers. Cleaned up some modernistic/random continuation indentation. bugref:9790

File:

• trunk/src/VBox/Main/xml/ovfreader.cpp (modified) (16 diffs)

trunk/src/VBox/Main/xml/ovfreader.cpp

@@ -447 +447 @@
                         continue;
                     vsys.vecHardwareItems.push_back(pItem);
-                    pItem->ulLineNumber = pelmItem->getLineNumber();
+                    pItem->m_iLineNumber = pelmItem->getLineNumber();
                     pItem->fillItem(pelmItem);
 
@@ -469 +469 @@
                         else
 #if 1
-                            LogRel(("OVFREADER: Warning reading '%s'! Duplicate ulInstanceID %u on line %u, previous at %u!\n",
-                                    m_strPath.c_str(), pItem->ulInstanceID, pItem->ulLineNumber, itDup->second->ulLineNumber));
+                            LogRel(("OVFREADER: Warning reading '%s'! Duplicate ulInstanceID %u on line %d, previous at %d!\n",
+                                    m_strPath.c_str(), pItem->ulInstanceID, pItem->m_iLineNumber, itDup->second->m_iLineNumber));
 #else
-                            throw OVFLogicError(N_("Error reading '%s': Duplicate ulInstanceID %u on line %u, previous at %u"),
+                            throw OVFLogicError(N_("Error reading '%s': Duplicate ulInstanceID %u on line %d, previous at %d"),
                                                 m_strPath.c_str(), pItem->ulInstanceID,
-                                                pItem->ulLineNumber, itDup->second->ulLineNumber);
+                                                pItem->m_iLineNumber, itDup->second->m_iLineNumber);
 #endif
                     }
@@ -507 +507 @@
                                                 i.ullVirtualQuantity,
                                                 UINT16_MAX,
-                                                i.ulLineNumber);
+                                                i.m_iLineNumber);
                         break;
 
@@ -520 +520 @@
                                                 m_strPath.c_str(),
                                                 i.strAllocationUnits.c_str(),
-                                                i.ulLineNumber);
+                                                i.m_iLineNumber);
                         break;
 
@@ -675 +675 @@
                                                 m_strPath.c_str(),
                                                 ResourceType_OtherStorageDevice,
-                                                i.ulLineNumber, i.strResourceSubType.c_str() );
+                                                i.m_iLineNumber, i.strResourceSubType.c_str() );
                         break;
                     }
@@ -712 +712 @@
                                                 m_strPath.c_str(),
                                                 i.resourceType,
-                                                i.ulLineNumber);
+                                                i.m_iLineNumber);
                         }
                     }
@@ -757 +757 @@
                                                 i.ulInstanceID,
                                                 i.ulParent,
-                                                i.ulLineNumber);
+                                                i.m_iLineNumber);
 
                         VirtualDisk vd;
@@ -778 +778 @@
                                               i.ulInstanceID,
                                               i.strHostResource.c_str(),
-                                              i.ulLineNumber);
+                                              i.m_iLineNumber);
 
                         vsys.mapVirtualDisks[vd.strDiskId] = vd;
@@ -891 +891 @@
 //          throw OVFLogicError(N_("Unknown element \"%s\" under Item element, line %d"),
 //                              pcszItemChildName,
-//                              ulLineNumber);
+//                              m_iLineNumber);
     }
 }
@@ -900 +900 @@
     if (resourceType == 0)
         throw OVFLogicError(N_("Empty element ResourceType under %s element, line %d. see DMTF Schema Documentation %s"),
-                            name.c_str(), ulLineNumber, DTMF_SPECS_URI);
+                            name.c_str(), m_iLineNumber, DTMF_SPECS_URI);
 
     /* Don't be too uptight about the ulInstanceID value.  There are OVAs out
@@ -913 +913 @@
             || resourceType == ResourceType_IBHCA )  //??
             throw OVFLogicError(N_("Element InstanceID is absent under %s element, line %d. see DMTF Schema Documentation %s"),
-                                name.c_str(), ulLineNumber, DTMF_SPECS_URI);
+                                name.c_str(), m_iLineNumber, DTMF_SPECS_URI);
         else
             LogRel(("OVFREADER: Warning: Ignoring missing or invalid ulInstanceID under element %s, line %u\n",
-                    name.c_str(), ulLineNumber));
+                    name.c_str(), m_iLineNumber));
     }
 }
@@ -995 +995 @@
     {
         //throw OVFLogicError(N_("Access type is unknown under %s element, line %d"),
-        //        name.c_str(), ulLineNumber);
+        //                    name.c_str(), m_iLineNumber);
     }
 
@@ -1002 +1002 @@
         throw OVFLogicError(N_("Element HostResourceBlockSize is absent under %s element, line %d. "
                                "see DMTF Schema Documentation %s"),
-                name.c_str(), ulLineNumber, DTMF_SPECS_URI);
+                            name.c_str(), m_iLineNumber, DTMF_SPECS_URI);
     }
 
@@ -1009 +1009 @@
         throw OVFLogicError(N_("Element VirtualResourceBlockSize is absent under %s element, line %d. "
                                "see DMTF Schema Documentation %s"),
-                name.c_str(), ulLineNumber, DTMF_SPECS_URI);
+                            name.c_str(), m_iLineNumber, DTMF_SPECS_URI);
     }
 
@@ -1016 +1016 @@
         throw OVFLogicError(N_("Element VirtualQuantityUnits is absent under %s element, line %d. "
                                "see DMTF Schema Documentation %s"),
-                name.c_str(), ulLineNumber, DTMF_SPECS_URI);
+                            name.c_str(), m_iLineNumber, DTMF_SPECS_URI);
     }
 
@@ -1028 +1028 @@
                                "It's needed to change on \"byte\". "
                                "see DMTF Schema Documentation %s"),
-                                name.c_str(), ulLineNumber, DTMF_SPECS_URI);
+                            name.c_str(), m_iLineNumber, DTMF_SPECS_URI);
     }
 }