From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; Convert the type of loop iterators named 'i', 'j', k', 'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or 'unsigned int', also santizing 'ii', 'jj', 'kk' to use the normal 'i', 'j', 'k' naming Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/conf/capabilities.c | 32 ++-- src/conf/cpu_conf.c | 18 +-- src/conf/domain_audit.c | 4 +- src/conf/domain_conf.c | 266 ++++++++++++++++--------------- src/conf/domain_conf.h | 12 +- src/conf/domain_event.c | 24 +-- src/conf/domain_nwfilter.c | 2 +- src/conf/interface_conf.c | 73 +++++---- src/conf/netdev_vlan_conf.c | 19 +-- src/conf/network_conf.c | 319 +++++++++++++++++++------------------ src/conf/node_device_conf.c | 27 ++-- src/conf/nwfilter_conf.c | 43 ++--- src/conf/nwfilter_params.c | 26 +-- src/conf/snapshot_conf.c | 21 +-- src/conf/storage_conf.c | 42 ++--- src/conf/storage_encryption_conf.c | 3 +- 16 files changed, 482 insertions(+), 449 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 5aeb2ab..bb5fe4e 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -123,7 +123,7 @@ virCapabilitiesFreeGuestMachine(virCapsGuestMachinePtr machine) static void virCapabilitiesFreeGuestDomain(virCapsGuestDomainPtr dom) { - int i; + size_t i; if (dom == NULL) return; @@ -149,7 +149,7 @@ virCapabilitiesFreeGuestFeature(virCapsGuestFeaturePtr feature) static void virCapabilitiesFreeGuest(virCapsGuestPtr guest) { - int i; + size_t i; if (guest == NULL) return; @@ -175,7 +175,7 @@ virCapabilitiesFreeGuest(virCapsGuestPtr guest) void virCapabilitiesFreeNUMAInfo(virCapsPtr caps) { - int i; + size_t i; for (i = 0; i < caps->host.nnumaCell; i++) virCapabilitiesFreeHostNUMACell(caps->host.numaCell[i]); @@ -187,7 +187,7 @@ static void virCapabilitiesDispose(void *object) { virCapsPtr caps = object; - int i; + size_t i; for (i = 0; i < caps->nguests; i++) virCapabilitiesFreeGuest(caps->guests[i]); @@ -327,7 +327,7 @@ virCapsGuestMachinePtr * virCapabilitiesAllocMachines(const char *const *names, int nnames) { virCapsGuestMachinePtr *machines; - int i; + size_t i; if (VIR_ALLOC_N(machines, nnames) < 0) return NULL; @@ -353,7 +353,7 @@ void virCapabilitiesFreeMachines(virCapsGuestMachinePtr *machines, int nmachines) { - int i; + size_t i; if (!machines) return; for (i = 0; i < nmachines && machines[i]; i++) { @@ -518,7 +518,7 @@ extern int virCapabilitiesSupportsGuestArch(virCapsPtr caps, virArch arch) { - int i; + size_t i; for (i = 0; i < caps->nguests; i++) { if (caps->guests[i]->arch.id == arch) return 1; @@ -539,7 +539,7 @@ extern int virCapabilitiesSupportsGuestOSType(virCapsPtr caps, const char *ostype) { - int i; + size_t i; for (i = 0; i < caps->nguests; i++) { if (STREQ(caps->guests[i]->ostype, ostype)) return 1; @@ -562,7 +562,7 @@ virCapabilitiesSupportsGuestOSTypeArch(virCapsPtr caps, const char *ostype, virArch arch) { - int i; + size_t i; for (i = 0; i < caps->nguests; i++) { if (STREQ(caps->guests[i]->ostype, ostype) && caps->guests[i]->arch.id == arch) @@ -585,7 +585,7 @@ virCapabilitiesDefaultGuestArch(virCapsPtr caps, const char *ostype, const char *domain) { - int i, j; + size_t i, j; /* First try to find one matching host arch */ for (i = 0; i < caps->nguests; i++) { @@ -628,11 +628,11 @@ virCapabilitiesDefaultGuestMachine(virCapsPtr caps, virArch arch, const char *domain) { - int i; + size_t i; for (i = 0; i < caps->nguests; i++) { virCapsGuestPtr guest = caps->guests[i]; - int j; + size_t j; if (!STREQ(guest->ostype, ostype) || guest->arch.id != arch) @@ -674,7 +674,7 @@ virCapabilitiesDefaultGuestEmulator(virCapsPtr caps, virArch arch, const char *domain) { - int i, j; + size_t i, j; for (i = 0; i < caps->nguests; i++) { char *emulator; if (STREQ(caps->guests[i]->ostype, ostype) && @@ -697,8 +697,8 @@ virCapabilitiesFormatNUMATopology(virBufferPtr xml, size_t ncells, virCapsHostNUMACellPtr *cells) { - int i; - int j; + size_t i; + size_t j; char *siblings; virBufferAddLit(xml, " <topology>\n"); @@ -754,7 +754,7 @@ char * virCapabilitiesFormatXML(virCapsPtr caps) { virBuffer xml = VIR_BUFFER_INITIALIZER; - int i, j, k; + size_t i, j, k; char host_uuid[VIR_UUID_STRING_BUFLEN]; virBufferAddLit(&xml, "<capabilities>\n\n"); diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 960d8a6..30a8ba5 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -60,7 +60,7 @@ VIR_ENUM_IMPL(virCPUFeaturePolicy, VIR_CPU_FEATURE_LAST, void ATTRIBUTE_NONNULL(1) virCPUDefFreeModel(virCPUDefPtr def) { - unsigned int i; + size_t i; VIR_FREE(def->model); VIR_FREE(def->vendor); @@ -74,7 +74,7 @@ virCPUDefFreeModel(virCPUDefPtr def) void virCPUDefFree(virCPUDefPtr def) { - unsigned int i; + size_t i; if (!def) return; @@ -97,7 +97,7 @@ virCPUDefCopyModel(virCPUDefPtr dst, const virCPUDefPtr src, bool resetPolicy) { - unsigned int i; + size_t i; if (VIR_STRDUP(dst->model, src->model) < 0 || VIR_STRDUP(dst->vendor, src->vendor) < 0 || @@ -133,7 +133,7 @@ virCPUDefPtr virCPUDefCopy(const virCPUDefPtr cpu) { virCPUDefPtr copy; - unsigned int i; + size_t i; if (!cpu) return NULL; @@ -190,7 +190,7 @@ virCPUDefParseXML(const xmlNodePtr node, virCPUDefPtr def; xmlNodePtr *nodes = NULL; int n; - unsigned int i; + size_t i; char *cpuMode; char *fallback = NULL; char *vendor_id = NULL; @@ -390,7 +390,7 @@ virCPUDefParseXML(const xmlNodePtr node, for (i = 0; i < n; i++) { char *name; int policy; /* enum virDomainCPUFeaturePolicy */ - unsigned int j; + size_t j; if (def->type == VIR_CPU_TYPE_GUEST) { char *strpolicy; @@ -576,7 +576,7 @@ virCPUDefFormatBuf(virBufferPtr buf, virCPUDefPtr def, unsigned int flags) { - unsigned int i; + size_t i; bool formatModel; bool formatFallback; @@ -677,7 +677,7 @@ virCPUDefAddFeature(virCPUDefPtr def, const char *name, int policy) { - int i; + size_t i; for (i = 0; i < def->nfeatures; i++) { if (STREQ(name, def->features[i].name)) { @@ -712,7 +712,7 @@ virCPUDefIsEqual(virCPUDefPtr src, virCPUDefPtr dst) { bool identical = false; - int i; + size_t i; if (!src && !dst) return true; diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 97e71f7..949317a 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -793,7 +793,7 @@ virDomainAuditLifecycle(virDomainObjPtr vm, const char *op, void virDomainAuditStart(virDomainObjPtr vm, const char *reason, bool success) { - int i; + size_t i; for (i = 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk = vm->def->disks[i]; @@ -874,7 +874,7 @@ virDomainAuditSecurityLabel(virDomainObjPtr vm, bool success) char uuidstr[VIR_UUID_STRING_BUFLEN]; char *vmname; const char *virt; - int i; + size_t i; virUUIDFormat(vm->def->uuid, uuidstr); if (!(vmname = virAuditEncode("vm", vm->def->name))) { diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 402e6e9..b9713e6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -869,7 +869,7 @@ void virBlkioDeviceWeightArrayClear(virBlkioDeviceWeightPtr deviceWeights, int ndevices) { - int i; + size_t i; for (i = 0; i < ndevices; i++) VIR_FREE(deviceWeights[i].path); @@ -1101,7 +1101,7 @@ virSecurityDeviceLabelDefFree(virSecurityDeviceLabelDefPtr def) void virDomainGraphicsDefFree(virDomainGraphicsDefPtr def) { - int ii; + size_t i; if (!def) return; @@ -1131,8 +1131,8 @@ void virDomainGraphicsDefFree(virDomainGraphicsDefPtr def) break; } - for (ii = 0; ii < def->nListens; ii++) - virDomainGraphicsListenDefClear(&def->listens[ii]); + for (i = 0; i < def->nListens; i++) + virDomainGraphicsListenDefClear(&def->listens[i]); VIR_FREE(def->listens); VIR_FREE(def); @@ -1173,7 +1173,7 @@ virDomainDiskSourcePoolDefFree(virDomainDiskSourcePoolDefPtr def) void virDomainDiskDefFree(virDomainDiskDefPtr def) { - unsigned int i; + size_t i; if (!def) return; @@ -1550,7 +1550,7 @@ void virDomainSoundDefFree(virDomainSoundDefPtr def) virDomainDeviceInfoClear(&def->info); - int i; + size_t i; for (i = 0; i < def->ncodecs; i++) virDomainSoundCodecDefFree(def->codecs[i]); VIR_FREE(def->codecs); @@ -1781,7 +1781,7 @@ virDomainClockDefClear(virDomainClockDefPtr def) if (def->offset == VIR_DOMAIN_CLOCK_OFFSET_TIMEZONE) VIR_FREE(def->data.timezone); - int i; + size_t i; for (i = 0; i < def->ntimers; i++) VIR_FREE(def->timers[i]); VIR_FREE(def->timers); @@ -1790,7 +1790,7 @@ virDomainClockDefClear(virDomainClockDefPtr def) virDomainVcpuPinDefPtr * virDomainVcpuPinDefCopy(virDomainVcpuPinDefPtr *src, int nvcpupin) { - int i = 0; + size_t i; virDomainVcpuPinDefPtr *ret = NULL; if (VIR_ALLOC_N(ret, nvcpupin) < 0) { @@ -1809,7 +1809,7 @@ virDomainVcpuPinDefCopy(virDomainVcpuPinDefPtr *src, int nvcpupin) no_memory: if (ret) { - for (; i >= 0; --i) { + for (i = 0; i < nvcpupin; i++) { if (ret[i]) { virBitmapFree(ret[i]->cpumask); VIR_FREE(ret[i]); @@ -1835,7 +1835,7 @@ void virDomainVcpuPinDefArrayFree(virDomainVcpuPinDefPtr *def, int nvcpupin) { - int i; + size_t i; if (!def || !nvcpupin) return; @@ -1861,7 +1861,7 @@ virDomainResourceDefFree(virDomainResourceDefPtr resource) void virDomainDefFree(virDomainDefPtr def) { - unsigned int i; + size_t i; if (!def) return; @@ -2482,7 +2482,7 @@ virDomainDeviceInfoIterateInternal(virDomainDefPtr def, bool all, void *opaque) { - int i; + size_t i; virDomainDeviceDef device; device.type = VIR_DOMAIN_DEVICE_DISK; @@ -2649,7 +2649,7 @@ virDomainDefRejectDuplicateControllers(virDomainDefPtr def) size_t nbitmaps = 0; int ret = -1; bool b; - int i; + size_t i; memset(max_idx, -1, sizeof(max_idx)); @@ -2701,7 +2701,7 @@ static int virDomainDefPostParseInternal(virDomainDefPtr def, virCapsPtr caps ATTRIBUTE_UNUSED) { - int i; + size_t i; /* verify init path for container based domains */ if (STREQ(def->os.type, "exe") && !def->os.init) { @@ -3819,7 +3819,7 @@ virDomainDriveAddressIsUsedByDisk(virDomainDefPtr def, unsigned int unit) { virDomainDiskDefPtr disk; - int i; + size_t i; for (i = 0; i < def->ndisks; i++) { disk = def->disks[i]; @@ -3848,7 +3848,7 @@ virDomainDriveAddressIsUsedByHostdev(virDomainDefPtr def, unsigned int unit) { virDomainHostdevDefPtr hostdev; - int i; + size_t i; for (i = 0; i < def->nhostdevs; i++) { hostdev = def->hostdevs[i]; @@ -3892,7 +3892,7 @@ virDomainControllerSCSINextUnit(virDomainDefPtr def, unsigned int max_unit, unsigned int controller) { - int i; + size_t i; for (i = 0; i < max_unit; i++) { if (!virDomainSCSIDriveAddressIsUsed(def, controller, i)) @@ -3912,7 +3912,7 @@ virDomainHostdevAssignAddress(virDomainXMLOptionPtr xmlopt, { int next_unit = 0; unsigned controller = 0; - int i; + size_t i; int ret; if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) @@ -4144,7 +4144,7 @@ virDomainDeviceFindControllerModel(virDomainDefPtr def, int controllerType) { int model = -1; - int i; + size_t i; for (i = 0; i < def->ncontrollers; i++) { if (def->controllers[i]->type == controllerType && @@ -4160,7 +4160,7 @@ virDomainDiskFindByBusAndDst(virDomainDefPtr def, int bus, char *dst) { - int i; + size_t i; if (!dst) return NULL; @@ -4366,7 +4366,8 @@ virSecurityLabelDefsParseXML(virDomainDefPtr def, virCapsPtr caps, unsigned int flags) { - int i = 0, n; + size_t i = 0; + int n; xmlNodePtr *list = NULL, saved_node; virCapsHostPtr host = &caps->host; @@ -4457,7 +4458,8 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLabelDefPtr **seclabels_rtn, { virSecurityDeviceLabelDefPtr *seclabels; size_t nseclabels = 0; - int n, i, j; + int n; + size_t i, j; xmlNodePtr *list = NULL; virSecurityLabelDefPtr vmDef = NULL; char *model, *relabel, *label; @@ -5362,7 +5364,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, goto error; } - int i; + size_t i; if ((i = virDomainIoEventFdTypeFromString(ioeventfd)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk ioeventfd mode '%s'"), @@ -5425,7 +5427,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, } if (startupPolicy) { - int i; + size_t i; if ((i = virDomainStartupPolicyTypeFromString(startupPolicy)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -6518,7 +6520,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, def->driver.virtio.txmode = m; } if (ioeventfd) { - int i; + size_t i; if ((i = virDomainIoEventFdTypeFromString(ioeventfd)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown interface ioeventfd mode '%s'"), @@ -7145,7 +7147,7 @@ virDomainSmartcardDefParseXML(xmlNodePtr node, char *mode = NULL; char *type = NULL; virDomainSmartcardDefPtr def; - int i; + size_t i; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -7827,16 +7829,16 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, goto error; if (nListens > 0) { - int ii; + size_t i; if (VIR_ALLOC_N(def->listens, nListens) < 0) { virReportOOMError(); goto error; } - for (ii = 0; ii < nListens; ii++) { - int ret = virDomainGraphicsListenDefParseXML(&def->listens[ii], - listenNodes[ii], + for (i = 0; i < nListens; i++) { + int ret = virDomainGraphicsListenDefParseXML(&def->listens[i], + listenNodes[i], flags); if (ret < 0) goto error; @@ -7866,12 +7868,12 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, * graphics. */ bool matched = false; const char *found = NULL; - int ii; + size_t i; - for (ii = 0; ii < nListens; ii++) { - if (virDomainGraphicsListenGetType(def, ii) + for (i = 0; i < nListens; i++) { + if (virDomainGraphicsListenGetType(def, i) == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS) { - found = virDomainGraphicsListenGetAddress(def, ii); + found = virDomainGraphicsListenGetAddress(def, i); if (STREQ_NULLABLE(found, listenAddr)) { matched = true; } @@ -8377,7 +8379,7 @@ virDomainSoundDefParseXML(const xmlNodePtr node, goto error; if (ncodecs > 0) { - int ii; + size_t i; if (VIR_ALLOC_N(def->codecs, ncodecs) < 0) { virReportOOMError(); @@ -8385,8 +8387,8 @@ virDomainSoundDefParseXML(const xmlNodePtr node, goto error; } - for (ii = 0; ii < ncodecs; ii++) { - virDomainSoundCodecDefPtr codec = virDomainSoundCodecDefParseXML(codecNodes[ii]); + for (i = 0; i < ncodecs; i++) { + virDomainSoundCodecDefPtr codec = virDomainSoundCodecDefParseXML(codecNodes[i]); if (codec == NULL) goto error; @@ -9689,7 +9691,7 @@ virDomainHostdevFind(virDomainDefPtr def, virDomainHostdevDefPtr *found) { virDomainHostdevDefPtr local_found; - int i; + size_t i; if (!found) found = &local_found; @@ -9709,7 +9711,7 @@ virDomainDiskIndexByName(virDomainDefPtr def, const char *name, bool allow_ambiguous) { virDomainDiskDefPtr vdisk; - int i; + size_t i; int candidate = -1; /* We prefer the <target dev='name'/> name (it's shorter, required @@ -9739,9 +9741,9 @@ virDomainDiskIndexByName(virDomainDefPtr def, const char *name, const char * virDomainDiskPathByName(virDomainDefPtr def, const char *name) { - int i = virDomainDiskIndexByName(def, name, true); + int idx = virDomainDiskIndexByName(def, name, true); - return i < 0 ? NULL : def->disks[i]->src; + return idx < 0 ? NULL : def->disks[idx]->src; } int virDomainDiskInsert(virDomainDefPtr def, @@ -9759,7 +9761,7 @@ int virDomainDiskInsert(virDomainDefPtr def, void virDomainDiskInsertPreAlloced(virDomainDefPtr def, virDomainDiskDefPtr disk) { - int i; + int idx; /* Tenatively plan to insert disk at the end. */ int insertAt = -1; @@ -9768,19 +9770,19 @@ void virDomainDiskInsertPreAlloced(virDomainDefPtr def, * index greater than the new one, insert at * that position */ - for (i = (def->ndisks - 1); i >= 0; i--) { + for (idx = (def->ndisks - 1); idx >= 0; idx--) { /* If bus matches and current disk is after * new disk, then new disk should go here */ - if (def->disks[i]->bus == disk->bus && - (virDiskNameToIndex(def->disks[i]->dst) > + if (def->disks[idx]->bus == disk->bus && + (virDiskNameToIndex(def->disks[idx]->dst) > virDiskNameToIndex(disk->dst))) { - insertAt = i; - } else if (def->disks[i]->bus == disk->bus && + insertAt = idx; + } else if (def->disks[idx]->bus == disk->bus && insertAt == -1) { /* Last disk with match bus is before the * new disk, then put new disk just after */ - insertAt = i + 1; + insertAt = idx + 1; } } @@ -9822,10 +9824,10 @@ virDomainDiskRemove(virDomainDefPtr def, size_t i) virDomainDiskDefPtr virDomainDiskRemoveByName(virDomainDefPtr def, const char *name) { - int i = virDomainDiskIndexByName(def, name, false); - if (i < 0) + int idx = virDomainDiskIndexByName(def, name, false); + if (idx < 0) return NULL; - return virDomainDiskRemove(def, i); + return virDomainDiskRemove(def, idx); } /* Return true if VM has at least one disk involved in a current block @@ -9833,7 +9835,7 @@ virDomainDiskRemoveByName(virDomainDefPtr def, const char *name) bool virDomainHasDiskMirror(virDomainObjPtr vm) { - int i; + size_t i; for (i = 0; i < vm->def->ndisks; i++) if (vm->def->disks[i]->mirror) return true; @@ -9863,12 +9865,13 @@ int virDomainNetInsert(virDomainDefPtr def, virDomainNetDefPtr net) int virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net) { - int ii, matchidx = -1; + size_t i; + int matchidx = -1; bool PCIAddrSpecified = virDomainDeviceAddressIsValid(&net->info, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI); - for (ii = 0; ii < def->nnets; ii++) { - if (virMacAddrCmp(&def->nets[ii]->mac, &net->mac)) + for (i = 0; i < def->nnets; i++) { + if (virMacAddrCmp(&def->nets[i]->mac, &net->mac)) continue; if ((matchidx >= 0) && !PCIAddrSpecified) { @@ -9882,17 +9885,17 @@ virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net) break; } if (PCIAddrSpecified) { - if (virDevicePCIAddressEqual(&def->nets[ii]->info.addr.pci, + if (virDevicePCIAddressEqual(&def->nets[i]->info.addr.pci, &net->info.addr.pci)) { /* exit early if the pci address was specified and * it matches, as this guarantees no duplicates. */ - matchidx = ii; + matchidx = i; break; } } else { /* no PCI address given, so there may be multiple matches */ - matchidx = ii; + matchidx = i; } } return matchidx; @@ -9948,7 +9951,7 @@ int virDomainControllerInsert(virDomainDefPtr def, void virDomainControllerInsertPreAlloced(virDomainDefPtr def, virDomainControllerDefPtr controller) { - int i; + int idx; /* Tenatively plan to insert controller at the end. */ int insertAt = -1; @@ -9957,18 +9960,18 @@ void virDomainControllerInsertPreAlloced(virDomainDefPtr def, * index greater than the new one, insert at * that position */ - for (i = (def->ncontrollers - 1); i >= 0; i--) { + for (idx = (def->ncontrollers - 1); idx >= 0; idx--) { /* If bus matches and current controller is after * new controller, then new controller should go here */ - if (def->controllers[i]->type == controller->type && - def->controllers[i]->idx > controller->idx) { - insertAt = i; - } else if (def->controllers[i]->type == controller->type && + if (def->controllers[idx]->type == controller->type && + def->controllers[idx]->idx > controller->idx) { + insertAt = idx; + } else if (def->controllers[idx]->type == controller->type && insertAt == -1) { /* Last controller with match bus is before the * new controller, then put new controller just after */ - insertAt = i + 1; + insertAt = idx + 1; } } @@ -9989,7 +9992,7 @@ int virDomainControllerFind(virDomainDefPtr def, int type, int idx) { - int i; + size_t i; for (i = 0; i < def->ncontrollers; i++) { if ((def->controllers[i]->type == type) && @@ -10027,7 +10030,7 @@ int virDomainLeaseIndex(virDomainDefPtr def, virDomainLeaseDefPtr lease) { virDomainLeaseDefPtr vlease; - int i; + size_t i; for (i = 0; i < def->nleases; i++) { vlease = def->leases[i]; @@ -10099,10 +10102,10 @@ virDomainLeaseDefPtr virDomainLeaseRemove(virDomainDefPtr def, virDomainLeaseDefPtr lease) { - int i = virDomainLeaseIndex(def, lease); - if (i < 0) + int idx = virDomainLeaseIndex(def, lease); + if (idx < 0) return NULL; - return virDomainLeaseRemoveAt(def, i); + return virDomainLeaseRemoveAt(def, idx); } @@ -10143,7 +10146,8 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, virDomainDefPtr def) { xmlNodePtr *nodes = NULL; - int i, n; + size_t i; + int n; char *tmp = NULL; int ret = -1; unsigned long deviceBoot, serialPorts; @@ -10393,7 +10397,7 @@ virDomainVcpuPinDefPtr virDomainLookupVcpuPin(virDomainDefPtr def, int vcpuid) { - int i; + size_t i; if (!def->cputune.vcpupin) return NULL; @@ -10412,7 +10416,7 @@ virDomainDefMaybeAddController(virDomainDefPtr def, int idx, int model) { - int i; + size_t i; virDomainControllerDefPtr cont; for (i = 0; i < def->ncontrollers; i++) { @@ -10509,7 +10513,7 @@ static int virDomainDefMaybeAddHostdevSCSIcontroller(virDomainDefPtr def) { /* Look for any hostdev scsi dev */ - int i; + size_t i; int maxController = -1; virDomainHostdevDefPtr hostdev; @@ -10541,7 +10545,8 @@ virDomainDefParseXML(xmlDocPtr xml, { xmlNodePtr *nodes = NULL, node = NULL; char *tmp = NULL; - int i, n; + size_t i; + int n; long id = -1; virDomainDefPtr def; unsigned long count; @@ -10719,7 +10724,7 @@ virDomainDefParseXML(xmlDocPtr xml, goto no_memory; for (i = 0; i < n; i++) { - int j; + size_t j; if (virDomainBlkioDeviceWeightParseXML(nodes[i], &def->blkio.devices[i]) < 0) goto error; @@ -11674,7 +11679,7 @@ virDomainDefParseXML(xmlDocPtr xml, if (chr->target.port == -1) { int maxport = -1; - int j; + size_t j; for (j = 0; j < i; j++) { if (def->parallels[j]->target.port > maxport) maxport = def->parallels[j]->target.port; @@ -11702,7 +11707,7 @@ virDomainDefParseXML(xmlDocPtr xml, if (chr->target.port == -1) { int maxport = -1; - int j; + size_t j; for (j = 0; j < i; j++) { if (def->serials[j]->target.port > maxport) maxport = def->serials[j]->target.port; @@ -11760,7 +11765,7 @@ virDomainDefParseXML(xmlDocPtr xml, if (chr->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL && chr->info.addr.vioserial.port == 0) { int maxport = 0; - int j; + size_t j; for (j = 0; j < i; j++) { virDomainChrDefPtr thischr = def->channels[j]; if (thischr->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL && @@ -11880,8 +11885,8 @@ virDomainDefParseXML(xmlDocPtr xml, if (n && VIR_ALLOC_N(def->videos, n) < 0) goto no_memory; for (i = 0; i < n; i++) { - size_t ii = def->nvideos; - virDomainVideoDefPtr video = virDomainVideoDefParseXML(nodes[i], + size_t j = def->nvideos; + virDomainVideoDefPtr video = virDomainVideoDefParseXML(nodes[j], def, flags); if (!video) @@ -11895,11 +11900,11 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; } - ii = 0; + j = 0; primaryVideo = true; } if (VIR_INSERT_ELEMENT_INPLACE(def->videos, - ii, + j, def->nvideos, video) < 0) { virDomainVideoDefFree(video); @@ -12260,7 +12265,8 @@ virDomainObjParseXML(xmlDocPtr xml, xmlNodePtr oldnode; virDomainObjPtr obj; xmlNodePtr *nodes = NULL; - int i, n; + size_t i; + int n; int state; int reason = 0; @@ -13087,7 +13093,7 @@ static bool virDomainRedirFilterDefCheckABIStability(virDomainRedirFilterDefPtr src, virDomainRedirFilterDefPtr dst) { - int i; + size_t i; if (src->nusbdevs != dst->nusbdevs) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -13144,7 +13150,7 @@ bool virDomainDefCheckABIStability(virDomainDefPtr src, virDomainDefPtr dst) { - int i; + size_t i; if (src->virtType != dst->virtType) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -13489,7 +13495,7 @@ virDomainDefAddDiskControllersForType(virDomainDefPtr def, int controllerType, int diskBus) { - int i; + size_t i; int maxController = -1; for (i = 0; i < def->ndisks; i++) { @@ -13516,7 +13522,7 @@ static int virDomainDefMaybeAddVirtioSerialController(virDomainDefPtr def) { /* Look for any virtio serial or virtio console devs */ - int i; + size_t i; for (i = 0; i < def->nchannels; i++) { virDomainChrDefPtr channel = def->channels[i]; @@ -13555,7 +13561,7 @@ static int virDomainDefMaybeAddSmartcardController(virDomainDefPtr def) { /* Look for any smartcard devs */ - int i; + size_t i; for (i = 0; i < def->nsmartcards; i++) { virDomainSmartcardDefPtr smartcard = def->smartcards[i]; @@ -13565,7 +13571,7 @@ virDomainDefMaybeAddSmartcardController(virDomainDefPtr def) idx = smartcard->info.addr.ccid.controller; } else if (smartcard->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { - int j; + size_t j; int max = -1; for (j = 0; j < def->nsmartcards; j++) { @@ -13637,7 +13643,7 @@ virDomainVcpuPinIsDuplicate(virDomainVcpuPinDefPtr *def, int nvcpupin, int vcpu) { - int i; + size_t i; if (!def || !nvcpupin) return 0; @@ -13655,7 +13661,7 @@ virDomainVcpuPinFindByVcpu(virDomainVcpuPinDefPtr *def, int nvcpupin, int vcpu) { - int i; + size_t i; if (!def || !nvcpupin) return NULL; @@ -14008,7 +14014,7 @@ virDomainDiskSourceDefFormat(virBufferPtr buf, if (def->nhosts == 0) { virBufferAddLit(buf, "/>\n"); } else { - int i; + size_t i; virBufferAddLit(buf, ">\n"); for (i = 0; i < def->nhosts; i++) { @@ -14362,7 +14368,7 @@ int virDomainFSIndexByName(virDomainDefPtr def, const char *name) { virDomainFSDefPtr fs; - int i; + size_t i; for (i = 0; i < def->nfss; i++) { fs = def->fss[i]; @@ -15149,7 +15155,7 @@ virDomainSoundDefFormat(virBufferPtr buf, { const char *model = virDomainSoundModelTypeToString(def->model); bool children = false; - int i; + size_t i; if (!model) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -15585,7 +15591,7 @@ virDomainGraphicsDefFormat(virBufferPtr buf, const char *type = virDomainGraphicsTypeToString(def->type); const char *listenAddr = NULL; bool children = false; - int i; + size_t i; if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -15955,7 +15961,7 @@ virDomainHubDefFormat(virBufferPtr buf, static bool virDomainIsAllVcpupinInherited(virDomainDefPtr def) { - int i; + size_t i; if (!def->cpumask) { if (def->cputune.nvcpupin) @@ -16009,7 +16015,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, char uuidstr[VIR_UUID_STRING_BUFLEN]; const char *type = NULL; int n; - int i; + size_t i; bool blkio = false; virCheckFlags(DUMPXML_FLAGS | @@ -16384,7 +16390,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, const char *name = virDomainFeatureTypeToString(i); if (!name) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected feature %d"), i); + _("unexpected feature %zu"), i); goto error; } virBufferAsprintf(buf, " <%s", name); @@ -16687,7 +16693,7 @@ virDomainObjFormat(virDomainXMLOptionPtr xmlopt, virBuffer buf = VIR_BUFFER_INITIALIZER; int state; int reason; - int i; + size_t i; state = virDomainObjGetState(obj, &reason); virBufferAsprintf(&buf, "<domstatus state='%s' reason='%s' pid='%lld'>\n", @@ -16727,7 +16733,7 @@ error: static bool virDomainDefHasUSB(virDomainDefPtr def) { - int i; + size_t i; for (i = 0; i < def->ncontrollers; i++) { if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && @@ -17106,7 +17112,7 @@ virDiskNameToBusDeviceIndex(const virDomainDiskDefPtr disk, virDomainFSDefPtr virDomainGetRootFilesystem(virDomainDefPtr def) { - int i; + size_t i; for (i = 0; i < def->nfss; i++) { if (STREQ(def->fss[i]->dst, "/")) @@ -17243,7 +17249,7 @@ virDomainObjListGetInactiveNames(virDomainObjListPtr doms, { struct virDomainNameData data = { filter, conn, 0, 0, maxnames, names }; - int i; + size_t i; virObjectLock(doms); virHashForEach(doms->objs, virDomainObjListCopyInactiveNames, &data); virObjectUnlock(doms); @@ -17295,7 +17301,7 @@ virDomainChrDefForeach(virDomainDefPtr def, virDomainChrDefIterator iter, void *opaque) { - int i; + size_t i; int rc = 0; for (i = 0; i < def->nserials; i++) { @@ -17348,7 +17354,7 @@ virDomainSmartcardDefForeach(virDomainDefPtr def, virDomainSmartcardDefIterator iter, void *opaque) { - int i; + size_t i; int rc = 0; for (i = 0; i < def->nsmartcards; i++) { @@ -17673,28 +17679,28 @@ virDomainNetGetActualVlan(virDomainNetDefPtr iface) return 0; } -/* Return listens[ii] from the appropriate union for the graphics +/* Return listens[i] from the appropriate union for the graphics * type, or NULL if this is an unsuitable type, or the index is out of - * bounds. If force0 is TRUE, ii == 0, and there is no listen array, + * bounds. If force0 is TRUE, i == 0, and there is no listen array, * allocate one with a single item. */ static virDomainGraphicsListenDefPtr -virDomainGraphicsGetListen(virDomainGraphicsDefPtr def, size_t ii, bool force0) +virDomainGraphicsGetListen(virDomainGraphicsDefPtr def, size_t i, bool force0) { if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC || def->type == VIR_DOMAIN_GRAPHICS_TYPE_RDP || def->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { - if (!def->listens && (ii == 0) && force0) { + if (!def->listens && (i == 0) && force0) { if (VIR_ALLOC(def->listens) < 0) virReportOOMError(); else def->nListens = 1; } - if (!def->listens || (def->nListens <= ii)) + if (!def->listens || (def->nListens <= i)) return NULL; - return &def->listens[ii]; + return &def->listens[i]; } /* it's a type that has no listens array */ @@ -17716,10 +17722,10 @@ virDomainGraphicsGetListen(virDomainGraphicsDefPtr def, size_t ii, bool force0) * return 0 on success, -1 on failure. */ int -virDomainGraphicsListenGetType(virDomainGraphicsDefPtr def, size_t ii) +virDomainGraphicsListenGetType(virDomainGraphicsDefPtr def, size_t i) { virDomainGraphicsListenDefPtr listenInfo - = virDomainGraphicsGetListen(def, ii, false); + = virDomainGraphicsGetListen(def, i, false); if (!listenInfo) return VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE; @@ -17731,10 +17737,10 @@ virDomainGraphicsListenGetType(virDomainGraphicsDefPtr def, size_t ii) * *will not* free any existing address or network based on a change * in value of type. */ int -virDomainGraphicsListenSetType(virDomainGraphicsDefPtr def, size_t ii, int val) +virDomainGraphicsListenSetType(virDomainGraphicsDefPtr def, size_t i, int val) { virDomainGraphicsListenDefPtr listenInfo - = virDomainGraphicsGetListen(def, ii, true); + = virDomainGraphicsGetListen(def, i, true); if (!listenInfo) return -1; @@ -17744,10 +17750,10 @@ virDomainGraphicsListenSetType(virDomainGraphicsDefPtr def, size_t ii, int val) const char * -virDomainGraphicsListenGetAddress(virDomainGraphicsDefPtr def, size_t ii) +virDomainGraphicsListenGetAddress(virDomainGraphicsDefPtr def, size_t i) { virDomainGraphicsListenDefPtr listenInfo - = virDomainGraphicsGetListen(def, ii, false); + = virDomainGraphicsGetListen(def, i, false); /* even a network can have a listen address */ if (!listenInfo || @@ -17759,15 +17765,15 @@ virDomainGraphicsListenGetAddress(virDomainGraphicsDefPtr def, size_t ii) /* Make a copy of up to len characters of address, and store it in - * listens[ii].address. If setType is true, set the listen's type + * listens[i].address. If setType is true, set the listen's type * to 'address', otherwise leave type alone. */ int virDomainGraphicsListenSetAddress(virDomainGraphicsDefPtr def, - size_t ii, const char *address, + size_t i, const char *address, int len, bool setType) { virDomainGraphicsListenDefPtr listenInfo - = virDomainGraphicsGetListen(def, ii, true); + = virDomainGraphicsGetListen(def, i, true); if (!listenInfo) return -1; @@ -17787,10 +17793,10 @@ virDomainGraphicsListenSetAddress(virDomainGraphicsDefPtr def, const char * -virDomainGraphicsListenGetNetwork(virDomainGraphicsDefPtr def, size_t ii) +virDomainGraphicsListenGetNetwork(virDomainGraphicsDefPtr def, size_t i) { virDomainGraphicsListenDefPtr listenInfo - = virDomainGraphicsGetListen(def, ii, false); + = virDomainGraphicsGetListen(def, i, false); if (!listenInfo || (listenInfo->type != VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK)) @@ -17800,13 +17806,13 @@ virDomainGraphicsListenGetNetwork(virDomainGraphicsDefPtr def, size_t ii) /* Make a copy of up to len characters of address, and store it in - * listens[ii].network */ + * listens[i].network */ int virDomainGraphicsListenSetNetwork(virDomainGraphicsDefPtr def, - size_t ii, const char *network, int len) + size_t i, const char *network, int len) { virDomainGraphicsListenDefPtr listenInfo - = virDomainGraphicsGetListen(def, ii, true); + = virDomainGraphicsGetListen(def, i, true); if (!listenInfo) return -1; @@ -17838,7 +17844,7 @@ virDomainNetFind(virDomainDefPtr def, const char *device) bool isMac = false; virDomainNetDefPtr net = NULL; virMacAddr mac; - int i; + size_t i; if (virMacAddrParse(device, &mac) == 0) isMac = true; @@ -18068,7 +18074,7 @@ virDomainObjListExport(virDomainObjListPtr doms, unsigned int flags) { int ret = -1; - int i; + size_t i; struct virDomainListData data = { conn, NULL, @@ -18113,7 +18119,7 @@ cleanup: virSecurityLabelDefPtr virDomainDefGetSecurityLabelDef(virDomainDefPtr def, const char *model) { - int i; + size_t i; virSecurityLabelDefPtr seclabel = NULL; if (def == NULL || model == NULL) @@ -18132,7 +18138,7 @@ virDomainDefGetSecurityLabelDef(virDomainDefPtr def, const char *model) virSecurityDeviceLabelDefPtr virDomainDiskDefGetSecurityLabelDef(virDomainDiskDefPtr def, const char *model) { - int i; + size_t i; if (def == NULL) return NULL; @@ -18147,7 +18153,7 @@ virDomainDiskDefGetSecurityLabelDef(virDomainDiskDefPtr def, const char *model) virSecurityDeviceLabelDefPtr virDomainChrDefGetSecurityLabelDef(virDomainChrDefPtr def, const char *model) { - int i; + size_t i; if (def == NULL) return NULL; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index da83eb6..4a7dcd2 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2342,22 +2342,22 @@ virDomainHostdevRemove(virDomainDefPtr def, size_t i); int virDomainHostdevFind(virDomainDefPtr def, virDomainHostdevDefPtr match, virDomainHostdevDefPtr *found); -int virDomainGraphicsListenGetType(virDomainGraphicsDefPtr def, size_t ii) +int virDomainGraphicsListenGetType(virDomainGraphicsDefPtr def, size_t i) ATTRIBUTE_NONNULL(1); -int virDomainGraphicsListenSetType(virDomainGraphicsDefPtr def, size_t ii, int val) +int virDomainGraphicsListenSetType(virDomainGraphicsDefPtr def, size_t i, int val) ATTRIBUTE_NONNULL(1); const char *virDomainGraphicsListenGetAddress(virDomainGraphicsDefPtr def, - size_t ii) + size_t i) ATTRIBUTE_NONNULL(1); int virDomainGraphicsListenSetAddress(virDomainGraphicsDefPtr def, - size_t ii, const char *address, + size_t i, const char *address, int len, bool setType) ATTRIBUTE_NONNULL(1); const char *virDomainGraphicsListenGetNetwork(virDomainGraphicsDefPtr def, - size_t ii) + size_t i) ATTRIBUTE_NONNULL(1); int virDomainGraphicsListenSetNetwork(virDomainGraphicsDefPtr def, - size_t ii, const char *network, int len) + size_t i, const char *network, int len) ATTRIBUTE_NONNULL(1); int virDomainNetGetActualType(virDomainNetDefPtr iface); diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index bc43c28..422f471 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -134,7 +134,7 @@ struct _virDomainEvent { static void virDomainEventCallbackListFree(virDomainEventCallbackListPtr list) { - int i; + size_t i; if (!list) return; @@ -162,7 +162,7 @@ virDomainEventCallbackListRemove(virConnectPtr conn, virConnectDomainEventCallback callback) { int ret = 0; - int i; + size_t i; for (i = 0; i < cbList->count; i++) { if (cbList->callbacks[i]->cb == VIR_DOMAIN_EVENT_CALLBACK(callback) && cbList->callbacks[i]->eventID == VIR_DOMAIN_EVENT_ID_LIFECYCLE && @@ -213,7 +213,7 @@ virDomainEventCallbackListRemoveID(virConnectPtr conn, int callbackID) { int ret = 0; - int i; + size_t i; for (i = 0; i < cbList->count; i++) { if (cbList->callbacks[i]->callbackID == callbackID && cbList->callbacks[i]->conn == conn) { @@ -255,7 +255,7 @@ virDomainEventCallbackListMarkDelete(virConnectPtr conn, virConnectDomainEventCallback callback) { int ret = 0; - int i; + size_t i; for (i = 0; i < cbList->count; i++) { if (cbList->callbacks[i]->cb == VIR_DOMAIN_EVENT_CALLBACK(callback) && cbList->callbacks[i]->eventID == VIR_DOMAIN_EVENT_ID_LIFECYCLE && @@ -281,7 +281,7 @@ virDomainEventCallbackListMarkDeleteID(virConnectPtr conn, int callbackID) { int ret = 0; - int i; + size_t i; for (i = 0; i < cbList->count; i++) { if (cbList->callbacks[i]->callbackID == callbackID && cbList->callbacks[i]->conn == conn) { @@ -304,7 +304,7 @@ static int virDomainEventCallbackListPurgeMarked(virDomainEventCallbackListPtr cbList) { int old_count = cbList->count; - int i; + size_t i; for (i = 0; i < cbList->count; i++) { if (cbList->callbacks[i]->deleted) { virFreeCallback freecb = cbList->callbacks[i]->freecb; @@ -352,7 +352,7 @@ virDomainEventCallbackListAddID(virConnectPtr conn, int *callbackID) { virDomainEventCallbackPtr event; - int i; + size_t i; int ret = 0; /* Check incoming */ @@ -457,7 +457,7 @@ virDomainEventCallbackListEventID(virConnectPtr conn, virDomainEventCallbackListPtr cbList, int callbackID) { - int i; + size_t i; for (i = 0; i < cbList->count; i++) { if (cbList->callbacks[i]->deleted) @@ -498,7 +498,7 @@ void virDomainEventFree(virDomainEventPtr event) } VIR_FREE(event->data.graphics.authScheme); if (event->data.graphics.subject) { - int i; + size_t i; for (i = 0; i < event->data.graphics.subject->nidentity; i++) { VIR_FREE(event->data.graphics.subject->identities[i].type); VIR_FREE(event->data.graphics.subject->identities[i].name); @@ -534,7 +534,7 @@ void virDomainEventFree(virDomainEventPtr event) static void virDomainEventQueueClear(virDomainEventQueuePtr queue) { - int i; + size_t i; if (!queue) return; @@ -1359,7 +1359,7 @@ virDomainEventDispatch(virDomainEventPtr event, virDomainEventDispatchFunc dispatch, void *opaque) { - int i; + size_t i; /* Cache this now, since we may be dropping the lock, and have more callbacks added. We're guaranteed not to have any removed */ @@ -1384,7 +1384,7 @@ virDomainEventQueueDispatch(virDomainEventQueuePtr queue, virDomainEventDispatchFunc dispatch, void *opaque) { - int i; + size_t i; for (i = 0; i < queue->count; i++) { virDomainEventDispatch(queue->events[i], callbacks, dispatch, opaque); diff --git a/src/conf/domain_nwfilter.c b/src/conf/domain_nwfilter.c index f42905e..688a200 100644 --- a/src/conf/domain_nwfilter.c +++ b/src/conf/domain_nwfilter.c @@ -53,7 +53,7 @@ virDomainConfNWFilterTeardown(virDomainNetDefPtr net) { void virDomainConfVMNWFilterTeardown(virDomainObjPtr vm) { - int i; + size_t i; if (nwfilterDriver != NULL) { for (i = 0; i < vm->def->nnets; i++) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 025a454..08cc693 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -54,12 +54,12 @@ void virInterfaceIpDefFree(virInterfaceIpDefPtr def) { static void virInterfaceProtocolDefFree(virInterfaceProtocolDefPtr def) { - int ii; + size_t i; if (def == NULL) return; - for (ii = 0; ii < def->nips; ii++) { - virInterfaceIpDefFree(def->ips[ii]); + for (i = 0; i < def->nips; i++) { + virInterfaceIpDefFree(def->ips[i]); } VIR_FREE(def->ips); VIR_FREE(def->family); @@ -69,7 +69,8 @@ void virInterfaceProtocolDefFree(virInterfaceProtocolDefPtr def) { void virInterfaceDefFree(virInterfaceDefPtr def) { - int i, pp; + size_t i; + int pp; if (def == NULL) return; @@ -299,7 +300,8 @@ virInterfaceDefParseProtoIPv4(virInterfaceProtocolDefPtr def, xmlXPathContextPtr ctxt) { xmlNodePtr dhcp; xmlNodePtr *ipNodes = NULL; - int nIpNodes, ii, ret = -1; + int nIpNodes, ret = -1; + size_t i; char *tmp; tmp = virXPathString("string(./route[1]/@gateway)", ctxt); @@ -324,7 +326,7 @@ virInterfaceDefParseProtoIPv4(virInterfaceProtocolDefPtr def, } def->nips = 0; - for (ii = 0; ii < nIpNodes; ii++) { + for (i = 0; i < nIpNodes; i++) { virInterfaceIpDefPtr ip; @@ -333,7 +335,7 @@ virInterfaceDefParseProtoIPv4(virInterfaceProtocolDefPtr def, goto error; } - ctxt->node = ipNodes[ii]; + ctxt->node = ipNodes[i]; ret = virInterfaceDefParseIp(ip, ctxt); if (ret != 0) { virInterfaceIpDefFree(ip); @@ -354,7 +356,8 @@ virInterfaceDefParseProtoIPv6(virInterfaceProtocolDefPtr def, xmlXPathContextPtr ctxt) { xmlNodePtr dhcp, autoconf; xmlNodePtr *ipNodes = NULL; - int nIpNodes, ii, ret = -1; + int nIpNodes, ret = -1; + size_t i; char *tmp; tmp = virXPathString("string(./route[1]/@gateway)", ctxt); @@ -383,7 +386,7 @@ virInterfaceDefParseProtoIPv6(virInterfaceProtocolDefPtr def, } def->nips = 0; - for (ii = 0; ii < nIpNodes; ii++) { + for (i = 0; i < nIpNodes; i++) { virInterfaceIpDefPtr ip; @@ -392,7 +395,7 @@ virInterfaceDefParseProtoIPv6(virInterfaceProtocolDefPtr def, goto error; } - ctxt->node = ipNodes[ii]; + ctxt->node = ipNodes[i]; ret = virInterfaceDefParseIp(ip, ctxt); if (ret != 0) { virInterfaceIpDefFree(ip); @@ -487,7 +490,8 @@ virInterfaceDefParseBridge(virInterfaceDefPtr def, xmlNodePtr *interfaces = NULL; xmlNodePtr bridge; virInterfaceDefPtr itf; - int nbItf, i; + int nbItf; + size_t i; int ret = 0; bridge = ctxt->node; @@ -528,7 +532,8 @@ virInterfaceDefParseBondItfs(virInterfaceDefPtr def, xmlNodePtr *interfaces = NULL; xmlNodePtr bond = ctxt->node; virInterfaceDefPtr itf; - int nbItf, i; + int nbItf; + size_t i; int ret = 0; nbItf = virXPathNodeSet("./interface", ctxt, &interfaces); @@ -874,7 +879,7 @@ virInterfaceDefPtr virInterfaceDefParseFile(const char *filename) static int virInterfaceBridgeDefFormat(virBufferPtr buf, const virInterfaceDefPtr def, int level) { - int i; + size_t i; int ret = 0; virBufferAsprintf(buf, "%*s <bridge", level*2, ""); @@ -899,7 +904,7 @@ virInterfaceBridgeDefFormat(virBufferPtr buf, static int virInterfaceBondDefFormat(virBufferPtr buf, const virInterfaceDefPtr def, int level) { - int i; + size_t i; int ret = 0; virBufferAsprintf(buf, "%*s <bond", level*2, ""); @@ -981,43 +986,43 @@ virInterfaceVlanDefFormat(virBufferPtr buf, static int virInterfaceProtocolDefFormat(virBufferPtr buf, const virInterfaceDefPtr def, int level) { - int pp, ii; + size_t i, j; - for (pp = 0; pp < def->nprotos; pp++) { + for (i = 0; i < def->nprotos; i++) { virBufferAsprintf(buf, "%*s <protocol family='%s'>\n", - level*2, "", def->protos[pp]->family); + level*2, "", def->protos[i]->family); - if (def->protos[pp]->autoconf) { + if (def->protos[i]->autoconf) { virBufferAsprintf(buf, "%*s <autoconf/>\n", level*2, ""); } - if (def->protos[pp]->dhcp) { - if (def->protos[pp]->peerdns == 0) + if (def->protos[i]->dhcp) { + if (def->protos[i]->peerdns == 0) virBufferAsprintf(buf, "%*s <dhcp peerdns='no'/>\n", level*2, ""); - else if (def->protos[pp]->peerdns == 1) + else if (def->protos[i]->peerdns == 1) virBufferAsprintf(buf, "%*s <dhcp peerdns='yes'/>\n", level*2, ""); else virBufferAsprintf(buf, "%*s <dhcp/>\n", level*2, ""); } - for (ii = 0; ii < def->protos[pp]->nips; ii++) { - if (def->protos[pp]->ips[ii]->address != NULL) { + for (j = 0; j < def->protos[i]->nips; j++) { + if (def->protos[i]->ips[j]->address != NULL) { virBufferAsprintf(buf, "%*s <ip address='%s'", level*2, "", - def->protos[pp]->ips[ii]->address); - if (def->protos[pp]->ips[ii]->prefix != 0) { + def->protos[i]->ips[j]->address); + if (def->protos[i]->ips[j]->prefix != 0) { virBufferAsprintf(buf, " prefix='%d'", - def->protos[pp]->ips[ii]->prefix); + def->protos[i]->ips[j]->prefix); } virBufferAddLit(buf, "/>\n"); } } - if (def->protos[pp]->gateway != NULL) { + if (def->protos[i]->gateway != NULL) { virBufferAsprintf(buf, "%*s <route gateway='%s'/>\n", - level*2, "", def->protos[pp]->gateway); + level*2, "", def->protos[i]->gateway); } virBufferAsprintf(buf, "%*s </protocol>\n", level*2, ""); @@ -1169,7 +1174,8 @@ int virInterfaceFindByMACString(const virInterfaceObjListPtr interfaces, const char *mac, virInterfaceObjPtr *matches, int maxmatches) { - unsigned int i, matchct = 0; + size_t i; + unsigned int matchct = 0; for (i = 0; i < interfaces->count; i++) { @@ -1193,7 +1199,7 @@ virInterfaceObjPtr virInterfaceFindByName(const virInterfaceObjListPtr interfaces, const char *name) { - unsigned int i; + size_t i; for (i = 0; i < interfaces->count; i++) { virInterfaceObjLock(interfaces->objs[i]); @@ -1207,7 +1213,7 @@ virInterfaceObjPtr virInterfaceFindByName(const virInterfaceObjListPtr void virInterfaceObjListFree(virInterfaceObjListPtr interfaces) { - unsigned int i; + size_t i; for (i = 0; i < interfaces->count; i++) virInterfaceObjFree(interfaces->objs[i]); @@ -1220,7 +1226,8 @@ int virInterfaceObjListClone(virInterfaceObjListPtr src, virInterfaceObjListPtr dest) { int ret = -1; - unsigned int i, cnt; + size_t i; + unsigned int cnt; if (!src || !dest) goto cleanup; @@ -1295,7 +1302,7 @@ virInterfaceObjPtr virInterfaceAssignDef(virInterfaceObjListPtr interfaces, void virInterfaceRemove(virInterfaceObjListPtr interfaces, const virInterfaceObjPtr iface) { - unsigned int i; + size_t i; virInterfaceObjUnlock(iface); for (i = 0; i < interfaces->count; i++) { diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index 880a7ce..94a5ce1 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -39,7 +39,8 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr de const char *trunk = NULL; const char *nativeMode = NULL; xmlNodePtr *tagNodes = NULL; - int nTags, ii; + int nTags; + size_t i; ctxt->node = node; @@ -61,10 +62,10 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr de def->nativeMode = 0; def->nativeTag = 0; - for (ii = 0; ii < nTags; ii++) { + for (i = 0; i < nTags; i++) { unsigned long id; - ctxt->node = tagNodes[ii]; + ctxt->node = tagNodes[i]; if (virXPathULong("string(./@id)", ctxt, &id) < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing or invalid vlan tag id attribute")); @@ -92,7 +93,7 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr de VIR_FREE(nativeMode); def->nativeTag = id; } - def->tag[ii] = id; + def->tag[i] = id; } def->nTags = nTags; @@ -143,7 +144,7 @@ cleanup: int virNetDevVlanFormat(virNetDevVlanPtr def, virBufferPtr buf) { - int ii; + size_t i; if (def->nTags == 0) return 0; @@ -155,9 +156,9 @@ virNetDevVlanFormat(virNetDevVlanPtr def, virBufferPtr buf) } virBufferAsprintf(buf, "<vlan%s>\n", def->trunk ? " trunk='yes'" : ""); - for (ii = 0; ii < def->nTags; ii++) { + for (i = 0; i < def->nTags; i++) { if (def->nativeMode != VIR_NATIVE_VLAN_MODE_DEFAULT && - def->nativeTag == def->tag[ii]) { + def->nativeTag == def->tag[i]) { /* check the nativeMode in case we get <tag id='0'/>*/ const char *mode = virNativeVlanModeTypeToString(def->nativeMode); if (!mode) { @@ -165,9 +166,9 @@ virNetDevVlanFormat(virNetDevVlanPtr def, virBufferPtr buf) _("Bad value for nativeMode")); } virBufferAsprintf(buf, " <tag id='%u' nativeMode='%s'/>\n", - def->tag[ii], mode); + def->tag[i], mode); } else { - virBufferAsprintf(buf, " <tag id='%u'/>\n", def->tag[ii]); + virBufferAsprintf(buf, " <tag id='%u'/>\n", def->tag[i]); } } virBufferAddLit(buf, "</vlan>\n"); diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 64fd581..29bd8f4 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -69,7 +69,7 @@ VIR_ENUM_IMPL(virNetworkForwardDriverName, virNetworkObjPtr virNetworkFindByUUID(const virNetworkObjListPtr nets, const unsigned char *uuid) { - unsigned int i; + size_t i; for (i = 0; i < nets->count; i++) { virNetworkObjLock(nets->objs[i]); @@ -84,7 +84,7 @@ virNetworkObjPtr virNetworkFindByUUID(const virNetworkObjListPtr nets, virNetworkObjPtr virNetworkFindByName(const virNetworkObjListPtr nets, const char *name) { - unsigned int i; + size_t i; for (i = 0; i < nets->count; i++) { virNetworkObjLock(nets->objs[i]); @@ -195,15 +195,15 @@ virNetworkDNSDefClear(virNetworkDNSDefPtr def) static void virNetworkForwardDefClear(virNetworkForwardDefPtr def) { - int ii; + size_t i; - for (ii = 0; ii < def->npfs && def->pfs; ii++) { - virNetworkForwardPfDefClear(&def->pfs[ii]); + for (i = 0; i < def->npfs && def->pfs; i++) { + virNetworkForwardPfDefClear(&def->pfs[i]); } VIR_FREE(def->pfs); - for (ii = 0; ii < def->nifs && def->ifs; ii++) { - virNetworkForwardIfDefClear(&def->ifs[ii]); + for (i = 0; i < def->nifs && def->ifs; i++) { + virNetworkForwardIfDefClear(&def->ifs[i]); } VIR_FREE(def->ifs); } @@ -211,7 +211,7 @@ virNetworkForwardDefClear(virNetworkForwardDefPtr def) void virNetworkDefFree(virNetworkDefPtr def) { - int ii; + size_t i; if (!def) return; @@ -222,18 +222,18 @@ virNetworkDefFree(virNetworkDefPtr def) virNetworkForwardDefClear(&def->forward); - for (ii = 0; ii < def->nips && def->ips; ii++) { - virNetworkIpDefClear(&def->ips[ii]); + for (i = 0; i < def->nips && def->ips; i++) { + virNetworkIpDefClear(&def->ips[i]); } VIR_FREE(def->ips); - for (ii = 0; ii < def->nroutes && def->routes; ii++) { - virNetworkRouteDefClear(&def->routes[ii]); + for (i = 0; i < def->nroutes && def->routes; i++) { + virNetworkRouteDefClear(&def->routes[i]); } VIR_FREE(def->routes); - for (ii = 0; ii < def->nPortGroups && def->portGroups; ii++) { - virPortGroupDefClear(&def->portGroups[ii]); + for (i = 0; i < def->nPortGroups && def->portGroups; i++) { + virPortGroupDefClear(&def->portGroups[i]); } VIR_FREE(def->portGroups); @@ -262,7 +262,7 @@ void virNetworkObjFree(virNetworkObjPtr net) void virNetworkObjListFree(virNetworkObjListPtr nets) { - unsigned int i; + size_t i; for (i = 0; i < nets->count; i++) virNetworkObjFree(nets->objs[i]); @@ -545,7 +545,7 @@ cleanup: void virNetworkRemoveInactive(virNetworkObjListPtr nets, const virNetworkObjPtr net) { - unsigned int i; + size_t i; virNetworkObjUnlock(net); for (i = 0; i < nets->count; i++) { @@ -574,7 +574,7 @@ virNetworkIpDefPtr virNetworkDefGetIpByIndex(const virNetworkDefPtr def, int family, size_t n) { - int ii; + size_t i; if (!def->ips || n >= def->nips) return NULL; @@ -584,10 +584,10 @@ virNetworkDefGetIpByIndex(const virNetworkDefPtr def, } /* find the nth ip of type "family" */ - for (ii = 0; ii < def->nips; ii++) { - if (VIR_SOCKET_ADDR_IS_FAMILY(&def->ips[ii].address, family) + for (i = 0; i < def->nips; i++) { + if (VIR_SOCKET_ADDR_IS_FAMILY(&def->ips[i].address, family) && (n-- <= 0)) { - return &def->ips[ii]; + return &def->ips[i]; } } /* failed to find enough of the right family */ @@ -1049,7 +1049,8 @@ virNetworkDNSDefParseXML(const char *networkName, xmlNodePtr *srvNodes = NULL; xmlNodePtr *txtNodes = NULL; int nhosts, nsrvs, ntxts; - int ii, ret = -1; + size_t i; + int ret = -1; xmlNodePtr save = ctxt->node; ctxt->node = node; @@ -1067,8 +1068,8 @@ virNetworkDNSDefParseXML(const char *networkName, goto cleanup; } - for (ii = 0; ii < nhosts; ii++) { - if (virNetworkDNSHostDefParseXML(networkName, hostNodes[ii], + for (i = 0; i < nhosts; i++) { + if (virNetworkDNSHostDefParseXML(networkName, hostNodes[i], &def->hosts[def->nhosts], false) < 0) { goto cleanup; } @@ -1089,8 +1090,8 @@ virNetworkDNSDefParseXML(const char *networkName, goto cleanup; } - for (ii = 0; ii < nsrvs; ii++) { - if (virNetworkDNSSrvDefParseXML(networkName, srvNodes[ii], ctxt, + for (i = 0; i < nsrvs; i++) { + if (virNetworkDNSSrvDefParseXML(networkName, srvNodes[i], ctxt, &def->srvs[def->nsrvs], false) < 0) { goto cleanup; } @@ -1111,8 +1112,8 @@ virNetworkDNSDefParseXML(const char *networkName, goto cleanup; } - for (ii = 0; ii < ntxts; ii++) { - if (virNetworkDNSTxtDefParseXML(networkName, txtNodes[ii], + for (i = 0; i < ntxts; i++) { + if (virNetworkDNSTxtDefParseXML(networkName, txtNodes[i], &def->txts[def->ntxts], false) < 0) { goto cleanup; } @@ -1679,7 +1680,8 @@ virNetworkForwardDefParseXML(const char *networkName, xmlXPathContextPtr ctxt, virNetworkForwardDefPtr def) { - int ii, ret = -1; + size_t i; + int ret = -1; xmlNodePtr *forwardIfNodes = NULL; xmlNodePtr *forwardPfNodes = NULL; xmlNodePtr *forwardAddrNodes = NULL; @@ -1800,8 +1802,8 @@ virNetworkForwardDefParseXML(const char *networkName, } /* parse each <interface> */ - for (ii = 0; ii < nForwardIfs; ii++) { - forwardDev = virXMLPropString(forwardIfNodes[ii], "dev"); + for (i = 0; i < nForwardIfs; i++) { + forwardDev = virXMLPropString(forwardIfNodes[i], "dev"); if (!forwardDev) { virReportError(VIR_ERR_XML_ERROR, _("Missing required dev attribute in " @@ -1810,7 +1812,7 @@ virNetworkForwardDefParseXML(const char *networkName, goto cleanup; } - if ((ii == 0) && (def->nifs == 1)) { + if ((i == 0) && (def->nifs == 1)) { /* both <forward dev='x'> and <interface dev='x'/> are * present. If they don't match, it's an error. */ @@ -1826,9 +1828,9 @@ virNetworkForwardDefParseXML(const char *networkName, continue; } - def->ifs[ii].device.dev = forwardDev; + def->ifs[i].device.dev = forwardDev; forwardDev = NULL; - def->ifs[ii].type = VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV; + def->ifs[i].type = VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV; def->nifs++; } @@ -1839,25 +1841,25 @@ virNetworkForwardDefParseXML(const char *networkName, goto cleanup; } - for (ii = 0; ii < nForwardAddrs; ii++) { - if (!(type = virXMLPropString(forwardAddrNodes[ii], "type"))) { + for (i = 0; i < nForwardAddrs; i++) { + if (!(type = virXMLPropString(forwardAddrNodes[i], "type"))) { virReportError(VIR_ERR_XML_ERROR, _("missing address type in network %s"), networkName); goto cleanup; } - if ((def->ifs[ii].type = virNetworkForwardHostdevDeviceTypeFromString(type)) < 0) { + if ((def->ifs[i].type = virNetworkForwardHostdevDeviceTypeFromString(type)) < 0) { virReportError(VIR_ERR_XML_ERROR, _("unknown address type '%s' in network %s"), type, networkName); goto cleanup; } - switch (def->ifs[ii].type) { + switch (def->ifs[i].type) { case VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_PCI: - if (virDevicePCIAddressParseXML(forwardAddrNodes[ii], - &def->ifs[ii].device.pci) < 0) { + if (virDevicePCIAddressParseXML(forwardAddrNodes[i], + &def->ifs[i].device.pci) < 0) { goto cleanup; } break; @@ -2037,7 +2039,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) goto error; if (nPortGroups > 0) { - int ii; + size_t i; /* allocate array to hold all the portgroups */ if (VIR_ALLOC_N(def->portGroups, nPortGroups) < 0) { @@ -2045,9 +2047,9 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) goto error; } /* parse each portgroup */ - for (ii = 0; ii < nPortGroups; ii++) { - int ret = virNetworkPortGroupParseXML(&def->portGroups[ii], - portGroupNodes[ii], ctxt); + for (i = 0; i < nPortGroups; i++) { + int ret = virNetworkPortGroupParseXML(&def->portGroups[i], + portGroupNodes[i], ctxt); if (ret < 0) goto error; def->nPortGroups++; @@ -2060,7 +2062,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) goto error; if (nIps > 0) { - int ii; + size_t i; /* allocate array to hold all the addrs */ if (VIR_ALLOC_N(def->ips, nIps) < 0) { @@ -2068,9 +2070,9 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) goto error; } /* parse each addr */ - for (ii = 0; ii < nIps; ii++) { - int ret = virNetworkIPDefParseXML(def->name, ipNodes[ii], - ctxt, &def->ips[ii]); + for (i = 0; i < nIps; i++) { + int ret = virNetworkIPDefParseXML(def->name, ipNodes[i], + ctxt, &def->ips[i]); if (ret < 0) goto error; def->nips++; @@ -2083,7 +2085,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) goto error; if (nRoutes > 0) { - int ii; + size_t i; /* allocate array to hold all the route definitions */ if (VIR_ALLOC_N(def->routes, nRoutes) < 0) { @@ -2091,9 +2093,9 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) goto error; } /* parse each definition */ - for (ii = 0; ii < nRoutes; ii++) { - int ret = virNetworkRouteDefParseXML(def->name, routeNodes[ii], - ctxt, &def->routes[ii]); + for (i = 0; i < nRoutes; i++) { + int ret = virNetworkRouteDefParseXML(def->name, routeNodes[i], + ctxt, &def->routes[i]); if (ret < 0) goto error; def->nroutes++; @@ -2107,14 +2109,14 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) */ nRoutes = def->nroutes; nIps = def->nips; - for (ii = 0; ii < nRoutes; ii++) { - int jj; + for (i = 0; i < nRoutes; i++) { + size_t j; virSocketAddr testAddr, testGw; bool addrMatch; - virNetworkRouteDefPtr gwdef = &def->routes[ii]; + virNetworkRouteDefPtr gwdef = &def->routes[i]; addrMatch = false; - for (jj = 0; jj < nIps; jj++) { - virNetworkIpDefPtr def2 = &def->ips[jj]; + for (j = 0; j < nIps; j++) { + virNetworkIpDefPtr def2 = &def->ips[j]; if (VIR_SOCKET_ADDR_FAMILY(&gwdef->gateway) != VIR_SOCKET_ADDR_FAMILY(&def2->address)) { continue; @@ -2283,7 +2285,7 @@ virNetworkDNSDefFormat(virBufferPtr buf, virNetworkDNSDefPtr def) { int result = 0; - int i; + size_t i, j; if (!(def->nhosts || def->nsrvs || def->ntxts)) goto out; @@ -2319,16 +2321,14 @@ virNetworkDNSDefFormat(virBufferPtr buf, } if (def->nhosts) { - int ii, j; - - for (ii = 0; ii < def->nhosts; ii++) { - char *ip = virSocketAddrFormat(&def->hosts[ii].ip); + for (i = 0; i < def->nhosts; i++) { + char *ip = virSocketAddrFormat(&def->hosts[i].ip); virBufferAsprintf(buf, "<host ip='%s'>\n", ip); virBufferAdjustIndent(buf, 2); - for (j = 0; j < def->hosts[ii].nnames; j++) + for (j = 0; j < def->hosts[i].nnames; j++) virBufferAsprintf(buf, "<hostname>%s</hostname>\n", - def->hosts[ii].names[j]); + def->hosts[i].names[j]); virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</host>\n"); @@ -2377,15 +2377,15 @@ virNetworkIpDefFormat(virBufferPtr buf, def->tftproot); } if ((def->nranges || def->nhosts)) { - int ii; + size_t i; virBufferAddLit(buf, "<dhcp>\n"); virBufferAdjustIndent(buf, 2); - for (ii = 0; ii < def->nranges; ii++) { - char *saddr = virSocketAddrFormat(&def->ranges[ii].start); + for (i = 0; i < def->nranges; i++) { + char *saddr = virSocketAddrFormat(&def->ranges[i].start); if (!saddr) goto error; - char *eaddr = virSocketAddrFormat(&def->ranges[ii].end); + char *eaddr = virSocketAddrFormat(&def->ranges[i].end); if (!eaddr) { VIR_FREE(saddr); goto error; @@ -2395,16 +2395,16 @@ virNetworkIpDefFormat(virBufferPtr buf, VIR_FREE(saddr); VIR_FREE(eaddr); } - for (ii = 0; ii < def->nhosts; ii++) { + for (i = 0; i < def->nhosts; i++) { virBufferAddLit(buf, "<host "); - if (def->hosts[ii].mac) - virBufferAsprintf(buf, "mac='%s' ", def->hosts[ii].mac); - if (def->hosts[ii].id) - virBufferAsprintf(buf, "id='%s' ", def->hosts[ii].id); - if (def->hosts[ii].name) - virBufferAsprintf(buf, "name='%s' ", def->hosts[ii].name); - if (VIR_SOCKET_ADDR_VALID(&def->hosts[ii].ip)) { - char *ipaddr = virSocketAddrFormat(&def->hosts[ii].ip); + if (def->hosts[i].mac) + virBufferAsprintf(buf, "mac='%s' ", def->hosts[i].mac); + if (def->hosts[i].id) + virBufferAsprintf(buf, "id='%s' ", def->hosts[i].id); + if (def->hosts[i].name) + virBufferAsprintf(buf, "name='%s' ", def->hosts[i].name); + if (VIR_SOCKET_ADDR_VALID(&def->hosts[i].ip)) { + char *ipaddr = virSocketAddrFormat(&def->hosts[i].ip); if (!ipaddr) goto error; virBufferAsprintf(buf, "ip='%s' ", ipaddr); @@ -2562,7 +2562,8 @@ virNetworkDefFormatInternal(virBufferPtr buf, { unsigned char *uuid; char uuidstr[VIR_UUID_STRING_BUFLEN]; - int ii, shortforward; + size_t i; + int shortforward; virBufferAddLit(buf, "<network"); if (!(flags & VIR_NETWORK_XML_INACTIVE) && (def->connections > 0)) { @@ -2633,21 +2634,21 @@ virNetworkDefFormatInternal(virBufferPtr buf, if (def->forward.nifs && (!def->forward.npfs || !(flags & VIR_NETWORK_XML_INACTIVE))) { - for (ii = 0; ii < def->forward.nifs; ii++) { + for (i = 0; i < def->forward.nifs; i++) { if (def->forward.type != VIR_NETWORK_FORWARD_HOSTDEV) { virBufferEscapeString(buf, "<interface dev='%s'", - def->forward.ifs[ii].device.dev); + def->forward.ifs[i].device.dev); if (!(flags & VIR_NETWORK_XML_INACTIVE) && - (def->forward.ifs[ii].connections > 0)) { + (def->forward.ifs[i].connections > 0)) { virBufferAsprintf(buf, " connections='%d'", - def->forward.ifs[ii].connections); + def->forward.ifs[i].connections); } virBufferAddLit(buf, "/>\n"); } else { - if (def->forward.ifs[ii].type == VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_PCI) { + if (def->forward.ifs[i].type == VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_PCI) { if (virDevicePCIAddressFormat(buf, - def->forward.ifs[ii].device.pci, + def->forward.ifs[i].device.pci, true) < 0) goto error; } @@ -2692,21 +2693,21 @@ virNetworkDefFormatInternal(virBufferPtr buf, if (virNetDevBandwidthFormat(def->bandwidth, buf) < 0) goto error; - for (ii = 0; ii < def->nips; ii++) { - if (virNetworkIpDefFormat(buf, &def->ips[ii]) < 0) + for (i = 0; i < def->nips; i++) { + if (virNetworkIpDefFormat(buf, &def->ips[i]) < 0) goto error; } - for (ii = 0; ii < def->nroutes; ii++) { - if (virNetworkRouteDefFormat(buf, &def->routes[ii]) < 0) + for (i = 0; i < def->nroutes; i++) { + if (virNetworkRouteDefFormat(buf, &def->routes[i]) < 0) goto error; } if (virNetDevVPortProfileFormat(def->virtPortProfile, buf) < 0) goto error; - for (ii = 0; ii < def->nPortGroups; ii++) - if (virPortGroupDefFormat(buf, &def->portGroups[ii]) < 0) + for (i = 0; i < def->nPortGroups; i++) + if (virPortGroupDefFormat(buf, &def->portGroups[i]) < 0) goto error; virBufferAdjustIndent(buf, -2); @@ -2776,14 +2777,14 @@ error: virPortGroupDefPtr virPortGroupFindByName(virNetworkDefPtr net, const char *portgroup) { - int ii; - for (ii = 0; ii < net->nPortGroups; ii++) { + size_t i; + for (i = 0; i < net->nPortGroups; i++) { if (portgroup) { - if (STREQ(portgroup, net->portGroups[ii].name)) - return &net->portGroups[ii]; + if (STREQ(portgroup, net->portGroups[i].name)) + return &net->portGroups[i]; } else { - if (net->portGroups[ii].isDefault) - return &net->portGroups[ii]; + if (net->portGroups[i].isDefault) + return &net->portGroups[i]; } } return NULL; @@ -3133,7 +3134,7 @@ int virNetworkBridgeInUse(const virNetworkObjListPtr nets, const char *bridge, const char *skipname) { - unsigned int i; + size_t i; unsigned int ret = 0; for (i = 0; i < nets->count; i++) { @@ -3289,7 +3290,7 @@ static virNetworkIpDefPtr virNetworkIpDefByIndex(virNetworkDefPtr def, int parentIndex) { virNetworkIpDefPtr ipdef = NULL; - int ii; + size_t i; /* first find which ip element's dhcp host list to work on */ if (parentIndex >= 0) { @@ -3306,9 +3307,9 @@ virNetworkIpDefByIndex(virNetworkDefPtr def, int parentIndex) /* -1 means "find the most appropriate", which in this case * means the one and only <ip> that has <dhcp> element */ - for (ii = 0; - (ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, ii)); - ii++) { + for (i = 0; + (ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, i)); + i++) { if (ipdef->nranges || ipdef->nhosts) break; } @@ -3333,7 +3334,8 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, /* virNetworkUpdateFlags */ unsigned int fflags ATTRIBUTE_UNUSED) { - int ii, ret = -1; + size_t i; + int ret = -1; virNetworkIpDefPtr ipdef = virNetworkIpDefByIndex(def, parentIndex); virNetworkDHCPHostDef host; @@ -3356,16 +3358,16 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, /* search for the entry with this (mac|name), * and update the IP+(mac|name) */ - for (ii = 0; ii < ipdef->nhosts; ii++) { + for (i = 0; i < ipdef->nhosts; i++) { if ((host.mac && - !virMacAddrCompare(host.mac, ipdef->hosts[ii].mac)) || + !virMacAddrCompare(host.mac, ipdef->hosts[i].mac)) || (host.name && - STREQ_NULLABLE(host.name, ipdef->hosts[ii].name))) { + STREQ_NULLABLE(host.name, ipdef->hosts[i].name))) { break; } } - if (ii == ipdef->nhosts) { + if (i == ipdef->nhosts) { virReportError(VIR_ERR_OPERATION_INVALID, _("couldn't locate an existing dhcp host entry with " "\"mac='%s'\" in network '%s'"), @@ -3377,8 +3379,8 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, * then clear out the extra copy to get rid of the duplicate pointers * to its data (mac and name strings). */ - virNetworkDHCPHostDefClear(&ipdef->hosts[ii]); - ipdef->hosts[ii] = host; + virNetworkDHCPHostDefClear(&ipdef->hosts[i]); + ipdef->hosts[i] = host; memset(&host, 0, sizeof(host)); } else if ((command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST) || @@ -3390,13 +3392,13 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, } /* log error if an entry with same name/address/ip already exists */ - for (ii = 0; ii < ipdef->nhosts; ii++) { + for (i = 0; i < ipdef->nhosts; i++) { if ((host.mac && - !virMacAddrCompare(host.mac, ipdef->hosts[ii].mac)) || + !virMacAddrCompare(host.mac, ipdef->hosts[i].mac)) || (host.name && - STREQ_NULLABLE(host.name, ipdef->hosts[ii].name)) || + STREQ_NULLABLE(host.name, ipdef->hosts[i].name)) || (VIR_SOCKET_ADDR_VALID(&host.ip) && - virSocketAddrEqual(&host.ip, &ipdef->hosts[ii].ip))) { + virSocketAddrEqual(&host.ip, &ipdef->hosts[i].ip))) { char *ip = virSocketAddrFormat(&host.ip); virReportError(VIR_ERR_OPERATION_INVALID, @@ -3426,17 +3428,17 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, } /* find matching entry - all specified attributes must match */ - for (ii = 0; ii < ipdef->nhosts; ii++) { + for (i = 0; i < ipdef->nhosts; i++) { if ((!host.mac || - !virMacAddrCompare(host.mac, ipdef->hosts[ii].mac)) && + !virMacAddrCompare(host.mac, ipdef->hosts[i].mac)) && (!host.name || - STREQ_NULLABLE(host.name, ipdef->hosts[ii].name)) && + STREQ_NULLABLE(host.name, ipdef->hosts[i].name)) && (!VIR_SOCKET_ADDR_VALID(&host.ip) || - virSocketAddrEqual(&host.ip, &ipdef->hosts[ii].ip))) { + virSocketAddrEqual(&host.ip, &ipdef->hosts[i].ip))) { break; } } - if (ii == ipdef->nhosts) { + if (i == ipdef->nhosts) { virReportError(VIR_ERR_OPERATION_INVALID, _("couldn't locate a matching dhcp host entry " "in network '%s'"), def->name); @@ -3444,8 +3446,8 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, } /* remove it */ - virNetworkDHCPHostDefClear(&ipdef->hosts[ii]); - VIR_DELETE_ELEMENT(ipdef->hosts, ii, ipdef->nhosts); + virNetworkDHCPHostDefClear(&ipdef->hosts[i]); + VIR_DELETE_ELEMENT(ipdef->hosts, i, ipdef->nhosts); } else { virNetworkDefUpdateUnknownCommand(command); @@ -3466,7 +3468,8 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, /* virNetworkUpdateFlags */ unsigned int fflags ATTRIBUTE_UNUSED) { - int ii, ret = -1; + size_t i; + int ret = -1; virNetworkIpDefPtr ipdef = virNetworkIpDefByIndex(def, parentIndex); virSocketAddrRange range; @@ -3492,9 +3495,9 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, goto cleanup; /* check if an entry with same name/address/ip already exists */ - for (ii = 0; ii < ipdef->nranges; ii++) { - if (virSocketAddrEqual(&range.start, &ipdef->ranges[ii].start) && - virSocketAddrEqual(&range.end, &ipdef->ranges[ii].end)) { + for (i = 0; i < ipdef->nranges; i++) { + if (virSocketAddrEqual(&range.start, &ipdef->ranges[i].start) && + virSocketAddrEqual(&range.end, &ipdef->ranges[i].end)) { break; } } @@ -3502,7 +3505,7 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, if ((command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST) || (command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST)) { - if (ii < ipdef->nranges) { + if (i < ipdef->nranges) { char *startip = virSocketAddrFormat(&range.start); char *endip = virSocketAddrFormat(&range.end); @@ -3527,7 +3530,7 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, } else if (command == VIR_NETWORK_UPDATE_COMMAND_DELETE) { - if (ii == ipdef->nranges) { + if (i == ipdef->nranges) { virReportError(VIR_ERR_OPERATION_INVALID, _("couldn't locate a matching dhcp range entry " "in network '%s'"), def->name); @@ -3536,7 +3539,7 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, /* remove it */ /* NB: nothing to clear from a RangeDef that's being freed */ - VIR_DELETE_ELEMENT(ipdef->ranges, ii, ipdef->nranges); + VIR_DELETE_ELEMENT(ipdef->ranges, i, ipdef->nranges); } else { virNetworkDefUpdateUnknownCommand(command); @@ -3568,7 +3571,8 @@ virNetworkDefUpdateForwardInterface(virNetworkDefPtr def, /* virNetworkUpdateFlags */ unsigned int fflags ATTRIBUTE_UNUSED) { - int ii, ret = -1; + size_t i; + int ret = -1; virNetworkForwardIfDef iface; memset(&iface, 0, sizeof(iface)); @@ -3592,17 +3596,17 @@ virNetworkDefUpdateForwardInterface(virNetworkDefPtr def, } /* check if an <interface> with same dev name already exists */ - for (ii = 0; ii < def->forward.nifs; ii++) { - if (def->forward.ifs[ii].type + for (i = 0; i < def->forward.nifs; i++) { + if (def->forward.ifs[i].type == VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV && - STREQ(iface.device.dev, def->forward.ifs[ii].device.dev)) + STREQ(iface.device.dev, def->forward.ifs[i].device.dev)) break; } if ((command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST) || (command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST)) { - if (ii < def->forward.nifs) { + if (i < def->forward.nifs) { virReportError(VIR_ERR_OPERATION_INVALID, _("there is an existing interface entry " "in network '%s' that matches " @@ -3622,7 +3626,7 @@ virNetworkDefUpdateForwardInterface(virNetworkDefPtr def, } else if (command == VIR_NETWORK_UPDATE_COMMAND_DELETE) { - if (ii == def->forward.nifs) { + if (i == def->forward.nifs) { virReportError(VIR_ERR_OPERATION_INVALID, _("couldn't find an interface entry " "in network '%s' matching <interface dev='%s'>"), @@ -3631,19 +3635,19 @@ virNetworkDefUpdateForwardInterface(virNetworkDefPtr def, } /* fail if the interface is being used */ - if (def->forward.ifs[ii].connections > 0) { + if (def->forward.ifs[i].connections > 0) { virReportError(VIR_ERR_OPERATION_INVALID, _("unable to delete interface '%s' " "in network '%s'. It is currently being used " " by %d domains."), iface.device.dev, def->name, - def->forward.ifs[ii].connections); + def->forward.ifs[i].connections); goto cleanup; } /* remove it */ - virNetworkForwardIfDefClear(&def->forward.ifs[ii]); - VIR_DELETE_ELEMENT(def->forward.ifs, ii, def->forward.nifs); + virNetworkForwardIfDefClear(&def->forward.ifs[i]); + VIR_DELETE_ELEMENT(def->forward.ifs, i, def->forward.nifs); } else { virNetworkDefUpdateUnknownCommand(command); @@ -3676,7 +3680,8 @@ virNetworkDefUpdatePortGroup(virNetworkDefPtr def, /* virNetworkUpdateFlags */ unsigned int fflags ATTRIBUTE_UNUSED) { - int ii, foundName = -1, foundDefault = -1; + size_t i; + int foundName = -1, foundDefault = -1; int ret = -1; virPortGroupDef portgroup; @@ -3689,11 +3694,11 @@ virNetworkDefUpdatePortGroup(virNetworkDefPtr def, goto cleanup; /* check if a portgroup with same name already exists */ - for (ii = 0; ii < def->nPortGroups; ii++) { - if (STREQ(portgroup.name, def->portGroups[ii].name)) - foundName = ii; - if (def->portGroups[ii].isDefault) - foundDefault = ii; + for (i = 0; i < def->nPortGroups; i++) { + if (STREQ(portgroup.name, def->portGroups[i].name)) + foundName = i; + if (def->portGroups[i].isDefault) + foundDefault = i; } if (foundName == -1 && ((command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) || @@ -3772,7 +3777,8 @@ virNetworkDefUpdateDNSHost(virNetworkDefPtr def, /* virNetworkUpdateFlags */ unsigned int fflags ATTRIBUTE_UNUSED) { - int ii, jj, kk, foundIdx = -1, ret = -1; + size_t i, j, k; + int foundIdx = -1, ret = -1; virNetworkDNSDefPtr dns = &def->dns; virNetworkDNSHostDef host; bool isAdd = (command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST || @@ -3794,21 +3800,21 @@ virNetworkDefUpdateDNSHost(virNetworkDefPtr def, if (virNetworkDNSHostDefParseXML(def->name, ctxt->node, &host, !isAdd) < 0) goto cleanup; - for (ii = 0; ii < dns->nhosts; ii++) { + for (i = 0; i < dns->nhosts; i++) { bool foundThisTime = false; - if (virSocketAddrEqual(&host.ip, &dns->hosts[ii].ip)) + if (virSocketAddrEqual(&host.ip, &dns->hosts[i].ip)) foundThisTime = true; - for (jj = 0; jj < host.nnames && !foundThisTime; jj++) { - for (kk = 0; kk < dns->hosts[ii].nnames && !foundThisTime; kk++) { - if (STREQ(host.names[jj], dns->hosts[ii].names[kk])) + for (j = 0; j < host.nnames && !foundThisTime; j++) { + for (k = 0; k < dns->hosts[i].nnames && !foundThisTime; k++) { + if (STREQ(host.names[j], dns->hosts[i].names[k])) foundThisTime = true; } } if (foundThisTime) { foundCt++; - foundIdx = ii; + foundIdx = i; } } @@ -3868,7 +3874,8 @@ virNetworkDefUpdateDNSSrv(virNetworkDefPtr def, /* virNetworkUpdateFlags */ unsigned int fflags ATTRIBUTE_UNUSED) { - int ii, foundIdx = -1, ret = -1; + size_t i; + int foundIdx = -1, ret = -1; virNetworkDNSDefPtr dns = &def->dns; virNetworkDNSSrvDef srv; bool isAdd = (command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST || @@ -3890,13 +3897,13 @@ virNetworkDefUpdateDNSSrv(virNetworkDefPtr def, if (virNetworkDNSSrvDefParseXML(def->name, ctxt->node, ctxt, &srv, !isAdd) < 0) goto cleanup; - for (ii = 0; ii < dns->nsrvs; ii++) { - if ((!srv.domain || STREQ_NULLABLE(srv.domain, dns->srvs[ii].domain)) && - (!srv.service || STREQ_NULLABLE(srv.service, dns->srvs[ii].service)) && - (!srv.protocol || STREQ_NULLABLE(srv.protocol, dns->srvs[ii].protocol)) && - (!srv.target || STREQ_NULLABLE(srv.target, dns->srvs[ii].target))) { + for (i = 0; i < dns->nsrvs; i++) { + if ((!srv.domain || STREQ_NULLABLE(srv.domain, dns->srvs[i].domain)) && + (!srv.service || STREQ_NULLABLE(srv.service, dns->srvs[i].service)) && + (!srv.protocol || STREQ_NULLABLE(srv.protocol, dns->srvs[i].protocol)) && + (!srv.target || STREQ_NULLABLE(srv.target, dns->srvs[i].target))) { foundCt++; - foundIdx = ii; + foundIdx = i; } } @@ -4299,7 +4306,7 @@ virNetworkObjListExport(virConnectPtr conn, virNetworkPtr net = NULL; int nnets = 0; int ret = -1; - int i; + size_t i; if (nets) { if (VIR_ALLOC_N(tmp_nets, netobjs.count + 1) < 0) { diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 3209604..bbf071c 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -88,7 +88,7 @@ virNodeDeviceObjPtr virNodeDeviceFindBySysfsPath(const virNodeDeviceObjListPtr devs, const char *sysfs_path) { - unsigned int i; + size_t i; for (i = 0; i < devs->count; i++) { virNodeDeviceObjLock(devs->objs[i]); @@ -106,7 +106,7 @@ virNodeDeviceFindBySysfsPath(const virNodeDeviceObjListPtr devs, virNodeDeviceObjPtr virNodeDeviceFindByName(const virNodeDeviceObjListPtr devs, const char *name) { - unsigned int i; + size_t i; for (i = 0; i < devs->count; i++) { virNodeDeviceObjLock(devs->objs[i]); @@ -158,7 +158,7 @@ void virNodeDeviceObjFree(virNodeDeviceObjPtr dev) void virNodeDeviceObjListFree(virNodeDeviceObjListPtr devs) { - unsigned int i; + size_t i; for (i = 0; i < devs->count; i++) virNodeDeviceObjFree(devs->objs[i]); VIR_FREE(devs->objs); @@ -206,7 +206,7 @@ virNodeDeviceObjPtr virNodeDeviceAssignDef(virNodeDeviceObjListPtr devs, void virNodeDeviceObjRemove(virNodeDeviceObjListPtr devs, const virNodeDeviceObjPtr dev) { - unsigned int i; + size_t i; virNodeDeviceObjUnlock(dev); @@ -235,7 +235,7 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDefPtr def) { virBuffer buf = VIR_BUFFER_INITIALIZER; virNodeDevCapsDefPtr caps; - unsigned int i = 0; + size_t i = 0; virBufferAddLit(&buf, "<device>\n"); virBufferEscapeString(&buf, " <name>%s</name>\n", def->name); @@ -569,7 +569,8 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt, union _virNodeDevCapData *data) { xmlNodePtr orignode, *nodes = NULL; - int i, n, ret = -1; + size_t i; + int n, ret = -1; unsigned long long val; orignode = ctxt->node; @@ -989,7 +990,8 @@ virNodeDevCapPciDevIommuGroupParseXML(xmlXPathContextPtr ctxt, xmlNodePtr origNode = ctxt->node; xmlNodePtr *addrNodes = NULL; char *numberStr = NULL; - int nAddrNodes, ii, ret = -1; + int nAddrNodes, ret = -1; + size_t i; virPCIDeviceAddressPtr pciAddr = NULL; ctxt->node = iommuGroupNode; @@ -1011,9 +1013,9 @@ virNodeDevCapPciDevIommuGroupParseXML(xmlXPathContextPtr ctxt, if ((nAddrNodes = virXPathNodeSet("./address", ctxt, &addrNodes)) < 0) goto cleanup; - for (ii = 0; ii < nAddrNodes; ii++) { + for (i = 0; i < nAddrNodes; i++) { virDevicePCIAddress addr = { 0, 0, 0, 0, 0 }; - if (virDevicePCIAddressParseXML(addrNodes[ii], &addr) < 0) + if (virDevicePCIAddressParseXML(addrNodes[i], &addr) < 0) goto cleanup; if (VIR_ALLOC(pciAddr) < 0) { virReportOOMError(); @@ -1236,7 +1238,8 @@ virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt, virNodeDeviceDefPtr def; virNodeDevCapsDefPtr *next_cap; xmlNodePtr *nodes; - int n, i; + int n; + size_t i; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -1447,7 +1450,7 @@ out: void virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps) { - int i = 0; + size_t i = 0; union _virNodeDevCapData *data = &caps->data; switch (caps->type) { @@ -1604,7 +1607,7 @@ virNodeDeviceObjListExport(virConnectPtr conn, virNodeDevicePtr device = NULL; int ndevices = 0; int ret = -1; - int i; + size_t i; if (devices) { if (VIR_ALLOC_N(tmp_devices, devobjs.count + 1) < 0) { diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index b2be99a..068b09d 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -225,7 +225,7 @@ static const char ipsetflags_str[] = "ipsetflags"; static int intMapGetByInt(const struct int_map *intmap, int32_t attr, const char **res) { - int i = 0; + size_t i = 0; bool found = false; while (intmap[i].val && !found) { @@ -255,7 +255,7 @@ static int intMapGetByString(const struct int_map *intmap, const char *str, int casecmp, int32_t *result) { - int i = 0; + size_t i = 0; bool found = false; while (intmap[i].val && !found) { @@ -272,7 +272,7 @@ intMapGetByString(const struct int_map *intmap, const char *str, int casecmp, void virNWFilterRuleDefFree(virNWFilterRuleDefPtr def) { - int i; + size_t i; if (!def) return; @@ -312,7 +312,7 @@ virNWFilterEntryFree(virNWFilterEntryPtr entry) { void virNWFilterDefFree(virNWFilterDefPtr def) { - int i; + size_t i; if (!def) return; @@ -348,7 +348,7 @@ virNWFilterObjFree(virNWFilterObjPtr obj) void virNWFilterObjListFree(virNWFilterObjListPtr nwfilters) { - unsigned int i; + size_t i; for (i = 0; i < nwfilters->count; i++) virNWFilterObjFree(nwfilters->objs[i]); VIR_FREE(nwfilters->objs); @@ -361,7 +361,7 @@ virNWFilterRuleDefAddVar(virNWFilterRuleDefPtr nwf, nwItemDesc *item, const char *var) { - int i = 0; + size_t i = 0; virNWFilterVarAccessPtr varAccess; varAccess = virNWFilterVarAccessParse(var); @@ -413,7 +413,7 @@ void virNWFilterObjRemove(virNWFilterObjListPtr nwfilters, virNWFilterObjPtr nwfilter) { - unsigned int i; + size_t i; virNWFilterObjUnlock(nwfilter); @@ -789,7 +789,7 @@ parseStringItems(const struct int_map *int_map, const char *input, int32_t *flags, char sep) { int rc = 0; - unsigned int i, j; + size_t i, j; bool found; i = 0; @@ -821,7 +821,8 @@ static int printStringItems(virBufferPtr buf, const struct int_map *int_map, int32_t flags, const char *sep) { - unsigned int i, c = 0; + size_t i; + unsigned int c = 0; int32_t mask = 0x1; while (mask) { @@ -2361,7 +2362,7 @@ virNWFilterRuleParse(xmlNodePtr node) while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { - int i = 0; + size_t i = 0; while (1) { if (found) i = found_i; @@ -2679,7 +2680,7 @@ virNWFilterObjPtr virNWFilterObjFindByUUID(virNWFilterObjListPtr nwfilters, const unsigned char *uuid) { - unsigned int i; + size_t i; for (i = 0; i < nwfilters->count; i++) { virNWFilterObjLock(nwfilters->objs[i]); @@ -2695,7 +2696,7 @@ virNWFilterObjFindByUUID(virNWFilterObjListPtr nwfilters, virNWFilterObjPtr virNWFilterObjFindByName(virNWFilterObjListPtr nwfilters, const char *name) { - unsigned int i; + size_t i; for (i = 0; i < nwfilters->count; i++) { virNWFilterObjLock(nwfilters->objs[i]); @@ -2763,7 +2764,7 @@ _virNWFilterDefLoopDetect(virConnectPtr conn, const char *filtername) { int rc = 0; - int i; + size_t i; virNWFilterEntryPtr entry; virNWFilterObjPtr obj; @@ -2830,7 +2831,7 @@ virNWFilterRegisterCallbackDriver(virNWFilterCallbackDriverPtr cbd) void virNWFilterUnRegisterCallbackDriver(virNWFilterCallbackDriverPtr cbd) { - int i = 0; + size_t i = 0; while (i < nCallbackDriver && callbackDrvArray[i] != cbd) i++; @@ -2846,7 +2847,7 @@ virNWFilterUnRegisterCallbackDriver(virNWFilterCallbackDriverPtr cbd) void virNWFilterCallbackDriversLock(void) { - int i; + size_t i; for (i = 0; i < nCallbackDriver; i++) callbackDrvArray[i]->vmDriverLock(); @@ -2855,7 +2856,7 @@ virNWFilterCallbackDriversLock(void) void virNWFilterCallbackDriversUnlock(void) { - int i; + size_t i; for (i = 0; i < nCallbackDriver; i++) callbackDrvArray[i]->vmDriverUnlock(); @@ -2872,7 +2873,7 @@ static virDomainObjListIterator virNWFilterDomainFWUpdateCB; int virNWFilterInstFiltersOnAllVMs(virConnectPtr conn) { - int i; + size_t i; struct domUpdateCBStruct cb = { .conn = conn, .step = STEP_APPLY_CURRENT, @@ -2890,7 +2891,7 @@ virNWFilterInstFiltersOnAllVMs(virConnectPtr conn) static int virNWFilterTriggerVMFilterRebuild(virConnectPtr conn) { - int i; + size_t i; int ret = 0; struct domUpdateCBStruct cb = { .conn = conn, @@ -3216,7 +3217,7 @@ virNWFilterRuleDefDetailsFormat(virBufferPtr buf, const virXMLAttr2Struct *att, virNWFilterRuleDefPtr def) { - int i = 0, j; + size_t i = 0, j; bool typeShown = false; bool neverShown = true; bool asHex; @@ -3355,7 +3356,7 @@ err_exit: static char * virNWFilterRuleDefFormat(virNWFilterRuleDefPtr def) { - int i; + size_t i; virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf2 = VIR_BUFFER_INITIALIZER; char *data; @@ -3442,7 +3443,7 @@ virNWFilterDefFormat(virNWFilterDefPtr def) { virBuffer buf = VIR_BUFFER_INITIALIZER; char uuid[VIR_UUID_STRING_BUFLEN]; - int i; + size_t i; char *xml; virBufferAsprintf(&buf, "<filter name='%s' chain='%s'", diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index 48b89b7..a20b7b0 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -188,7 +188,8 @@ bool virNWFilterVarValueEqual(const virNWFilterVarValuePtr a, const virNWFilterVarValuePtr b) { - unsigned int card, i, j; + unsigned int card; + size_t i, j; const char *s; if (!a || !b) @@ -285,7 +286,7 @@ virNWFilterVarValueDelNthValue(virNWFilterVarValuePtr val, unsigned int pos) int virNWFilterVarValueDelValue(virNWFilterVarValuePtr val, const char *value) { - unsigned int i; + size_t i; switch (val->valType) { case NWFILTER_VALUE_TYPE_SIMPLE: @@ -307,7 +308,7 @@ virNWFilterVarValueDelValue(virNWFilterVarValuePtr val, const char *value) void virNWFilterVarCombIterFree(virNWFilterVarCombIterPtr ci) { - unsigned int i; + size_t i; if (!ci) return; @@ -322,7 +323,7 @@ static int virNWFilterVarCombIterGetIndexByIterId(virNWFilterVarCombIterPtr ci, unsigned int iterId) { - unsigned int i; + size_t i; for (i = 0; i < ci->nIter; i++) if (ci->iter[i].iterId == iterId) @@ -412,7 +413,7 @@ static bool virNWFilterVarCombIterEntryAreUniqueEntries(virNWFilterVarCombIterEntryPtr cie, virNWFilterHashTablePtr hash) { - unsigned int i, j; + size_t i, j; virNWFilterVarValuePtr varValue, tmp; const char *value; @@ -473,7 +474,8 @@ virNWFilterVarCombIterCreate(virNWFilterHashTablePtr hash, size_t nVarAccess) { virNWFilterVarCombIterPtr res; - unsigned int i, iterId; + size_t i; + unsigned int iterId; int iterIndex = -1; unsigned int nextIntIterId = VIR_NWFILTER_MAX_ITERID + 1; @@ -528,7 +530,7 @@ err_exit: virNWFilterVarCombIterPtr virNWFilterVarCombIterNext(virNWFilterVarCombIterPtr ci) { - unsigned int i; + size_t i; for (i = 0; i < ci->nIter; i++) { next: @@ -555,7 +557,8 @@ const char * virNWFilterVarCombIterGetVarValue(virNWFilterVarCombIterPtr ci, const virNWFilterVarAccessPtr vap) { - unsigned int i, iterId; + size_t i; + unsigned int iterId; bool found = false; const char *res = NULL; virNWFilterVarValuePtr value; @@ -687,7 +690,7 @@ virNWFilterHashTablePut(virNWFilterHashTablePtr table, void virNWFilterHashTableFree(virNWFilterHashTablePtr table) { - int i; + size_t i; if (!table) return; virHashFree(table->hashTable); @@ -720,7 +723,7 @@ void * virNWFilterHashTableRemoveEntry(virNWFilterHashTablePtr ht, const char *entry) { - int i; + size_t i; void *value = virHashSteal(ht->hashTable, entry); if (value) { @@ -903,7 +906,8 @@ virNWFilterFormatParamAttributes(virBufferPtr buf, const char *filterref) { virHashKeyValuePairPtr items; - int i, j, card, numKeys; + size_t i, j; + int card, numKeys; numKeys = virHashSize(table->hashTable); diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index b500111..20c86ff 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -86,7 +86,7 @@ virDomainSnapshotDiskDefClear(virDomainSnapshotDiskDefPtr disk) void virDomainSnapshotDefFree(virDomainSnapshotDefPtr def) { - int i; + size_t i; if (!def) return; @@ -178,7 +178,8 @@ virDomainSnapshotDefParseString(const char *xmlStr, virDomainSnapshotDefPtr def = NULL; virDomainSnapshotDefPtr ret = NULL; xmlNodePtr *nodes = NULL; - int i; + size_t i; + int n; char *creation = NULL, *state = NULL; struct timeval tv; int active; @@ -317,10 +318,10 @@ virDomainSnapshotDefParseString(const char *xmlStr, def->file = memoryFile; memoryFile = NULL; - if ((i = virXPathNodeSet("./disks/*", ctxt, &nodes)) < 0) + if ((n = virXPathNodeSet("./disks/*", ctxt, &nodes)) < 0) goto cleanup; if (flags & VIR_DOMAIN_SNAPSHOT_PARSE_DISKS) { - def->ndisks = i; + def->ndisks = n; if (def->ndisks && VIR_ALLOC_N(def->disks, def->ndisks) < 0) { virReportOOMError(); goto cleanup; @@ -330,7 +331,7 @@ virDomainSnapshotDefParseString(const char *xmlStr, goto cleanup; } VIR_FREE(nodes); - } else if (i) { + } else if (n) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("unable to handle disk requests in snapshot")); goto cleanup; @@ -385,7 +386,7 @@ virDomainSnapshotAlignDisks(virDomainSnapshotDefPtr def, { int ret = -1; virBitmapPtr map = NULL; - int i; + size_t i; int ndisks; bool inuse; @@ -581,7 +582,7 @@ char *virDomainSnapshotDefFormat(const char *domain_uuid, int internal) { virBuffer buf = VIR_BUFFER_INITIALIZER; - int i; + size_t i; virCheckFlags(VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_UPDATE_CPU, NULL); @@ -784,7 +785,7 @@ virDomainSnapshotObjListGetNames(virDomainSnapshotObjListPtr snapshots, { struct virDomainSnapshotNameData data = { names, maxnames, flags, 0, false }; - int i; + size_t i; if (!from) { /* LIST_ROOTS and LIST_DESCENDANTS have the same bit value, @@ -1026,7 +1027,7 @@ virDomainListSnapshots(virDomainSnapshotObjListPtr snapshots, virDomainSnapshotPtr *list = NULL; char **names; int ret = -1; - int i; + size_t i; if (!snaps || count < 0) return count; @@ -1062,7 +1063,7 @@ cleanup: bool virDomainSnapshotDefIsExternal(virDomainSnapshotDefPtr def) { - int i; + size_t i; if (def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) return true; diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 2539c45..2639f1a 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -264,7 +264,7 @@ static virStoragePoolTypeInfo poolTypeInfo[] = { static virStoragePoolTypeInfoPtr virStoragePoolTypeInfoLookup(int type) { - unsigned int i; + size_t i; for (i = 0; i < ARRAY_CARDINALITY(poolTypeInfo); i++) if (poolTypeInfo[i].poolType == type) return &poolTypeInfo[i]; @@ -296,7 +296,7 @@ virStorageVolOptionsForPoolType(int type) void virStorageVolDefFree(virStorageVolDefPtr def) { - int i; + size_t i; if (!def) return; @@ -338,7 +338,7 @@ virStoragePoolSourceAdapterClear(virStoragePoolSourceAdapter adapter) void virStoragePoolSourceClear(virStoragePoolSourcePtr source) { - int i; + size_t i; if (!source) return; @@ -416,7 +416,7 @@ virStoragePoolObjFree(virStoragePoolObjPtr obj) void virStoragePoolObjListFree(virStoragePoolObjListPtr pools) { - unsigned int i; + size_t i; for (i = 0; i < pools->count; i++) virStoragePoolObjFree(pools->objs[i]); VIR_FREE(pools->objs); @@ -427,7 +427,7 @@ void virStoragePoolObjRemove(virStoragePoolObjListPtr pools, virStoragePoolObjPtr pool) { - unsigned int i; + size_t i; virStoragePoolObjUnlock(pool); @@ -527,7 +527,8 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, int ret = -1; xmlNodePtr relnode, *nodeset = NULL; char *authType = NULL; - int nsource, i; + int nsource; + size_t i; virStoragePoolOptionsPtr options; char *name = NULL; char *port = NULL; @@ -1046,7 +1047,7 @@ virStoragePoolSourceFormat(virBufferPtr buf, virStoragePoolOptionsPtr options, virStoragePoolSourcePtr src) { - int i, j; + size_t i, j; char uuid[VIR_UUID_STRING_BUFLEN]; virBufferAddLit(buf," <source>\n"); @@ -1261,7 +1262,8 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, char *unit = NULL; xmlNodePtr node; xmlNodePtr *nodes = NULL; - int i, n; + size_t i; + int n; options = virStorageVolOptionsForPoolType(pool->type); if (options == NULL) @@ -1535,7 +1537,7 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr options, virBufferEscapeString(buf, " <compat>%s</compat>\n", def->compat); if (options->featureToString && def->features) { - int i; + size_t i; bool b; bool empty = virBitmapIsAllClear(def->features); @@ -1576,7 +1578,7 @@ virStorageVolDefFormat(virStoragePoolDefPtr pool, virBufferAddLit(&buf, " <source>\n"); if (def->source.nextent) { - int i; + size_t i; const char *thispath = NULL; for (i = 0; i < def->source.nextent; i++) { if (thispath == NULL || @@ -1632,7 +1634,7 @@ virStoragePoolObjPtr virStoragePoolObjFindByUUID(virStoragePoolObjListPtr pools, const unsigned char *uuid) { - unsigned int i; + size_t i; for (i = 0; i < pools->count; i++) { virStoragePoolObjLock(pools->objs[i]); @@ -1648,7 +1650,7 @@ virStoragePoolObjPtr virStoragePoolObjFindByName(virStoragePoolObjListPtr pools, const char *name) { - unsigned int i; + size_t i; for (i = 0; i < pools->count; i++) { virStoragePoolObjLock(pools->objs[i]); @@ -1664,7 +1666,7 @@ virStoragePoolObjPtr virStoragePoolSourceFindDuplicateDevices(virStoragePoolObjPtr pool, virStoragePoolDefPtr def) { - unsigned int i, j; + size_t i, j; for (i = 0; i < pool->def->source.ndevice; i++) { for (j = 0; j < def->source.ndevice; j++) { @@ -1679,7 +1681,7 @@ virStoragePoolSourceFindDuplicateDevices(virStoragePoolObjPtr pool, void virStoragePoolObjClearVols(virStoragePoolObjPtr pool) { - unsigned int i; + size_t i; for (i = 0; i < pool->volumes.count; i++) virStorageVolDefFree(pool->volumes.objs[i]); @@ -1691,7 +1693,7 @@ virStorageVolDefPtr virStorageVolDefFindByKey(virStoragePoolObjPtr pool, const char *key) { - unsigned int i; + size_t i; for (i = 0; i < pool->volumes.count; i++) if (STREQ(pool->volumes.objs[i]->key, key)) @@ -1704,7 +1706,7 @@ virStorageVolDefPtr virStorageVolDefFindByPath(virStoragePoolObjPtr pool, const char *path) { - unsigned int i; + size_t i; for (i = 0; i < pool->volumes.count; i++) if (STREQ(pool->volumes.objs[i]->target.path, path)) @@ -1717,7 +1719,7 @@ virStorageVolDefPtr virStorageVolDefFindByName(virStoragePoolObjPtr pool, const char *name) { - unsigned int i; + size_t i; for (i = 0; i < pool->volumes.count; i++) if (STREQ(pool->volumes.objs[i]->name, name)) @@ -1950,7 +1952,7 @@ virStoragePoolSourceListFormat(virStoragePoolSourceListPtr def) virStoragePoolOptionsPtr options; virBuffer buf = VIR_BUFFER_INITIALIZER; const char *type; - int i; + size_t i; options = virStoragePoolOptionsForPoolType(def->type); if (options == NULL) @@ -2050,7 +2052,7 @@ int virStoragePoolSourceFindDuplicate(virStoragePoolObjListPtr pools, virStoragePoolDefPtr def) { - int i; + size_t i; int ret = 1; virStoragePoolObjPtr pool = NULL; virStoragePoolObjPtr matchpool = NULL; @@ -2213,7 +2215,7 @@ virStoragePoolObjListExport(virConnectPtr conn, virStoragePoolPtr pool = NULL; int npools = 0; int ret = -1; - int i; + size_t i; if (pools) { if (VIR_ALLOC_N(tmp_pools, poolobjs.count + 1) < 0) { diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c index c710bbd..5c912fe 100644 --- a/src/conf/storage_encryption_conf.c +++ b/src/conf/storage_encryption_conf.c @@ -132,7 +132,8 @@ virStorageEncryptionParseXML(xmlXPathContextPtr ctxt) xmlNodePtr *nodes = NULL; virStorageEncryptionPtr ret; char *format_str; - int format, i, n; + int format, n; + size_t i; if (VIR_ALLOC(ret) < 0) { virReportOOMError(); -- 1.8.1.4

On Tue, Jul 09, 2013 at 09:17:33AM +0200, Ján Tomko wrote: The following will be squashed in diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 68feafa..4013267 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5320,6 +5320,8 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, } if (ioeventfd) { + int val; + if (def->bus != VIR_DOMAIN_DISK_BUS_VIRTIO) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("disk ioeventfd mode supported " @@ -5327,14 +5329,13 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, goto error; } - size_t i; - if ((i = virDomainIoEventFdTypeFromString(ioeventfd)) <= 0) { + if ((val = virDomainIoEventFdTypeFromString(ioeventfd)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk ioeventfd mode '%s'"), ioeventfd); goto error; } - def->ioeventfd=i; + def->ioeventfd = val; } if (event_idx) { @@ -5390,9 +5391,9 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, } if (startupPolicy) { - size_t i; + int val; - if ((i = virDomainStartupPolicyTypeFromString(startupPolicy)) <= 0) { + if ((val = virDomainStartupPolicyTypeFromString(startupPolicy)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown startupPolicy value '%s'"), startupPolicy); @@ -5407,7 +5408,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, startupPolicy); goto error; } - def->startupPolicy = i; + def->startupPolicy = val; } def->src = source; @@ -6471,14 +6472,14 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, def->driver.virtio.txmode = m; } if (ioeventfd) { - size_t i; - if ((i = virDomainIoEventFdTypeFromString(ioeventfd)) <= 0) { + int val; + if ((val = virDomainIoEventFdTypeFromString(ioeventfd)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown interface ioeventfd mode '%s'"), ioeventfd); goto error; } - def->driver.virtio.ioeventfd = i; + def->driver.virtio.ioeventfd = val; } if (event_idx) { int idx; @@ -10416,6 +10417,9 @@ virDomainDefMaybeAddHostdevSCSIcontroller(virDomainDefPtr def) } } + if (maxController == -1) + return 0; + for (i = 0; i <= maxController; i++) { if (virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_SCSI, i, -1) < 0) return -1; @@ -13391,6 +13395,9 @@ virDomainDefAddDiskControllersForType(virDomainDefPtr def, maxController = def->disks[i]->info.addr.drive.controller; } + if (maxController == -1) + return 0; + for (i = 0; i <= maxController; i++) { if (virDomainDefMaybeAddController(def, controllerType, i, -1) < 0) return -1; diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 6db9996..fde24be 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -304,22 +304,22 @@ static int virDomainEventCallbackListPurgeMarked(virDomainEventCallbackListPtr cbList) { int old_count = cbList->count; - size_t i; - for (i = 0; i < cbList->count; i++) { - if (cbList->callbacks[i]->deleted) { - virFreeCallback freecb = cbList->callbacks[i]->freecb; + int n; + for (n = 0; n < cbList->count; n++) { + if (cbList->callbacks[n]->deleted) { + virFreeCallback freecb = cbList->callbacks[n]->freecb; if (freecb) - (*freecb)(cbList->callbacks[i]->opaque); - virObjectUnref(cbList->callbacks[i]->conn); - VIR_FREE(cbList->callbacks[i]); + (*freecb)(cbList->callbacks[n]->opaque); + virObjectUnref(cbList->callbacks[n]->conn); + VIR_FREE(cbList->callbacks[n]); - if (i < (cbList->count - 1)) - memmove(cbList->callbacks + i, - cbList->callbacks + i + 1, + if (n < (cbList->count - 1)) + memmove(cbList->callbacks + n, + cbList->callbacks + n + 1, sizeof(*(cbList->callbacks)) * - (cbList->count - (i + 1))); + (cbList->count - (n + 1))); cbList->count--; - i--; + n--; } } if (cbList->count < old_count && diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 1eb13a8..799405e 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -736,7 +736,8 @@ virNodeDevCapScsiHostParseXML(xmlXPathContextPtr ctxt, const char *virt_type) { xmlNodePtr orignode, *nodes = NULL; - int ret = -1, n = 0, i; + int ret = -1, n = 0; + size_t i; char *type = NULL; orignode = ctxt->node; diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index 927ab08..7ae4a44 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -44,7 +44,7 @@ static unsigned int virNWFilterVarAccessGetIntIterId( void virNWFilterVarValueFree(virNWFilterVarValuePtr val) { - unsigned i; + size_t i; if (!val) return; @@ -68,7 +68,7 @@ virNWFilterVarValuePtr virNWFilterVarValueCopy(const virNWFilterVarValuePtr val) { virNWFilterVarValuePtr res; - unsigned i; + size_t i; char *str; if (VIR_ALLOC(res) < 0) Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; Convert the type of loop iterators named 'i', 'j', k', 'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or 'unsigned int', also santizing 'ii', 'jj', 'kk' to use the normal 'i', 'j', 'k' naming Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/util/virbitmap.c | 13 +++++++------ src/util/vircgroup.c | 32 ++++++++++++++++---------------- src/util/vircommand.c | 10 +++++----- src/util/virdnsmasq.c | 16 ++++++++-------- src/util/virebtables.c | 8 ++++---- src/util/vireventpoll.c | 28 ++++++++++++++-------------- src/util/virhook.c | 3 ++- src/util/virjson.c | 12 ++++++------ src/util/virkeycode.c | 4 ++-- src/util/virlog.c | 30 +++++++++++++++--------------- src/util/virlog.h | 2 +- src/util/virmacaddr.c | 2 +- src/util/virnetdevmacvlan.c | 2 +- src/util/virnetdevopenvswitch.c | 2 +- src/util/virnetdevtap.c | 4 ++-- src/util/virnetdevvportprofile.c | 2 +- src/util/virnetlink.c | 14 ++++++++------ src/util/virnuma.c | 13 +++++++------ src/util/virpci.c | 14 +++++++------- src/util/virportallocator.c | 8 ++++---- src/util/virprocess.c | 7 ++++--- src/util/virscsi.c | 6 +++--- src/util/virsocketaddr.c | 28 ++++++++++++++-------------- src/util/virstoragefile.c | 7 ++++--- src/util/virstring.c | 3 ++- src/util/virsysinfo.c | 6 +++--- src/util/virthreadwin32.c | 6 +++--- src/util/virthreadwin32.h | 2 +- src/util/virtypedparam.c | 10 +++++----- src/util/viruri.c | 2 +- src/util/virusb.c | 6 +++--- src/util/virutil.c | 29 ++++++++++++++++------------- src/util/viruuid.c | 7 ++++--- 33 files changed, 175 insertions(+), 163 deletions(-) diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index cf6a099..569654b 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -298,7 +298,8 @@ virBitmapParse(const char *str, bool neg = false; const char *cur; char *tmp; - int i, start, last; + size_t i; + int start, last; if (!str) return -1; @@ -431,7 +432,7 @@ virBitmapPtr virBitmapNewCopy(virBitmapPtr src) virBitmapPtr virBitmapNewData(void *data, int len) { virBitmapPtr bitmap; - int i, j; + size_t i, j; unsigned long *p; unsigned char *bytes = data; @@ -467,7 +468,7 @@ int virBitmapToData(virBitmapPtr bitmap, unsigned char **data, int *dataLen) { int len; unsigned long *l; - int i, j; + size_t i, j; unsigned char *bytes; len = (bitmap->max_bit + CHAR_BIT - 1) / CHAR_BIT; @@ -504,7 +505,7 @@ int virBitmapToData(virBitmapPtr bitmap, unsigned char **data, int *dataLen) bool virBitmapEqual(virBitmapPtr b1, virBitmapPtr b2) { virBitmapPtr tmp; - int i; + size_t i; if (b1->max_bit > b2->max_bit) { tmp = b1; @@ -571,7 +572,7 @@ void virBitmapClearAll(virBitmapPtr bitmap) */ bool virBitmapIsAllSet(virBitmapPtr bitmap) { - int i; + size_t i; int unusedBits; size_t sz; @@ -602,7 +603,7 @@ bool virBitmapIsAllSet(virBitmapPtr bitmap) */ bool virBitmapIsAllClear(virBitmapPtr bitmap) { - int i; + size_t i; for (i = 0; i < bitmap->map_len; i++) if (bitmap->map[i] != 0) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index e0b25ed..8a78dc2 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -74,7 +74,7 @@ typedef enum { */ void virCgroupFree(virCgroupPtr *group) { - int i; + size_t i; if (*group == NULL) return; @@ -111,7 +111,7 @@ bool virCgroupHasController(virCgroupPtr cgroup, int controller) static int virCgroupCopyMounts(virCgroupPtr group, virCgroupPtr parent) { - int i; + size_t i; for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { if (!parent->controllers[i].mountPoint) continue; @@ -133,7 +133,7 @@ static int virCgroupCopyMounts(virCgroupPtr group, */ static int virCgroupDetectMounts(virCgroupPtr group) { - int i; + size_t i; FILE *mounts = NULL; struct mntent entry; char buf[CGROUP_MAX_VAL]; @@ -226,7 +226,7 @@ static int virCgroupCopyPlacement(virCgroupPtr group, const char *path, virCgroupPtr parent) { - int i; + size_t i; for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { if (!group->controllers[i].mountPoint) continue; @@ -279,7 +279,7 @@ static int virCgroupCopyPlacement(virCgroupPtr group, static int virCgroupDetectPlacement(virCgroupPtr group, const char *path) { - int i; + size_t i; FILE *mapping = NULL; char line[1024]; @@ -353,8 +353,8 @@ static int virCgroupDetect(virCgroupPtr group, virCgroupPtr parent) { int rc; - int i; - int j; + size_t i; + size_t j; VIR_DEBUG("group=%p controllers=%d path=%s parent=%p", group, controllers, path, parent); @@ -439,7 +439,7 @@ static int virCgroupDetect(virCgroupPtr group, break; } - VIR_DEBUG("Detected mount/mapping %i:%s at %s in %s", i, + VIR_DEBUG("Detected mount/mapping %zu:%s at %s in %s", i, virCgroupControllerTypeToString(i), group->controllers[i].mountPoint, group->controllers[i].placement); @@ -459,7 +459,7 @@ int virCgroupPathOfController(virCgroupPtr group, char **path) { if (controller == -1) { - int i; + size_t i; for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { if (group->controllers[i].mountPoint && group->controllers[i].placement) { @@ -630,7 +630,7 @@ out: #if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R static int virCgroupCpuSetInherit(virCgroupPtr parent, virCgroupPtr group) { - int i; + size_t i; int rc = 0; const char *inherit_values[] = { "cpuset.cpus", @@ -702,7 +702,7 @@ static int virCgroupMakeGroup(virCgroupPtr parent, bool create, unsigned int flags) { - int i; + size_t i; int rc = 0; VIR_DEBUG("Make group %s", group->path); @@ -938,7 +938,7 @@ int virCgroupRemoveRecursively(char *grppath ATTRIBUTE_UNUSED) int virCgroupRemove(virCgroupPtr group) { int rc = 0; - int i; + size_t i; char *grppath = NULL; VIR_DEBUG("Removing cgroup %s", group->path); @@ -974,7 +974,7 @@ int virCgroupRemove(virCgroupPtr group) int virCgroupAddTask(virCgroupPtr group, pid_t pid) { int rc = 0; - int i; + size_t i; for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { /* Skip over controllers not mounted */ @@ -1064,7 +1064,7 @@ int virCgroupMoveTask(virCgroupPtr src_group, virCgroupPtr dest_group) { int rc = 0; char *content = NULL; - int i; + size_t i; for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { if (!src_group->controllers[i].mountPoint || @@ -2501,7 +2501,7 @@ int virCgroupKillRecursive(virCgroupPtr group, int signum) int virCgroupKillPainfully(virCgroupPtr group) { - int i; + size_t i; int rc; VIR_DEBUG("cgroup=%p path=%s", group, group->path); for (i = 0; i < 15; i++) { @@ -2514,7 +2514,7 @@ int virCgroupKillPainfully(virCgroupPtr group) signum = 0; /* Just check for existence */ rc = virCgroupKillRecursive(group, signum); - VIR_DEBUG("Iteration %d rc=%d", i, rc); + VIR_DEBUG("Iteration %zu rc=%d", i, rc); /* If rc == -1 we hit error, if 0 we ran out of PIDs */ if (rc <= 0) break; diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 6e2eb1e..3e912a2 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -139,7 +139,7 @@ virCommandFDIsSet(int fd, const int *set, int set_size) { - int i = 0; + size_t i = 0; while (i < set_size) if (set[i++] == fd) @@ -259,7 +259,7 @@ virFork(pid_t *pid) /* child process */ int logprio; - int i; + size_t i; /* Remove any error callback so errors in child now get sent to stderr where they stand a fighting chance @@ -1857,7 +1857,7 @@ virCommandProcessIO(virCommandPtr cmd) ret = -1; for (;;) { - int i; + size_t i; struct pollfd fds[3]; int nfds = 0; @@ -2176,7 +2176,7 @@ virCommandRunAsync(virCommandPtr cmd, pid_t *pid) { int ret = -1; char *str; - int i; + size_t i; bool synchronous = false; int infd[2] = {-1, -1}; @@ -2545,7 +2545,7 @@ int virCommandHandshakeNotify(virCommandPtr cmd) void virCommandFree(virCommandPtr cmd) { - int i; + size_t i; if (!cmd) return; diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index d37ee3e..9f3e353 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -64,7 +64,7 @@ dhcphostFree(dnsmasqDhcpHost *host) static void addnhostFree(dnsmasqAddnHost *host) { - int i; + size_t i; for (i = 0; i < host->nhostnames; i++) VIR_FREE(host->hostnames[i]); @@ -75,7 +75,7 @@ addnhostFree(dnsmasqAddnHost *host) static void addnhostsFree(dnsmasqAddnHostsfile *addnhostsfile) { - unsigned int i; + size_t i; if (addnhostsfile->hosts) { for (i = 0; i < addnhostsfile->nhosts; i++) @@ -98,7 +98,7 @@ addnhostsAdd(dnsmasqAddnHostsfile *addnhostsfile, { char *ipstr = NULL; int idx = -1; - int i; + size_t i; if (!(ipstr = virSocketAddrFormat(ip))) return -1; @@ -180,7 +180,7 @@ addnhostsWrite(const char *path, char *tmp; FILE *f; bool istmp = true; - unsigned int i, ii; + size_t i, j; int rc = 0; /* even if there are 0 hosts, create a 0 length file, to allow @@ -209,8 +209,8 @@ addnhostsWrite(const char *path, goto cleanup; } - for (ii = 0; ii < hosts[i].nhostnames; ii++) { - if (fputs(hosts[i].hostnames[ii], f) == EOF || fputc('\t', f) == EOF) { + for (j = 0; j < hosts[i].nhostnames; j++) { + if (fputs(hosts[i].hostnames[j], f) == EOF || fputc('\t', f) == EOF) { rc = -errno; VIR_FORCE_FCLOSE(f); @@ -282,7 +282,7 @@ genericFileDelete(char *path) static void hostsfileFree(dnsmasqHostsfile *hostsfile) { - unsigned int i; + size_t i; if (hostsfile->hosts) { for (i = 0; i < hostsfile->nhosts; i++) @@ -391,7 +391,7 @@ hostsfileWrite(const char *path, char *tmp; FILE *f; bool istmp = true; - unsigned int i; + size_t i; int rc = 0; /* even if there are 0 hosts, create a 0 length file, to allow diff --git a/src/util/virebtables.c b/src/util/virebtables.c index 9c95d57..6819686 100644 --- a/src/util/virebtables.c +++ b/src/util/virebtables.c @@ -106,7 +106,7 @@ ebtRuleFree(ebtRule *rule) VIR_FREE(rule->rule); if (rule->argv) { - int i = 0; + size_t i = 0; while (rule->argv[i]) VIR_FREE(rule->argv[i++]); VIR_FREE(rule->argv); @@ -120,7 +120,7 @@ ebtRulesAppend(ebtRules *rules, int command_idx) { if (VIR_REALLOC_N(rules->rules, rules->nrules+1) < 0) { - int i = 0; + size_t i = 0; while (argv[i]) VIR_FREE(argv[i++]); VIR_FREE(argv); @@ -140,7 +140,7 @@ static int ebtRulesRemove(ebtRules *rules, char *rule) { - int i; + size_t i; for (i = 0; i < rules->nrules; i++) if (STREQ(rules->rules[i].rule, rule)) @@ -163,7 +163,7 @@ ebtRulesRemove(ebtRules *rules, static void ebtRulesFree(ebtRules *rules) { - int i; + size_t i; VIR_FREE(rules->table); VIR_FREE(rules->chain); diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c index cc29dcb..f7d7e3d 100644 --- a/src/util/vireventpoll.c +++ b/src/util/vireventpoll.c @@ -140,7 +140,7 @@ int virEventPollAddHandle(int fd, int events, } void virEventPollUpdateHandle(int watch, int events) { - int i; + size_t i; bool found = false; PROBE(EVENT_POLL_UPDATE_HANDLE, "watch=%d events=%d", @@ -174,7 +174,7 @@ void virEventPollUpdateHandle(int watch, int events) { * Actual deletion will be done out-of-band */ int virEventPollRemoveHandle(int watch) { - int i; + size_t i; PROBE(EVENT_POLL_REMOVE_HANDLE, "watch=%d", watch); @@ -190,7 +190,7 @@ int virEventPollRemoveHandle(int watch) { continue; if (eventLoop.handles[i].watch == watch) { - EVENT_DEBUG("mark delete %d %d", i, eventLoop.handles[i].fd); + EVENT_DEBUG("mark delete %zu %d", i, eventLoop.handles[i].fd); eventLoop.handles[i].deleted = 1; virEventPollInterruptLocked(); virMutexUnlock(&eventLoop.lock); @@ -253,7 +253,7 @@ int virEventPollAddTimeout(int frequency, void virEventPollUpdateTimeout(int timer, int frequency) { unsigned long long now; - int i; + size_t i; bool found = false; PROBE(EVENT_POLL_UPDATE_TIMEOUT, "timer=%d frequency=%d", @@ -294,7 +294,7 @@ void virEventPollUpdateTimeout(int timer, int frequency) * Actual deletion will be done out-of-band */ int virEventPollRemoveTimeout(int timer) { - int i; + size_t i; PROBE(EVENT_POLL_REMOVE_TIMEOUT, "timer=%d", timer); @@ -328,7 +328,7 @@ int virEventPollRemoveTimeout(int timer) { */ static int virEventPollCalculateTimeout(int *timeout) { unsigned long long then = 0; - int i; + size_t i; EVENT_DEBUG("Calculate expiry of %zu timers", eventLoop.timeoutsCount); /* Figure out if we need a timeout */ for (i = 0; i < eventLoop.timeoutsCount; i++) { @@ -370,7 +370,7 @@ static int virEventPollCalculateTimeout(int *timeout) { */ static struct pollfd *virEventPollMakePollFDs(int *nfds) { struct pollfd *fds; - int i; + size_t i; *nfds = 0; for (i = 0; i < eventLoop.handlesCount; i++) { @@ -386,7 +386,7 @@ static struct pollfd *virEventPollMakePollFDs(int *nfds) { *nfds = 0; for (i = 0; i < eventLoop.handlesCount; i++) { - EVENT_DEBUG("Prepare n=%d w=%d, f=%d e=%d d=%d", i, + EVENT_DEBUG("Prepare n=%zu w=%d, f=%d e=%d d=%d", i, eventLoop.handles[i].watch, eventLoop.handles[i].fd, eventLoop.handles[i].events, @@ -419,7 +419,7 @@ static struct pollfd *virEventPollMakePollFDs(int *nfds) { static int virEventPollDispatchTimeouts(void) { unsigned long long now; - int i; + size_t i; /* Save this now - it may be changed during dispatch */ int ntimeouts = eventLoop.timeoutsCount; VIR_DEBUG("Dispatch %d", ntimeouts); @@ -466,7 +466,7 @@ static int virEventPollDispatchTimeouts(void) * Returns 0 upon success, -1 if an error occurred */ static int virEventPollDispatchHandles(int nfds, struct pollfd *fds) { - int i, n; + size_t i, n; VIR_DEBUG("Dispatch %d", nfds); /* NB, use nfds not eventLoop.handlesCount, because new @@ -481,9 +481,9 @@ static int virEventPollDispatchHandles(int nfds, struct pollfd *fds) { if (i == eventLoop.handlesCount) break; - VIR_DEBUG("i=%d w=%d", i, eventLoop.handles[i].watch); + VIR_DEBUG("i=%zu w=%d", i, eventLoop.handles[i].watch); if (eventLoop.handles[i].deleted) { - EVENT_DEBUG("Skip deleted n=%d w=%d f=%d", i, + EVENT_DEBUG("Skip deleted n=%zu w=%d f=%d", i, eventLoop.handles[i].watch, eventLoop.handles[i].fd); continue; } @@ -511,7 +511,7 @@ static int virEventPollDispatchHandles(int nfds, struct pollfd *fds) { * cleanup is needed to make dispatch re-entrant safe. */ static void virEventPollCleanupTimeouts(void) { - int i; + size_t i; size_t gap; VIR_DEBUG("Cleanup %zu", eventLoop.timeoutsCount); @@ -559,7 +559,7 @@ static void virEventPollCleanupTimeouts(void) { * cleanup is needed to make dispatch re-entrant safe. */ static void virEventPollCleanupHandles(void) { - int i; + size_t i; size_t gap; VIR_DEBUG("Cleanup %zu", eventLoop.handlesCount); diff --git a/src/util/virhook.c b/src/util/virhook.c index 507eae2..159efdb 100644 --- a/src/util/virhook.c +++ b/src/util/virhook.c @@ -139,7 +139,8 @@ virHookCheck(int no, const char *driver) { */ int virHookInitialize(void) { - int i, res, ret = 0; + size_t i; + int res, ret = 0; virHooksFound = 0; for (i = 0; i < VIR_HOOK_DRIVER_LAST; i++) { diff --git a/src/util/virjson.c b/src/util/virjson.c index 3a6f520..e93def7 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -64,7 +64,7 @@ struct _virJSONParser { void virJSONValueFree(virJSONValuePtr value) { - int i; + size_t i; if (!value || value->protect) return; @@ -401,7 +401,7 @@ int virJSONValueArrayAppend(virJSONValuePtr array, virJSONValuePtr value) int virJSONValueObjectHasKey(virJSONValuePtr object, const char *key) { - int i; + size_t i; if (object->type != VIR_JSON_TYPE_OBJECT) return -1; @@ -416,7 +416,7 @@ int virJSONValueObjectHasKey(virJSONValuePtr object, const char *key) virJSONValuePtr virJSONValueObjectGet(virJSONValuePtr object, const char *key) { - int i; + size_t i; if (object->type != VIR_JSON_TYPE_OBJECT) return NULL; @@ -455,7 +455,7 @@ int virJSONValueObjectRemoveKey(virJSONValuePtr object, const char *key, virJSONValuePtr *value) { - int i; + size_t i; if (value) *value = NULL; @@ -1011,7 +1011,7 @@ cleanup: yajl_free(hand); if (parser.nstate) { - int i; + size_t i; for (i = 0; i < parser.nstate; i++) { VIR_FREE(parser.state[i].key); } @@ -1026,7 +1026,7 @@ cleanup: static int virJSONValueToStringOne(virJSONValuePtr object, yajl_gen g) { - int i; + size_t i; VIR_DEBUG("object=%p type=%d gen=%p", object, object->type, g); diff --git a/src/util/virkeycode.c b/src/util/virkeycode.c index 9b2809d..50594d6 100644 --- a/src/util/virkeycode.c +++ b/src/util/virkeycode.c @@ -90,7 +90,7 @@ VIR_ENUM_IMPL(virKeycodeSet, VIR_KEYCODE_SET_LAST, int virKeycodeValueFromString(virKeycodeSet codeset, const char *keyname) { - int i; + size_t i; for (i = 0; i < VIR_KEYMAP_ENTRY_MAX; i++) { if (!virKeymapNames[codeset] || @@ -111,7 +111,7 @@ int virKeycodeValueTranslate(virKeycodeSet from_codeset, virKeycodeSet to_codeset, int key_value) { - int i; + size_t i; if (key_value <= 0) return -1; diff --git a/src/util/virlog.c b/src/util/virlog.c index 064f8e8..568104f 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -366,7 +366,7 @@ virLogStr(const char *str) static void virLogDumpAllFD(const char *msg, int len) { - int i; + size_t i; bool found = false; if (len <= 0) @@ -513,7 +513,7 @@ virLogSetDefaultPriority(virLogPriority priority) static int virLogResetFilters(void) { - int i; + size_t i; for (i = 0; i < virLogNbFilters; i++) VIR_FREE(virLogFilters[i].match); @@ -541,7 +541,8 @@ virLogDefineFilter(const char *match, virLogPriority priority, unsigned int flags) { - int i; + size_t i; + int ret = -1; char *mdup = NULL; virCheckFlags(VIR_LOG_STACK_TRACE, -1); @@ -554,17 +555,15 @@ virLogDefineFilter(const char *match, for (i = 0; i < virLogNbFilters; i++) { if (STREQ(virLogFilters[i].match, match)) { virLogFilters[i].priority = priority; + ret = i; goto cleanup; } } - if (VIR_STRDUP_QUIET(mdup, match) < 0) { - i = -1; + if (VIR_STRDUP_QUIET(mdup, match) < 0) goto cleanup; - } - i = virLogNbFilters; + ret = virLogNbFilters; if (VIR_REALLOC_N(virLogFilters, virLogNbFilters + 1)) { - i = -1; VIR_FREE(mdup); goto cleanup; } @@ -574,9 +573,9 @@ virLogDefineFilter(const char *match, virLogNbFilters++; cleanup: virLogUnlock(); - if (i < 0) + if (ret < 0) virReportOOMError(); - return i; + return ret; } @@ -595,7 +594,7 @@ virLogFiltersCheck(const char *input, unsigned int *flags) { int ret = 0; - int i; + size_t i; virLogLock(); for (i = 0; i < virLogNbFilters; i++) { @@ -620,7 +619,7 @@ virLogFiltersCheck(const char *input, static int virLogResetOutputs(void) { - int i; + size_t i; for (i = 0; i < virLogNbOutputs; i++) { if (virLogOutputs[i].c != NULL) @@ -805,7 +804,8 @@ virLogVMessage(virLogSource source, char *str = NULL; char *msg = NULL; char timestamp[VIR_TIME_STRING_BUFLEN]; - int fprio, i, ret; + int fprio, ret; + size_t i; int saved_errno = errno; bool emit = true; unsigned int filterflags = 0; @@ -1486,7 +1486,7 @@ virLogGetDefaultPriority(void) char * virLogGetFilters(void) { - int i; + size_t i; virBuffer filterbuf = VIR_BUFFER_INITIALIZER; virLogLock(); @@ -1520,7 +1520,7 @@ virLogGetFilters(void) char * virLogGetOutputs(void) { - int i; + size_t i; virBuffer outputbuf = VIR_BUFFER_INITIALIZER; virLogLock(); diff --git a/src/util/virlog.h b/src/util/virlog.h index 7db1657..f400824 100644 --- a/src/util/virlog.h +++ b/src/util/virlog.h @@ -97,7 +97,7 @@ static inline void virLogEatParams(virLogSource unused, ...) struct _virLogMetadata { const char *key; const char *s; /* String value, or NULL to use "i" */ - int i; + int iv; }; typedef struct _virLogMetadata virLogMetadata; diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c index c4ca0a84..2e9328d 100644 --- a/src/util/virmacaddr.c +++ b/src/util/virmacaddr.c @@ -146,7 +146,7 @@ virMacAddrGetRaw(virMacAddrPtr src, unsigned char dst[VIR_MAC_BUFLEN]) int virMacAddrParse(const char* str, virMacAddrPtr addr) { - int i; + size_t i; errno = 0; for (i = 0; i < VIR_MAC_BUFLEN; i++) { diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index a61c45f..00113af 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -596,7 +596,7 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr, if (virMacAddrCmpRaw(&calld->macaddress, mac->mac)) { /* Repeat the same check for a broadcast mac */ - int i; + size_t i; for (i = 0; i < VIR_MAC_BUFLEN; i++) { if (calld->macaddress.addr[i] != 0xff) { diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 75b196c..005b858 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -51,7 +51,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, virNetDevVlanPtr virtVlan) { int ret = -1; - int i = 0; + size_t i = 0; virCommandPtr cmd = NULL; char macaddrstr[VIR_MAC_STRING_BUFLEN]; char ifuuidstr[VIR_UUID_STRING_BUFLEN]; diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 4e2f32a..f018be1 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -156,7 +156,7 @@ int virNetDevTapCreate(char **ifname, int tapfdSize, unsigned int flags) { - int i; + size_t i; struct ifreq ifr; int ret = -1; int fd; @@ -311,7 +311,7 @@ int virNetDevTapCreate(char **ifname, * matches this pattern */ if (strstr(*ifname, "%d") != NULL) { - int i; + size_t i; for (i = 0; i <= IF_MAXUNIT; i++) { char *newname; if (virAsprintf(&newname, *ifname, i) < 0) { diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c index 0f1b6a1..efd9692 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -783,7 +783,7 @@ virNetDevVPortProfileGetNthParent(const char *ifname, int ifindex, unsigned int int rc; struct nlattr *tb[IFLA_MAX + 1] = { NULL, }; bool end = false; - unsigned int i = 0; + size_t i = 0; *nth = 0; diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index b2ba9df..6a584a0 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -326,7 +326,8 @@ virNetlinkEventCallback(int watch, struct nlmsghdr *msg; struct sockaddr_nl peer; struct ucred *creds = NULL; - int i, length; + size_t i; + int length; bool handled = false; length = nl_recv(srv->netlinknh, &peer, @@ -349,7 +350,7 @@ virNetlinkEventCallback(int watch, if (srv->handles[i].deleted != VIR_NETLINK_HANDLE_VALID) continue; - VIR_DEBUG("dispatching client %d.", i); + VIR_DEBUG("dispatching client %zu.", i); (srv->handles[i].handleCB)(msg, length, &peer, &handled, srv->handles[i].opaque); @@ -378,7 +379,7 @@ virNetlinkEventServiceStop(unsigned int protocol) return -EINVAL; virNetlinkEventSrvPrivatePtr srv = server[protocol]; - int i; + size_t i; VIR_INFO("stopping netlink event service"); @@ -414,7 +415,7 @@ virNetlinkEventServiceStop(unsigned int protocol) int virNetlinkEventServiceStopAll(void) { - unsigned int i, j; + size_t i, j; virNetlinkEventSrvPrivatePtr srv = NULL; VIR_INFO("stopping all netlink event services"); @@ -614,7 +615,8 @@ virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB, void *opaque, const virMacAddrPtr macaddr, unsigned int protocol) { - int i, r, ret = -1; + size_t i; + int r, ret = -1; virNetlinkEventSrvPrivatePtr srv = NULL; if (protocol >= MAX_LINKS) @@ -689,7 +691,7 @@ int virNetlinkEventRemoveClient(int watch, const virMacAddrPtr macaddr, unsigned int protocol) { - int i; + size_t i; int ret = -1; virNetlinkEventSrvPrivatePtr srv = NULL; diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 902ed43..ecf7ede 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -87,7 +87,8 @@ virNumaSetupMemoryPolicy(virNumaTuneDef numatune, int mode = -1; int node = -1; int ret = -1; - int i = 0; + int bit = 0; + size_t i; int maxnode = 0; virBitmapPtr tmp_nodemask = NULL; @@ -115,15 +116,15 @@ virNumaSetupMemoryPolicy(virNumaTuneDef numatune, /* Convert nodemask to NUMA bitmask. */ nodemask_zero(&mask); - i = -1; - while ((i = virBitmapNextSetBit(tmp_nodemask, i)) >= 0) { - if (i > maxnode || i > NUMA_NUM_NODES) { + bit = -1; + while ((bit = virBitmapNextSetBit(tmp_nodemask, bit)) >= 0) { + if (bit > maxnode || bit > NUMA_NUM_NODES) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Nodeset is out of range, host cannot support " - "NUMA node bigger than %d"), i); + "NUMA node bigger than %d"), bit); return -1; } - nodemask_set(&mask, i); + nodemask_set(&mask, bit); } mode = numatune.memory.mode; diff --git a/src/util/virpci.c b/src/util/virpci.c index 54f7715..a3353cc 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1672,7 +1672,7 @@ static void virPCIDeviceListDispose(void *obj) { virPCIDeviceListPtr list = obj; - int i; + size_t i; for (i = 0; i < list->count; i++) { virPCIDeviceFree(list->devs[i]); @@ -1780,7 +1780,7 @@ virPCIDeviceListDel(virPCIDeviceListPtr list, int virPCIDeviceListFindIndex(virPCIDeviceListPtr list, virPCIDevicePtr dev) { - int i; + size_t i; for (i = 0; i < list->count; i++) if (list->devs[i]->domain == dev->domain && @@ -1799,7 +1799,7 @@ virPCIDeviceListFindByIDs(virPCIDeviceListPtr list, unsigned int slot, unsigned int function) { - int i; + size_t i; for (i = 0; i < list->count; i++) { if (list->devs[i]->domain == domain && @@ -1815,10 +1815,10 @@ virPCIDeviceListFindByIDs(virPCIDeviceListPtr list, virPCIDevicePtr virPCIDeviceListFind(virPCIDeviceListPtr list, virPCIDevicePtr dev) { - int i; + int idx; - if ((i = virPCIDeviceListFindIndex(list, dev)) >= 0) - return list->devs[i]; + if ((idx = virPCIDeviceListFindIndex(list, dev)) >= 0) + return list->devs[idx]; else return NULL; } @@ -2416,7 +2416,7 @@ virPCIGetVirtualFunctions(const char *sysfs_path, unsigned int *num_virtual_functions) { int ret = -1; - int i; + size_t i; DIR *dir = NULL; struct dirent *entry = NULL; char *device_link = NULL; diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index 0757966..6730d00 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -98,7 +98,7 @@ int virPortAllocatorAcquire(virPortAllocatorPtr pa, unsigned short *port) { int ret = -1; - int i; + size_t i; int fd = -1; *port = 0; @@ -112,7 +112,7 @@ int virPortAllocatorAcquire(virPortAllocatorPtr pa, if (virBitmapGetBit(pa->bitmap, i - pa->start, &used) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to query port %d"), i); + _("Failed to query port %zu"), i); goto cleanup; } @@ -138,7 +138,7 @@ int virPortAllocatorAcquire(virPortAllocatorPtr pa, if (bind(fd, (struct sockaddr*)&addr, sizeof(addr)) < 0) { if (errno != EADDRINUSE) { virReportSystemError(errno, - _("Unable to bind to port %d"), i); + _("Unable to bind to port %zu"), i); goto cleanup; } /* In use, try next */ @@ -148,7 +148,7 @@ int virPortAllocatorAcquire(virPortAllocatorPtr pa, if (virBitmapSetBit(pa->bitmap, i - pa->start) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to reserve port %d"), i); + _("Failed to reserve port %zu"), i); goto cleanup; } *port = i; diff --git a/src/util/virprocess.c b/src/util/virprocess.c index bf61127..e049c53 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -262,7 +262,8 @@ int virProcessKill(pid_t pid, int sig) int virProcessKillPainfully(pid_t pid, bool force) { - int i, ret = -1; + size_t i; + int ret = -1; const char *signame = "TERM"; VIR_DEBUG("vpid=%lld force=%d", (long long)pid, force); @@ -322,7 +323,7 @@ cleanup: int virProcessSetAffinity(pid_t pid, virBitmapPtr map) { - int i; + size_t i; bool set = false; # ifdef CPU_ALLOC /* New method dynamically allocates cpu mask, allowing unlimted cpus */ @@ -392,7 +393,7 @@ int virProcessGetAffinity(pid_t pid, virBitmapPtr *map, int maxcpu) { - int i; + size_t i; # ifdef CPU_ALLOC /* New method dynamically allocates cpu mask, allowing unlimted cpus */ int numcpus = 1024; diff --git a/src/util/virscsi.c b/src/util/virscsi.c index 4870307..e30ef3b 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -352,7 +352,7 @@ static void virSCSIDeviceListDispose(void *obj) { virSCSIDeviceListPtr list = obj; - int i; + size_t i; for (i = 0; i < list->count; i++) virSCSIDeviceFree(list->devs[i]); @@ -401,7 +401,7 @@ virSCSIDeviceListSteal(virSCSIDeviceListPtr list, virSCSIDevicePtr dev) { virSCSIDevicePtr ret = NULL; - int i; + size_t i; for (i = 0; i < list->count; i++) { if (list->devs[i]->adapter != dev->adapter || @@ -439,7 +439,7 @@ virSCSIDevicePtr virSCSIDeviceListFind(virSCSIDeviceListPtr list, virSCSIDevicePtr dev) { - int i; + size_t i; for (i = 0; i < list->count; i++) { if (list->devs[i]->adapter == dev->adapter && diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 80b5c0b..525f599 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -42,7 +42,7 @@ typedef virSocketAddrIPv6 *virSocketAddrIPv6Ptr; static int virSocketAddrGetIPv4Addr(virSocketAddrPtr addr, virSocketAddrIPv4Ptr tab) { unsigned long val; - int i; + size_t i; if ((addr == NULL) || (tab == NULL) || (addr->data.stor.ss_family != AF_INET)) return -1; @@ -58,7 +58,7 @@ static int virSocketAddrGetIPv4Addr(virSocketAddrPtr addr, virSocketAddrIPv4Ptr } static int virSocketAddrGetIPv6Addr(virSocketAddrPtr addr, virSocketAddrIPv6Ptr tab) { - int i; + size_t i; if ((addr == NULL) || (tab == NULL) || (addr->data.stor.ss_family != AF_INET6)) return -1; @@ -420,11 +420,11 @@ virSocketAddrMask(const virSocketAddrPtr addr, return 0; } if (addr->data.stor.ss_family == AF_INET6) { - int ii; - for (ii = 0; ii < 16; ii++) { - network->data.inet6.sin6_addr.s6_addr[ii] - = (addr->data.inet6.sin6_addr.s6_addr[ii] - & netmask->data.inet6.sin6_addr.s6_addr[ii]); + size_t i; + for (i = 0; i < 16; i++) { + network->data.inet6.sin6_addr.s6_addr[i] + = (addr->data.inet6.sin6_addr.s6_addr[i] + & netmask->data.inet6.sin6_addr.s6_addr[i]); } network->data.inet6.sin6_port = 0; network->data.stor.ss_family = AF_INET6; @@ -531,7 +531,7 @@ virSocketAddrBroadcastByPrefix(const virSocketAddrPtr addr, */ int virSocketAddrCheckNetmask(virSocketAddrPtr addr1, virSocketAddrPtr addr2, virSocketAddrPtr netmask) { - int i; + size_t i; if ((addr1 == NULL) || (addr2 == NULL) || (netmask == NULL)) return -1; @@ -642,7 +642,7 @@ int virSocketAddrGetRange(virSocketAddrPtr start, virSocketAddrPtr end) { */ int virSocketAddrGetNumNetmaskBits(const virSocketAddrPtr netmask) { - int i, j; + size_t i, j; int c = 0; if (netmask->data.stor.ss_family == AF_INET) { @@ -750,24 +750,24 @@ virSocketAddrPrefixToNetmask(unsigned int prefix, result = 0; } else if (family == AF_INET6) { - int ii = 0; + size_t i = 0; if (prefix > 128) goto error; while (prefix >= 8) { /* do as much as possible an entire byte at a time */ - netmask->data.inet6.sin6_addr.s6_addr[ii++] = 0xff; + netmask->data.inet6.sin6_addr.s6_addr[i++] = 0xff; prefix -= 8; } if (prefix > 0) { /* final partial byte */ - netmask->data.inet6.sin6_addr.s6_addr[ii++] + netmask->data.inet6.sin6_addr.s6_addr[i++] = ~((1 << (8 - prefix)) -1); } - while (ii < 16) { + while (i < 16) { /* zerofill remainder in case it wasn't initialized */ - netmask->data.inet6.sin6_addr.s6_addr[ii++] = 0; + netmask->data.inet6.sin6_addr.s6_addr[i++] = 0; } netmask->data.stor.ss_family = AF_INET6; result = 0; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 27aa4fe..0cf64c7 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -638,7 +638,8 @@ virStorageFileMatchesVersion(int format, unsigned char *buf, size_t buflen) { - int version, i; + int version; + size_t i; /* Validate version number info */ if (fileTypeInfo[format].versionOffset == -1) @@ -683,7 +684,7 @@ virStorageFileProbeFormatFromBuf(const char *path, size_t buflen) { int format = VIR_STORAGE_FILE_RAW; - int i; + size_t i; int possibleFormat = VIR_STORAGE_FILE_RAW; VIR_DEBUG("path=%s", path); @@ -727,7 +728,7 @@ qcow2GetFeatures(virBitmapPtr *features, int version = -1; virBitmapPtr feat = NULL; uint64_t bits; - int i; + size_t i; version = virReadBufInt32BE(buf + fileTypeInfo[format].versionOffset); diff --git a/src/util/virstring.c b/src/util/virstring.c index 1937f82..dd884f5 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -490,7 +490,8 @@ virSkipSpacesBackwards(const char *str, char **endp) char * virArgvToString(const char *const *argv) { - int len, i; + int len; + size_t i; char *ret, *p; for (len = 1, i = 0; argv[i]; i++) diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index c6d3a71..846f553 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -73,7 +73,7 @@ void virSysinfoSetup(const char *dmidecode, const char *sysinfo, void virSysinfoDefFree(virSysinfoDefPtr def) { - int i; + size_t i; if (def == NULL) return; @@ -926,7 +926,7 @@ virSysinfoSystemFormat(virBufferPtr buf, virSysinfoDefPtr def) static void virSysinfoProcessorFormat(virBufferPtr buf, virSysinfoDefPtr def) { - int i; + size_t i; virSysinfoProcessorDefPtr processor; for (i = 0; i < def->nprocessor; i++) { @@ -978,7 +978,7 @@ virSysinfoProcessorFormat(virBufferPtr buf, virSysinfoDefPtr def) static void virSysinfoMemoryFormat(virBufferPtr buf, virSysinfoDefPtr def) { - int i; + size_t i; virSysinfoMemoryDefPtr memory; for (i = 0; i < def->nmemory; i++) { diff --git a/src/util/virthreadwin32.c b/src/util/virthreadwin32.c index 4feaae9..8928414 100644 --- a/src/util/virthreadwin32.c +++ b/src/util/virthreadwin32.c @@ -33,7 +33,7 @@ typedef struct virThreadLocalData virThreadLocalData; typedef virThreadLocalData *virThreadLocalDataPtr; virMutex virThreadLocalLock; -unsigned int virThreadLocalCount = 0; +size_t virThreadLocalCount = 0; virThreadLocalDataPtr virThreadLocalList = NULL; DWORD selfkey; @@ -54,7 +54,7 @@ int virThreadInitialize(void) void virThreadOnExit(void) { - unsigned int i; + size_t i; virMutexLock(&virThreadLocalLock); for (i = 0; i < virThreadLocalCount; i++) { if (virThreadLocalList[i].cleanup) { @@ -219,7 +219,7 @@ void virCondBroadcast(virCondPtr c) virMutexLock(&c->lock); if (c->nwaiters) { - unsigned int i; + size_t i; for (i = 0; i < c->nwaiters; i++) { HANDLE event = c->waiters[i]; SetEvent(event); diff --git a/src/util/virthreadwin32.h b/src/util/virthreadwin32.h index fc12847..645031b 100644 --- a/src/util/virthreadwin32.h +++ b/src/util/virthreadwin32.h @@ -32,7 +32,7 @@ struct virMutex { struct virCond { virMutex lock; - unsigned int nwaiters; + size_t nwaiters; HANDLE *waiters; }; diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index c767e32..f70ff46 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -51,7 +51,7 @@ virTypedParamsValidate(virTypedParameterPtr params, int nparams, ...) { va_list ap; int ret = -1; - int i, j; + size_t i, j; const char *name; int type; @@ -117,7 +117,7 @@ virTypedParamsCheck(virTypedParameterPtr params, const char **names, int nnames) { - int i, j; + size_t i, j; for (i = 0; i < nparams; i++) { bool found = false; @@ -400,7 +400,7 @@ virTypedParamsCopy(virTypedParameterPtr *dst, virTypedParameterPtr src, int nparams) { - int i; + size_t i; *dst = NULL; if (!src || nparams <= 0) @@ -446,7 +446,7 @@ virTypedParamsGet(virTypedParameterPtr params, int nparams, const char *name) { - int i; + size_t i; virResetLastError(); @@ -1163,7 +1163,7 @@ void virTypedParamsClear(virTypedParameterPtr params, int nparams) { - int i; + size_t i; if (!params) return; diff --git a/src/util/viruri.c b/src/util/viruri.c index 9cdb134..f7e2729 100644 --- a/src/util/viruri.c +++ b/src/util/viruri.c @@ -280,7 +280,7 @@ cleanup: char *virURIFormatParams(virURIPtr uri) { virBuffer buf = VIR_BUFFER_INITIALIZER; - int i; + size_t i; bool amp = false; for (i = 0; i < uri->paramsCount; ++i) { diff --git a/src/util/virusb.c b/src/util/virusb.c index d34e44f..e4acb4a 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -437,7 +437,7 @@ static void virUSBDeviceListDispose(void *obj) { virUSBDeviceListPtr list = obj; - int i; + size_t i; for (i = 0; i < list->count; i++) virUSBDeviceFree(list->devs[i]); @@ -488,7 +488,7 @@ virUSBDeviceListSteal(virUSBDeviceListPtr list, virUSBDevicePtr dev) { virUSBDevicePtr ret = NULL; - int i; + size_t i; for (i = 0; i < list->count; i++) { if (list->devs[i]->bus != dev->bus || @@ -523,7 +523,7 @@ virUSBDevicePtr virUSBDeviceListFind(virUSBDeviceListPtr list, virUSBDevicePtr dev) { - int i; + size_t i; for (i = 0; i < list->count; i++) { if (list->devs[i]->bus == dev->bus && diff --git a/src/util/virutil.c b/src/util/virutil.c index 569d035..60818a3 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -135,7 +135,7 @@ virPipeReadUntilEOF(int outfd, int errfd, char **outbuf, char **errbuf) { struct pollfd fds[2]; - int i; + size_t i; bool finished[2]; fds[0].fd = outfd; @@ -382,7 +382,7 @@ int virEnumFromString(const char *const*types, unsigned int ntypes, const char *type) { - unsigned int i; + size_t i; if (!type) return -1; @@ -505,7 +505,7 @@ int virDiskNameToIndex(const char *name) { const char *ptr = NULL; int idx = 0; static char const* const drive_prefix[] = {"fd", "hd", "vd", "sd", "xvd", "ubd"}; - unsigned int i; + size_t i; for (i = 0; i < ARRAY_CARDINALITY(drive_prefix); i++) { if (STRPREFIX(name, drive_prefix[i])) { @@ -537,7 +537,9 @@ int virDiskNameToIndex(const char *name) { char *virIndexToDiskName(int idx, const char *prefix) { char *name = NULL; - int i, k, offset; + size_t i; + int ctr; + int offset; if (idx < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -545,7 +547,7 @@ char *virIndexToDiskName(int idx, const char *prefix) return NULL; } - for (i = 0, k = idx; k >= 0; ++i, k = k / 26 - 1) { } + for (i = 0, ctr = idx; ctr >= 0; ++i, ctr = ctr / 26 - 1) { } offset = strlen(prefix); @@ -557,8 +559,8 @@ char *virIndexToDiskName(int idx, const char *prefix) strcpy(name, prefix); name[offset + i] = '\0'; - for (i = i - 1, k = idx; k >= 0; --i, k = k / 26 - 1) { - name[offset + i] = 'a' + (k % 26); + for (i = i - 1, ctr = idx; ctr >= 0; --i, ctr = ctr / 26 - 1) { + name[offset + i] = 'a' + (ctr % 26); } return name; @@ -1294,7 +1296,8 @@ int virSetUIDGIDWithCaps(uid_t uid, gid_t gid, unsigned long long capBits, bool clearExistingCaps) { - int ii, capng_ret, ret = -1; + size_t i; + int capng_ret, ret = -1; bool need_setgid = false, need_setuid = false; bool need_setpcap = false; @@ -1307,12 +1310,12 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, unsigned long long capBits, if (clearExistingCaps || (uid != (uid_t)-1 && uid != 0)) capng_clear(CAPNG_SELECT_BOTH); - for (ii = 0; ii <= CAP_LAST_CAP; ii++) { - if (capBits & (1ULL << ii)) { + for (i = 0; i <= CAP_LAST_CAP; i++) { + if (capBits & (1ULL << i)) { capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_INHERITABLE| CAPNG_PERMITTED|CAPNG_BOUNDING_SET, - ii); + i); } } @@ -1463,7 +1466,7 @@ bool virIsDevMapperDevice(const char *dev_name ATTRIBUTE_UNUSED) bool virValidateWWN(const char *wwn) { - int i; + size_t i; const char *p = wwn; if (STRPREFIX(wwn, "0x")) { @@ -1487,7 +1490,7 @@ virValidateWWN(const char *wwn) { bool virStrIsPrint(const char *str) { - int i; + size_t i; for (i = 0; str[i]; i++) if (!c_isprint(str[i])) diff --git a/src/util/viruuid.c b/src/util/viruuid.c index 9f4bb13..c5fa9a8 100644 --- a/src/util/viruuid.c +++ b/src/util/viruuid.c @@ -149,7 +149,7 @@ virUUIDGenerate(unsigned char *uuid) int virUUIDParse(const char *uuidstr, unsigned char *uuid) { const char *cur; - int i; + size_t i; /* * do a liberal scan allowing '-' and ' ' anywhere between character @@ -233,7 +233,8 @@ virUUIDFormat(const unsigned char *uuid, char *uuidstr) int virUUIDIsValid(unsigned char *uuid) { - unsigned int i, ctr = 1; + size_t i; + unsigned int ctr = 1; unsigned char c; if (!uuid) @@ -251,7 +252,7 @@ virUUIDIsValid(unsigned char *uuid) static int getDMISystemUUID(char *uuid, int len) { - unsigned int i = 0; + size_t i = 0; const char *paths[] = { "/sys/devices/virtual/dmi/id/product_uuid", "/sys/class/dmi/id/product_uuid", -- 1.8.1.4

On 07/08/2013 10:21 PM, Daniel P. Berrange wrote: ... virPCIGetVirtualFunctionIndex() is missing Guannan

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; Convert the type of loop iterators named 'i', 'j', k', 'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or 'unsigned int', also santizing 'ii', 'jj', 'kk' to use the normal 'i', 'j', 'k' naming Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- tests/commandhelper.c | 4 ++-- tests/cputest.c | 6 +++--- tests/esxutilstest.c | 9 +++++---- tests/eventtest.c | 14 +++++++------- tests/nodeinfotest.c | 2 +- tests/openvzutilstest.c | 2 +- tests/qemuhelptest.c | 6 +++--- tests/qemumonitorjsontest.c | 6 +++--- tests/qemumonitortest.c | 4 ++-- tests/ssh.c | 2 +- tests/testutils.c | 13 +++++++------ tests/utiltest.c | 16 +++++++++------- tests/viratomictest.c | 4 ++-- tests/virbitmaptest.c | 9 +++++---- tests/vircgrouptest.c | 2 +- tests/virhashtest.c | 12 ++++++------ tests/virnetsockettest.c | 2 +- tests/virstoragetest.c | 2 +- 18 files changed, 60 insertions(+), 55 deletions(-) diff --git a/tests/commandhelper.c b/tests/commandhelper.c index e4cc5d2..ccddadf 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -56,7 +56,7 @@ static int envsort(const void *a, const void *b) { } int main(int argc, char **argv) { - int i, n; + size_t i, n; char **origenv; char **newenv; char *cwd; @@ -103,7 +103,7 @@ int main(int argc, char **argv) { closed = fcntl(i, F_GETFD, &f) == -1 && errno == EBADF; if (!closed) - fprintf(log, "FD:%d\n", i); + fprintf(log, "FD:%zu\n", i); } fprintf(log, "DAEMON:%s\n", getpgrp() == getsid(0) ? "yes" : "no"); diff --git a/tests/cputest.c b/tests/cputest.c index 0105440..d08550d 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -114,7 +114,7 @@ cpuTestLoadMultiXML(const char *arch, xmlNodePtr *nodes = NULL; virCPUDefPtr *cpus = NULL; int n; - int i; + size_t i; if (virAsprintf(&xml, "%s/cputestdata/%s-%s.xml", abs_srcdir, arch, name) < 0) goto cleanup; @@ -326,7 +326,7 @@ cpuTestBaseline(const void *arg) virCPUDefPtr baseline = NULL; unsigned int ncpus = 0; char *result = NULL; - unsigned int i; + size_t i; if (!(cpus = cpuTestLoadMultiXML(data->arch, data->name, &ncpus))) goto cleanup; @@ -359,7 +359,7 @@ cpuTestBaseline(const void *arg) cmp != VIR_CPU_COMPARE_IDENTICAL) { if (virTestGetVerbose()) { fprintf(stderr, - "\nbaseline CPU is incompatible with CPU %u\n", i); + "\nbaseline CPU is incompatible with CPU %zu\n", i); fprintf(stderr, "%74s", "... "); } ret = -1; diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c index bb58a3a..221c46a 100644 --- a/tests/esxutilstest.c +++ b/tests/esxutilstest.c @@ -47,7 +47,8 @@ static struct testPath paths[] = { static int testParseDatastorePath(const void *data ATTRIBUTE_UNUSED) { - int i, result = 0; + int result = 0; + size_t i; char *datastoreName = NULL; char *directoryName = NULL; char *directoryAndFileName = NULL; @@ -135,7 +136,7 @@ static struct testDateTime times[] = { static int testConvertDateTimeToCalendarTime(const void *data ATTRIBUTE_UNUSED) { - int i; + size_t i; esxVI_DateTime dateTime; long long calendarTime; @@ -187,7 +188,7 @@ static struct testDatastoreItem datastoreItems[] = { static int testEscapeDatastoreItem(const void *data ATTRIBUTE_UNUSED) { - int i; + size_t i; char *escaped = NULL; for (i = 0; i < ARRAY_CARDINALITY(datastoreItems); ++i) { @@ -228,7 +229,7 @@ static struct testWindows1252ToUTF8 windows1252ToUTF8[] = { static int testConvertWindows1252ToUTF8(const void *data ATTRIBUTE_UNUSED) { - int i; + size_t i; char *utf8 = NULL; for (i = 0; i < ARRAY_CARDINALITY(windows1252ToUTF8); ++i) { diff --git a/tests/eventtest.c b/tests/eventtest.c index 97d805a..821745f 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -143,18 +143,18 @@ verifyFired(const char *name, int handle, int timer) { int handleFired = 0; int timerFired = 0; - int i; + size_t i; for (i = 0; i < NUM_FDS; i++) { if (handles[i].fired) { if (i != handle) { virtTestResult(name, 1, - "Handle %d fired, but expected %d\n", i, + "Handle %zu fired, but expected %d\n", i, handle); return EXIT_FAILURE; } else { if (handles[i].error != EV_ERROR_NONE) { virtTestResult(name, 1, - "Handle %d fired, but had error %d\n", i, + "Handle %zu fired, but had error %d\n", i, handles[i].error); return EXIT_FAILURE; } @@ -181,12 +181,12 @@ verifyFired(const char *name, int handle, int timer) if (timers[i].fired) { if (i != timer) { virtTestResult(name, 1, - "Timer %d fired, but expected %d\n", i, timer); + "Timer %zu fired, but expected %d\n", i, timer); return EXIT_FAILURE; } else { if (timers[i].error != EV_ERROR_NONE) { virtTestResult(name, 1, - "Timer %d fired, but had error %d\n", i, + "Timer %zu fired, but had error %d\n", i, timers[i].error); return EXIT_FAILURE; } @@ -247,7 +247,7 @@ finishJob(const char *name, int handle, int timer) static void resetAll(void) { - int i; + size_t i; for (i = 0; i < NUM_FDS; i++) { handles[i].fired = 0; handles[i].error = EV_ERROR_NONE; @@ -261,7 +261,7 @@ resetAll(void) static int mymain(void) { - int i; + size_t i; pthread_t eventThread; char one = '1'; diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index bce56f3..a4a5931 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -121,7 +121,7 @@ static int mymain(void) { int ret = 0; - int i; + size_t i; const char *nodeData[] = { "test1", # if !(defined(__powerpc__) || \ diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c index 4850017..ee68c06 100644 --- a/tests/openvzutilstest.c +++ b/tests/openvzutilstest.c @@ -38,7 +38,7 @@ static int testReadConfigParam(const void *data ATTRIBUTE_UNUSED) { int result = -1; - int i; + size_t i; char *conf = NULL; char *value = NULL; diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 2a3b019..72a1ad3 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -22,15 +22,15 @@ struct testInfo { static void printMismatchedFlags(virQEMUCapsPtr got, virQEMUCapsPtr expect) { - int i; + size_t i; for (i = 0; i < QEMU_CAPS_LAST; i++) { bool gotFlag = virQEMUCapsGet(got, i); bool expectFlag = virQEMUCapsGet(expect, i); if (gotFlag && !expectFlag) - fprintf(stderr, "Extra flag %i\n", i); + fprintf(stderr, "Extra flag %zu\n", i); if (!gotFlag && expectFlag) - fprintf(stderr, "Missing flag %i\n", i); + fprintf(stderr, "Missing flag %zu\n", i); } } diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index acc94ca..14d3700 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -236,7 +236,7 @@ testQemuMonitorJSONGetMachines(const void *data) qemuMonitorMachineInfoPtr *info; int ninfo = 0; const char *null = NULL; - int i; + size_t i; if (!test) return -1; @@ -317,7 +317,7 @@ testQemuMonitorJSONGetCPUDefinitions(const void *data) int ret = -1; char **cpus = NULL; int ncpus = 0; - int i; + size_t i; if (!test) return -1; @@ -383,7 +383,7 @@ testQemuMonitorJSONGetCommands(const void *data) int ret = -1; char **commands = NULL; int ncommands = 0; - int i; + size_t i; if (!test) return -1; diff --git a/tests/qemumonitortest.c b/tests/qemumonitortest.c index 61ac2d6..3851251 100644 --- a/tests/qemumonitortest.c +++ b/tests/qemumonitortest.c @@ -34,7 +34,7 @@ static struct testEscapeString escapeStrings[] = { static int testEscapeArg(const void *data ATTRIBUTE_UNUSED) { - int i; + size_t i; char *escaped = NULL; for (i = 0; i < ARRAY_CARDINALITY(escapeStrings); ++i) { escaped = qemuMonitorEscapeArg(escapeStrings[i].unescaped); @@ -61,7 +61,7 @@ static int testEscapeArg(const void *data ATTRIBUTE_UNUSED) static int testUnescapeArg(const void *data ATTRIBUTE_UNUSED) { - int i; + size_t i; char *unescaped = NULL; for (i = 0; i < ARRAY_CARDINALITY(escapeStrings); ++i) { unescaped = qemuMonitorUnescapeArg(escapeStrings[i].escaped); diff --git a/tests/ssh.c b/tests/ssh.c index 56b2e9b..76c60d3 100644 --- a/tests/ssh.c +++ b/tests/ssh.c @@ -28,7 +28,7 @@ int main(int argc, char **argv) { - int i; + size_t i; bool failConnect = false; /* Exit -1, with no data on stdout, msg on stderr */ bool dieEarly = false; /* Exit -1, with partial data on stdout, msg on stderr */ diff --git a/tests/testutils.c b/tests/testutils.c index 528e432..993c87f 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -77,7 +77,7 @@ double virtTestCountAverage(double *items, int nitems) { long double sum = 0; - int i; + size_t i; for (i=1; i < nitems; i++) sum += items[i]; @@ -132,7 +132,8 @@ void virtTestResult(const char *name, int ret, const char *msg, ...) int virtTestRun(const char *title, int nloops, int (*body)(const void *data), const void *data) { - int i, ret = 0; + int ret = 0; + size_t i; double *ts = NULL; if (testCounter == 0 && !virTestGetVerbose()) @@ -265,7 +266,7 @@ virtTestLoadFile(const char *file, char **buf) static void virtTestCaptureProgramExecChild(const char *const argv[], int pipefd) { - int i; + size_t i; int open_max; int stdinfd = -1; const char *const env[] = { @@ -523,7 +524,7 @@ virtTestErrorHook(int n, void *data ATTRIBUTE_UNUSED) { void *trace[30]; int ntrace = ARRAY_CARDINALITY(trace); - int i; + size_t i; char **symbols = NULL; ntrace = backtrace(trace, ntrace); @@ -665,7 +666,7 @@ int virtTestMain(int argc, fprintf(stderr, "%d) OOM of %d allocs ", testCounter, approxAlloc); if (mp) { - int i; + size_t i; for (i = 0; i < mp; i++) { workers[i] = fork(); if (workers[i] == 0) { @@ -700,7 +701,7 @@ int virtTestMain(int argc, if (worker) { _exit(ret); } else { - int i; + size_t i; for (i = 0; i < mp; i++) { if (virProcessWait(workers[i], NULL) < 0) ret = EXIT_FAILURE; diff --git a/tests/utiltest.c b/tests/utiltest.c index 9d18652..0cbf3f3 100644 --- a/tests/utiltest.c +++ b/tests/utiltest.c @@ -36,7 +36,7 @@ static const char* diskNames[] = { static int testIndexToDiskName(const void *data ATTRIBUTE_UNUSED) { - int i; + size_t i; char *diskName = NULL; for (i = 0; i < ARRAY_CARDINALITY(diskNames); ++i) { @@ -62,19 +62,20 @@ testIndexToDiskName(const void *data ATTRIBUTE_UNUSED) static int testDiskNameToIndex(const void *data ATTRIBUTE_UNUSED) { - int i, k; + size_t i; + int idx; char *diskName = NULL; for (i = 0; i < 100000; ++i) { VIR_FREE(diskName); diskName = virIndexToDiskName(i, "sd"); - k = virDiskNameToIndex(diskName); + idx = virDiskNameToIndex(diskName); - if (k != i) { + if (idx < 0 || idx != i) { if (virTestGetDebug() > 0) { - fprintf(stderr, "\nExpect [%d]\n", i); - fprintf(stderr, "Actual [%d]\n", k); + fprintf(stderr, "\nExpect [%zu]\n", i); + fprintf(stderr, "Actual [%d]\n", idx); } VIR_FREE(diskName); @@ -115,7 +116,8 @@ static struct testVersionString versions[] = { static int testParseVersionString(const void *data ATTRIBUTE_UNUSED) { - int i, result; + int result; + size_t i; unsigned long version; for (i = 0; i < ARRAY_CARDINALITY(versions); ++i) { diff --git a/tests/viratomictest.c b/tests/viratomictest.c index 1ed1707..40a05b8 100644 --- a/tests/viratomictest.c +++ b/tests/viratomictest.c @@ -115,7 +115,7 @@ static void thread_func(void *data) { int idx = (intptr_t)data; - int i; + size_t i; int d; for (i = 0; i < ROUNDS; i++) { @@ -134,7 +134,7 @@ static int testThreads(const void *data ATTRIBUTE_UNUSED) { int sum; - int i; + size_t i; virThread threads[THREADS]; atomic = 0; diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index 2464c33..11047c6 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -65,7 +65,7 @@ testBit(virBitmapPtr bitmap, unsigned int end, bool expected) { - int i; + size_t i; bool result; for (i = start; i <= end; i++) { @@ -145,7 +145,7 @@ static int test3(const void *data ATTRIBUTE_UNUSED) virBitmapPtr bitmap = NULL; int ret = -1; int size = 5; - int i; + size_t i; if ((bitmap = virBitmapNew(size)) == NULL) goto error; @@ -180,7 +180,7 @@ static int test4(const void *data ATTRIBUTE_UNUSED) 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39 }; virBitmapPtr bitmap = NULL; - int i, j; + size_t i, j; if (ARRAY_CARDINALITY(bitsPos) + ARRAY_CARDINALITY(bitsPosInv) != size) goto error; @@ -268,7 +268,8 @@ static int test5(const void *v ATTRIBUTE_UNUSED) int len2; int bits[] = {0, 9, 34}; virBitmapPtr bitmap; - int i, j; + size_t i; + ssize_t j; int ret = -1; bitmap = virBitmapNewData(data, sizeof(data)); diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index 262eb8b..22b40b4 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -41,7 +41,7 @@ static int validateCgroup(virCgroupPtr cgroup, const char **expectLinkPoint, const char **expectPlacement) { - int i; + size_t i; if (STRNEQ(cgroup->path, expectPath)) { fprintf(stderr, "Wrong path '%s', expected '%s'\n", diff --git a/tests/virhashtest.c b/tests/virhashtest.c index f36fc76..4cfd04e 100644 --- a/tests/virhashtest.c +++ b/tests/virhashtest.c @@ -128,7 +128,7 @@ testHashUpdate(const void *data ATTRIBUTE_UNUSED) { int count = ARRAY_CARDINALITY(uuids) + ARRAY_CARDINALITY(uuids_new); virHashTablePtr hash; - int i; + size_t i; int ret = -1; if (!(hash = testHashInit(0))) @@ -170,7 +170,7 @@ testHashRemove(const void *data ATTRIBUTE_UNUSED) { int count = ARRAY_CARDINALITY(uuids) - ARRAY_CARDINALITY(uuids_subset); virHashTablePtr hash; - int i; + size_t i; int ret = -1; if (!(hash = testHashInit(0))) @@ -206,7 +206,7 @@ testHashRemoveForEachSome(void *payload ATTRIBUTE_UNUSED, void *data) { virHashTablePtr hash = data; - int i; + size_t i; for (i = 0; i < ARRAY_CARDINALITY(uuids_subset); i++) { if (STREQ(uuids_subset[i], name)) { @@ -241,7 +241,7 @@ testHashRemoveForEachForbidden(void *payload ATTRIBUTE_UNUSED, void *data) { virHashTablePtr hash = data; - int i; + size_t i; for (i = 0; i < ARRAY_CARDINALITY(uuids_subset); i++) { if (STREQ(uuids_subset[i], name)) { @@ -297,7 +297,7 @@ testHashSteal(const void *data ATTRIBUTE_UNUSED) { int count = ARRAY_CARDINALITY(uuids) - ARRAY_CARDINALITY(uuids_subset); virHashTablePtr hash; - int i; + size_t i; int ret = -1; if (!(hash = testHashInit(0))) @@ -402,7 +402,7 @@ testHashRemoveSetIter(const void *payload ATTRIBUTE_UNUSED, { int *count = (int *) data; bool rem = false; - int i; + size_t i; for (i = 0; i < ARRAY_CARDINALITY(uuids_subset); i++) { if (STREQ(uuids_subset[i], name)) { diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 4c5a0ea..5b434ba 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -52,7 +52,7 @@ checkProtocols(bool *hasIPv4, bool *hasIPv6, struct sockaddr_in in4; struct sockaddr_in6 in6; int s4 = -1, s6 = -1; - int i; + size_t i; int ret = -1; memset(&hints, 0, sizeof(hints)); diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index fef4b37..d87080e 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -220,7 +220,7 @@ testStorageChain(const void *args) int ret = -1; virStorageFileMetadataPtr meta; virStorageFileMetadataPtr elt; - int i = 0; + size_t i = 0; meta = virStorageFileGetMetadata(data->start, data->format, -1, -1, (data->flags & ALLOW_PROBE) != 0); -- 1.8.1.4

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; Convert the type of loop iterators named 'i', 'j', k', 'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or 'unsigned int', also santizing 'ii', 'jj', 'kk' to use the normal 'i', 'j', 'k' naming Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- tools/virsh-domain-monitor.c | 17 +++++++++-------- tools/virsh-domain.c | 41 +++++++++++++++++++++++------------------ tools/virsh-host.c | 8 ++++---- tools/virsh-interface.c | 6 +++--- tools/virsh-network.c | 6 +++--- tools/virsh-nodedev.c | 8 ++++---- tools/virsh-nwfilter.c | 6 +++--- tools/virsh-pool.c | 7 ++++--- tools/virsh-secret.c | 6 +++--- tools/virsh-snapshot.c | 12 ++++++------ tools/virsh-volume.c | 6 +++--- tools/virsh.c | 15 ++++++++------- 12 files changed, 73 insertions(+), 65 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 58d6d40..5a36e09 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -323,7 +323,8 @@ cmdDomMemStat(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; const char *name; struct _virDomainMemoryStat stats[VIR_DOMAIN_MEMORY_STAT_NR]; - unsigned int nr_stats, i; + unsigned int nr_stats; + size_t i; if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return false; @@ -454,7 +455,7 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd) xmlXPathContextPtr ctxt = NULL; int ndisks; xmlNodePtr *disks = NULL; - int i; + size_t i; bool details = false; if (vshCommandOptBool(cmd, "inactive")) @@ -564,7 +565,7 @@ cmdDomiflist(vshControl *ctl, const vshCmd *cmd) xmlXPathContextPtr ctxt = NULL; int ninterfaces; xmlNodePtr *interfaces = NULL; - int i; + size_t i; if (vshCommandOptBool(cmd, "inactive")) flags |= VIR_DOMAIN_XML_INACTIVE; @@ -882,7 +883,7 @@ cmdDomblkstat(vshControl *ctl, const vshCmd *cmd) char *value = NULL; const char *field = NULL; int rc, nparams = 0; - int i = 0; + size_t i; bool ret = false; bool human = vshCommandOptBool(cmd, "human"); /* human readable output */ @@ -1090,7 +1091,7 @@ cmdDomBlkError(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; virDomainDiskErrorPtr disks = NULL; unsigned int ndisks; - int i; + size_t i; int count; bool ret = false; @@ -1382,7 +1383,7 @@ typedef struct vshDomainList *vshDomainListPtr; static void vshDomainListFree(vshDomainListPtr domlist) { - int i; + size_t i; if (domlist && domlist->domains) { for (i = 0; i < domlist->ndomains; i++) { @@ -1398,7 +1399,7 @@ static vshDomainListPtr vshDomainListCollect(vshControl *ctl, unsigned int flags) { vshDomainListPtr list = vshMalloc(ctl, sizeof(*list)); - int i; + size_t i; int ret; int *ids = NULL; int nids = 0; @@ -1704,7 +1705,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd) bool optTable = vshCommandOptBool(cmd, "table"); bool optUUID = vshCommandOptBool(cmd, "uuid"); bool optName = vshCommandOptBool(cmd, "name"); - int i; + size_t i; char *title; char uuid[VIR_UUID_STRING_BUFLEN]; int state; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 5257416..be650c2 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1098,7 +1098,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) int maxparams = 0; virTypedParameterPtr params = NULL; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; - unsigned int i = 0; + size_t i; int rv = 0; bool current = vshCommandOptBool(cmd, "current"); bool config = vshCommandOptBool(cmd, "config"); @@ -1276,7 +1276,7 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) int nparams = 0; int maxparams = 0; int rv = 0; - unsigned int i = 0; + size_t i; virTypedParameterPtr params = NULL; bool ret = false; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; @@ -2350,7 +2350,7 @@ cmdDomIfSetLink(vshControl *ctl, const vshCmd *cmd) bool config; bool ret = false; unsigned int flags = 0; - int i; + size_t i; xmlDocPtr xml = NULL; xmlXPathContextPtr ctxt = NULL; xmlXPathObjectPtr obj = NULL; @@ -2552,7 +2552,7 @@ cmdDomIftune(vshControl *ctl, const vshCmd *cmd) bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); virNetDevBandwidthRate inbound, outbound; - int i; + size_t i; VSH_EXCLUSIVE_OPTIONS_VAR(current, live); VSH_EXCLUSIVE_OPTIONS_VAR(current, config); @@ -4020,7 +4020,7 @@ cmdSchedInfoUpdateOne(vshControl *ctl, { virTypedParameterPtr param; int ret = -1; - int i; + size_t i; for (i = 0; i < nsrc_params; i++) { param = &(src_params[i]); @@ -4114,7 +4114,8 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) virTypedParameterPtr updates = NULL; int nparams = 0; int nupdates = 0; - int i, ret; + size_t i; + int ret; bool ret_val = false; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; bool current = vshCommandOptBool(cmd, "current"); @@ -5530,7 +5531,8 @@ vshParseCPUList(vshControl *ctl, const char *cpulist, unsigned char *cpumap = NULL; const char *cur; bool unuse = false; - int i, cpu, lastcpu; + int cpu, lastcpu; + size_t i; cpumap = vshCalloc(ctl, cpumaplen, sizeof(*cpumap)); @@ -5625,7 +5627,8 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) unsigned char *cpumap = NULL; unsigned char *cpumaps = NULL; size_t cpumaplen; - int i, maxcpu, ncpus; + int maxcpu, ncpus; + size_t i; bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); bool current = vshCommandOptBool(cmd, "current"); @@ -5695,7 +5698,7 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) if (vcpu != -1 && i != vcpu) continue; - vshPrint(ctl, "%4d: ", i); + vshPrint(ctl, "%4zu: ", i); ret = vshPrintPinInfo(cpumaps, cpumaplen, maxcpu, i); vshPrint(ctl, "\n"); if (!ret) @@ -6102,7 +6105,7 @@ cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) xmlXPathContextPtr ctxt = NULL; xmlBufferPtr xml_buf = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; - int i; + size_t i; if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) return false; @@ -6213,7 +6216,8 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; virTypedParameterPtr params = NULL; - int i, j, pos, max_id, cpu = 0, show_count = -1, nparams = 0; + int pos, max_id, cpu = 0, show_count = -1, nparams = 0; + size_t i, j; bool show_total = false, show_per_cpu = false; unsigned int flags = 0; bool ret = false; @@ -6286,7 +6290,7 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) for (i = 0; i < ncpus; i++) { if (params[i * nparams].type == 0) /* this cpu is not in the map */ continue; - vshPrint(ctl, "CPU%d:\n", cpu + i); + vshPrint(ctl, "CPU%zu:\n", cpu + i); for (j = 0; j < nparams; j++) { pos = i * nparams + j; @@ -7258,7 +7262,7 @@ cmdMemtune(vshControl *ctl, const vshCmd *cmd) long long min_guarantee = 0; int nparams = 0; int maxparams = 0; - unsigned int i = 0; + size_t i; virTypedParameterPtr params = NULL; bool ret = false; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; @@ -7423,7 +7427,7 @@ cmdNumatune(vshControl * ctl, const vshCmd * cmd) virDomainPtr dom; int nparams = 0; int maxparams = 0; - unsigned int i = 0; + size_t i; virTypedParameterPtr params = NULL; const char *nodeset = NULL; bool ret = false; @@ -9517,7 +9521,8 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) const char *mac =NULL, *type = NULL; char *doc = NULL; char buf[64]; - int i = 0, diff_mac; + int diff_mac; + size_t i; int ret; int functionReturn = false; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; @@ -9577,7 +9582,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) } /* multiple possibilities, so search for matching mac */ - for (; i < obj->nodesetval->nodeNr; i++) { + for (i = 0; i < obj->nodesetval->nodeNr; i++) { cur = obj->nodesetval->nodeTab[i]->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE && @@ -9662,7 +9667,7 @@ vshFindDisk(const char *doc, xmlXPathContextPtr ctxt = NULL; xmlNodePtr cur = NULL; xmlNodePtr ret = NULL; - int i = 0; + size_t i; xml = virXMLParseStringCtxt(doc, _("(domain_definition)"), &ctxt); if (!xml) { @@ -9680,7 +9685,7 @@ vshFindDisk(const char *doc, } /* search disk using @path */ - for (; i < obj->nodesetval->nodeNr; i++) { + for (i = 0; i < obj->nodesetval->nodeNr; i++) { bool is_supported = true; if (type == VSH_FIND_DISK_CHANGEABLE) { diff --git a/tools/virsh-host.c b/tools/virsh-host.c index a75d844..880ae4b 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -104,7 +104,7 @@ cmdFreecell(vshControl *ctl, const vshCmd *cmd) unsigned long long *nodes_free = NULL; bool all = vshCommandOptBool(cmd, "all"); bool cellno = vshCommandOptBool(cmd, "cellno"); - int i; + size_t i; char *cap_xml = NULL; xmlDocPtr xml = NULL; xmlXPathContextPtr ctxt = NULL; @@ -297,7 +297,7 @@ static const vshCmdOptDef opts_node_cpustats[] = { static bool cmdNodeCpuStats(vshControl *ctl, const vshCmd *cmd) { - int i, j; + size_t i, j; bool flag_utilization = false; bool flag_percent = vshCommandOptBool(cmd, "percent"); int cpuNum = VIR_NODE_CPU_STATS_ALL_CPUS; @@ -429,7 +429,7 @@ static bool cmdNodeMemStats(vshControl *ctl, const vshCmd *cmd) { int nparams = 0; - unsigned int i = 0; + size_t i; int cellNum = VIR_NODE_MEMORY_STATS_ALL_CELLS; virNodeMemoryStatsPtr params = NULL; bool ret = false; @@ -765,7 +765,7 @@ cmdNodeMemoryTune(vshControl *ctl, const vshCmd *cmd) unsigned int value; bool ret = false; int rc = -1; - int i = 0; + size_t i; if ((rc = vshCommandOptUInt(cmd, "shm-pages-to-scan", &value)) < 0) { vshError(ctl, "%s", _("invalid shm-pages-to-scan number")); diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index 2bdb215..9fdd36e 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -172,7 +172,7 @@ typedef struct vshInterfaceList *vshInterfaceListPtr; static void vshInterfaceListFree(vshInterfaceListPtr list) { - int i; + size_t i; if (list && list->nifaces) { for (i = 0; i < list->nifaces; i++) { @@ -189,7 +189,7 @@ vshInterfaceListCollect(vshControl *ctl, unsigned int flags) { vshInterfaceListPtr list = vshMalloc(ctl, sizeof(*list)); - int i; + size_t i; int ret; char **activeNames = NULL; char **inactiveNames = NULL; @@ -349,7 +349,7 @@ cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) bool all = vshCommandOptBool(cmd, "all"); unsigned int flags = VIR_CONNECT_LIST_INTERFACES_ACTIVE; vshInterfaceListPtr list = NULL; - int i; + size_t i; if (inactive) flags = VIR_CONNECT_LIST_INTERFACES_INACTIVE; diff --git a/tools/virsh-network.c b/tools/virsh-network.c index a80cbb5..e1baf0b 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -421,7 +421,7 @@ typedef struct vshNetworkList *vshNetworkListPtr; static void vshNetworkListFree(vshNetworkListPtr list) { - int i; + size_t i; if (list && list->nnets) { for (i = 0; i < list->nnets; i++) { @@ -438,7 +438,7 @@ vshNetworkListCollect(vshControl *ctl, unsigned int flags) { vshNetworkListPtr list = vshMalloc(ctl, sizeof(*list)); - int i; + size_t i; int ret; char **names = NULL; virNetworkPtr net; @@ -658,7 +658,7 @@ static bool cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { vshNetworkListPtr list = NULL; - int i; + size_t i; bool inactive = vshCommandOptBool(cmd, "inactive"); bool all = vshCommandOptBool(cmd, "all"); bool persistent = vshCommandOptBool(cmd, "persistent"); diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index b2e948b..2eb1979 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -208,7 +208,7 @@ typedef struct vshNodeDeviceList *vshNodeDeviceListPtr; static void vshNodeDeviceListFree(vshNodeDeviceListPtr list) { - int i; + size_t i; if (list && list->ndevices) { for (i = 0; i < list->ndevices; i++) { @@ -227,7 +227,7 @@ vshNodeDeviceListCollect(vshControl *ctl, unsigned int flags) { vshNodeDeviceListPtr list = vshMalloc(ctl, sizeof(*list)); - int i; + size_t i; int ret; virNodeDevicePtr device; bool success = false; @@ -314,7 +314,7 @@ fallback: /* Check if the device's capability matches with provied * capabilities. */ - int j, k; + size_t j, k; for (j = 0; j < ncaps; j++) { for (k = 0; k < ncapnames; k++) { if (STREQ(caps[j], capnames[k])) { @@ -393,7 +393,7 @@ static bool cmdNodeListDevices(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { const char *cap_str = NULL; - int i; + size_t i; bool tree = vshCommandOptBool(cmd, "tree"); bool ret = true; unsigned int flags = 0; diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c index c7a259a..b16428d 100644 --- a/tools/virsh-nwfilter.c +++ b/tools/virsh-nwfilter.c @@ -240,7 +240,7 @@ typedef struct vshNWFilterList *vshNWFilterListPtr; static void vshNWFilterListFree(vshNWFilterListPtr list) { - int i; + size_t i; if (list && list->nfilters) { for (i = 0; i < list->nfilters; i++) { @@ -257,7 +257,7 @@ vshNWFilterListCollect(vshControl *ctl, unsigned int flags) { vshNWFilterListPtr list = vshMalloc(ctl, sizeof(*list)); - int i; + size_t i; int ret; virNWFilterPtr filter; bool success = false; @@ -363,7 +363,7 @@ static const vshCmdOptDef opts_nwfilter_list[] = { static bool cmdNWFilterList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { - int i; + size_t i; char uuid[VIR_UUID_STRING_BUFLEN]; vshNWFilterListPtr list = NULL; diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index c5944ae..1622be2 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -691,7 +691,7 @@ typedef struct vshStoragePoolList *vshStoragePoolListPtr; static void vshStoragePoolListFree(vshStoragePoolListPtr list) { - int i; + size_t i; if (list && list->pools) { for (i = 0; i < list->npools; i++) { @@ -708,7 +708,7 @@ vshStoragePoolListCollect(vshControl *ctl, unsigned int flags) { vshStoragePoolListPtr list = vshMalloc(ctl, sizeof(*list)); - int i; + size_t i; int ret; char **names = NULL; virStoragePoolPtr pool; @@ -943,7 +943,8 @@ static bool cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { virStoragePoolInfo info; - int i, ret; + int ret; + size_t i; bool functionReturn = false; size_t stringLength = 0, nameStrLength = 0; size_t autostartStrLength = 0, persistStrLength = 0; diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index fb10119..ac11e53 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -367,7 +367,7 @@ typedef struct vshSecretList *vshSecretListPtr; static void vshSecretListFree(vshSecretListPtr list) { - int i; + size_t i; if (list && list->nsecrets) { for (i = 0; i < list->nsecrets; i++) { @@ -384,7 +384,7 @@ vshSecretListCollect(vshControl *ctl, unsigned int flags) { vshSecretListPtr list = vshMalloc(ctl, sizeof(*list)); - int i; + size_t i; int ret; virSecretPtr secret; bool success = false; @@ -509,7 +509,7 @@ static const vshCmdOptDef opts_secret_list[] = { static bool cmdSecretList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { - int i; + size_t i; vshSecretListPtr list = NULL; bool ret = false; unsigned int flags = 0; diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 7e75772..a315e28 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -233,7 +233,7 @@ vshParseSnapshotMemspec(vshControl *ctl, virBufferPtr buf, const char *str) const char *file = NULL; char **array = NULL; int narray; - int i; + size_t i; if (!str) return 0; @@ -278,7 +278,7 @@ vshParseSnapshotDiskspec(vshControl *ctl, virBufferPtr buf, const char *str) const char *file = NULL; char **array = NULL; int narray; - int i; + size_t i; narray = vshStringToArray(str, &array); if (narray <= 0) @@ -1056,7 +1056,7 @@ typedef struct vshSnapshotList *vshSnapshotListPtr; static void vshSnapshotListFree(vshSnapshotListPtr snaplist) { - int i; + size_t i; if (!snaplist) return; @@ -1095,7 +1095,7 @@ vshSnapshotListCollect(vshControl *ctl, virDomainPtr dom, virDomainSnapshotPtr from, unsigned int orig_flags, bool tree) { - int i; + size_t i; char **names = NULL; int count = -1; bool descendants = false; @@ -1347,7 +1347,7 @@ vshSnapshotListCollect(vshControl *ctl, virDomainPtr dom, changed = remaining = false; for (i = 0; i < count; i++) { bool found_parent = false; - int j; + size_t j; if (!names[i] || !snaplist->snaps[i].parent) continue; @@ -1517,7 +1517,7 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom = NULL; bool ret = false; unsigned int flags = 0; - int i; + size_t i; xmlDocPtr xml = NULL; xmlXPathContextPtr ctxt = NULL; char *doc = NULL; diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 35fb762..3166542 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -1185,7 +1185,7 @@ typedef struct vshStorageVolList *vshStorageVolListPtr; static void vshStorageVolListFree(vshStorageVolListPtr list) { - int i; + size_t i; if (list && list->vols) { for (i = 0; i < list->nvols; i++) { @@ -1203,7 +1203,7 @@ vshStorageVolListCollect(vshControl *ctl, unsigned int flags) { vshStorageVolListPtr list = vshMalloc(ctl, sizeof(*list)); - int i; + size_t i; char **names = NULL; virStorageVolPtr vol = NULL; bool success = false; @@ -1320,7 +1320,7 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) const char *unit; double val; bool details = vshCommandOptBool(cmd, "details"); - int i; + size_t i; int ret; bool functionReturn = false; int stringLength = 0; diff --git a/tools/virsh.c b/tools/virsh.c index af2bb76..63b9911 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -587,7 +587,7 @@ vshTreePrintInternal(vshControl *ctl, bool root, virBufferPtr indent) { - int i; + size_t i; int nextlastdev = -1; int ret = -1; const char *dev = (lookup)(devid, false, opaque); @@ -990,7 +990,7 @@ static int vshCmddefOptParse(const vshCmdDef *cmd, uint32_t *opts_need_arg, uint32_t *opts_required) { - int i; + size_t i; bool optional = false; *opts_need_arg = 0; @@ -1010,7 +1010,7 @@ vshCmddefOptParse(const vshCmdDef *cmd, uint32_t *opts_need_arg, continue; } if (opt->type == VSH_OT_ALIAS) { - int j; + size_t j; if (opt->flags || !opt->help) return -1; /* alias options are tracked by the original name */ for (j = i + 1; cmd->opts[j].name; j++) { @@ -1051,7 +1051,7 @@ static const vshCmdOptDef * vshCmddefGetOption(vshControl *ctl, const vshCmdDef *cmd, const char *name, uint32_t *opts_seen, int *opt_index) { - int i; + size_t i; if (STREQ(name, helpopt.name)) { return &helpopt; @@ -1086,7 +1086,7 @@ static const vshCmdOptDef * vshCmddefGetData(const vshCmdDef *cmd, uint32_t *opts_need_arg, uint32_t *opts_seen) { - int i; + size_t i; const vshCmdOptDef *opt; if (!*opts_need_arg) @@ -1109,7 +1109,7 @@ vshCommandCheckOpts(vshControl *ctl, const vshCmd *cmd, uint32_t opts_required, uint32_t opts_seen) { const vshCmdDef *def = cmd->def; - int i; + size_t i; opts_required &= ~opts_seen; if (!opts_required) @@ -2973,7 +2973,8 @@ vshAllowedEscapeChar(char c) static bool vshParseArgv(vshControl *ctl, int argc, char **argv) { - int arg, len, debug, i; + int arg, len, debug; + size_t i; int longindex = -1; struct option opt[] = { {"debug", required_argument, NULL, 'd'}, -- 1.8.1.4

On Tue, Jul 09, 2013 at 12:05:53PM +0200, Ján Tomko wrote: Squashing in diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index ac11e53..9d34c1a 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -461,9 +461,11 @@ finished: success = true; cleanup: - for (i = 0; i < nsecrets; i++) - VIR_FREE(uuids[i]); - VIR_FREE(uuids); + if (nsecrets > 0) { + for (i = 0; i < nsecrets; i++) + VIR_FREE(uuids[i]); + VIR_FREE(uuids); + } if (!success) { vshSecretListFree(list); diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index a315e28..cfe8ee9 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -1408,7 +1408,7 @@ success: cleanup: vshSnapshotListFree(snaplist); - if (names) + if (names && count > 0) for (i = 0; i < count; i++) VIR_FREE(names[i]); VIR_FREE(names); diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 3166542..7dab532 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -1273,8 +1273,9 @@ finished: success = true; cleanup: - for (i = 0; i < nvols; i++) - VIR_FREE(names[i]); + if (nvols > 0) + for (i = 0; i < nvols; i++) + VIR_FREE(names[i]); VIR_FREE(names); if (!success) { Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

On Tue, Jul 09, 2013 at 08:01:22PM +0800, Guannan Ren wrote: Squashing in diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 14fa79d..c08b0e9 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2937,8 +2937,8 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) char *def = NULL; char *source = NULL; char *target = NULL; - int vol_i; - int tok_i; + size_t i; + size_t j; xmlDocPtr doc = NULL; xmlXPathContextPtr ctxt = NULL; xmlNodePtr *vol_nodes = NULL; @@ -3046,8 +3046,8 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) if (nvolumes > 0) vlist = vshCalloc(ctl, nvolumes, sizeof(*vlist)); - for (vol_i = 0; vol_i < nvolumes; vol_i++) { - ctxt->node = vol_nodes[vol_i]; + for (i = 0; i < nvolumes; i++) { + ctxt->node = vol_nodes[i]; /* get volume source and target paths */ if (!(target = virXPathString("string(./target/@dev)", ctxt))) @@ -3067,12 +3067,12 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) /* lookup if volume was selected by user */ if (volumes) { volume_tok = NULL; - for (tok_i = 0; tok_i < nvolume_tokens; tok_i++) { - if (volume_tokens[tok_i] && - (STREQ(volume_tokens[tok_i], target) || - STREQ(volume_tokens[tok_i], source))) { - volume_tok = volume_tokens[tok_i]; - volume_tokens[tok_i] = NULL; + for (j = 0; j < nvolume_tokens; j++) { + if (volume_tokens[j] && + (STREQ(volume_tokens[j], target) || + STREQ(volume_tokens[j], source))) { + volume_tok = volume_tokens[j]; + volume_tokens[j] = NULL; break; } } @@ -3095,11 +3095,11 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) /* print volumes specified by user that were not found in domain definition */ if (volumes) { - for (tok_i = 0; tok_i < nvolume_tokens; tok_i++) { - if (volume_tokens[tok_i]) { + for (j = 0; j < nvolume_tokens; j++) { + if (volume_tokens[j]) { vshError(ctl, _("Volume '%s' was not found in domain's " "definition.\n"), - volume_tokens[tok_i]); + volume_tokens[j]); vol_not_found = true; } } @@ -3162,12 +3162,12 @@ out: /* try to undefine storage volumes associated with this domain, if it's requested */ if (nvols) { - for (vol_i = 0; vol_i < nvols; vol_i++) { + for (i = 0; i < nvols; i++) { if (wipe_storage) { vshPrint(ctl, _("Wiping volume '%s'(%s) ... "), - vlist[vol_i].target, vlist[vol_i].source); + vlist[i].target, vlist[i].source); fflush(stdout); - if (virStorageVolWipe(vlist[vol_i].vol, 0) < 0) { + if (virStorageVolWipe(vlist[i].vol, 0) < 0) { vshError(ctl, _("Failed! Volume not removed.")); ret = false; continue; @@ -3177,23 +3177,23 @@ out: } /* delete the volume */ - if (virStorageVolDelete(vlist[vol_i].vol, 0) < 0) { + if (virStorageVolDelete(vlist[i].vol, 0) < 0) { vshError(ctl, _("Failed to remove storage volume '%s'(%s)"), - vlist[vol_i].target, vlist[vol_i].source); + vlist[i].target, vlist[i].source); ret = false; } else { vshPrint(ctl, _("Volume '%s'(%s) removed.\n"), - vlist[vol_i].target, vlist[vol_i].source); + vlist[i].target, vlist[i].source); } } } cleanup: - for (vol_i = 0; vol_i < nvols; vol_i++) { - VIR_FREE(vlist[vol_i].source); - VIR_FREE(vlist[vol_i].target); - if (vlist[vol_i].vol) - virStorageVolFree(vlist[vol_i].vol); + for (i = 0; i < nvols; i++) { + VIR_FREE(vlist[i].source); + VIR_FREE(vlist[i].target); + if (vlist[i].vol) + virStorageVolFree(vlist[i].vol); } VIR_FREE(vlist); Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

On 07/08/2013 04:21 PM, Daniel P. Berrange wrote: This function gets called with startCells = -1, which is then assigned to i. On error: for (i = 0; i < ret; ++i) xenapiConnectNumOfDefinedDomains under this function uses 'int i' after this patch. ACK Jan

On 07/08/2013 10:21 PM, Daniel P. Berrange wrote: Missed int i in xenHypervisorLookupDomainByUUID() Guannan

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; Convert the type of loop iterators named 'i', 'j', k', 'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or 'unsigned int', also santizing 'ii', 'jj', 'kk' to use the normal 'i', 'j', 'k' naming Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/storage/storage_backend.c | 8 ++++---- src/storage/storage_backend_disk.c | 6 +++--- src/storage/storage_backend_fs.c | 2 +- src/storage/storage_backend_iscsi.c | 2 +- src/storage/storage_backend_logical.c | 10 ++++++---- src/storage/storage_backend_rbd.c | 4 ++-- src/storage/storage_driver.c | 19 +++++++++++-------- 7 files changed, 28 insertions(+), 23 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 9a3bcf8..fd42a99 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -640,7 +640,7 @@ virStorageBackendCreateQemuImgOpts(char **opts, { virBuffer buf = VIR_BUFFER_INITIALIZER; bool b; - int i; + size_t i; if (backingType) virBufferAsprintf(&buf, "backing_fmt=%s,", backingType); @@ -1077,7 +1077,7 @@ virStorageBackendGetBuildVolFromFunction(virStorageVolDefPtr vol, virStorageBackendPtr virStorageBackendForType(int type) { - unsigned int i; + size_t i; for (i = 0; backends[i]; i++) if (backends[i]->type == type) return backends[i]; @@ -1372,7 +1372,7 @@ int virStorageBackendDetectBlockVolFormatFD(virStorageVolTargetPtr target, int fd) { - int i; + size_t i; off_t start; unsigned char buffer[1024]; ssize_t bytes; @@ -1674,7 +1674,7 @@ virStorageBackendRunProgNul(virStoragePoolObjPtr pool, FILE *fp = NULL; char **v; int ret = -1; - int i; + size_t i; if (n_columns == 0) return -1; diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index d0b91f9..5f454f2 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -437,7 +437,7 @@ virStorageBackendDiskPartTypeToCreate(virStoragePoolObjPtr pool) if (pool->def->source.format == VIR_STORAGE_POOL_DISK_DOS) { /* count primary and extended paritions, can't be more than 3 to create a new primary partition */ - int i; + size_t i; int count = 0; for (i = 0; i < pool->volumes.count; i++) { if (pool->volumes.objs[i]->target.type == VIR_STORAGE_VOL_DISK_TYPE_PRIMARY || @@ -459,7 +459,7 @@ virStorageBackendDiskPartFormat(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, char** partFormat) { - int i; + size_t i; if (pool->def->source.format == VIR_STORAGE_POOL_DISK_DOS) { const char *partedFormat; partedFormat = virStoragePartedFsTypeTypeToString(vol->target.format); @@ -536,7 +536,7 @@ virStorageBackendDiskPartBoundries(virStoragePoolObjPtr pool, unsigned long long *end, unsigned long long allocation) { - int i; + size_t i; int smallestExtent = -1; unsigned long long smallestSize = 0; unsigned long long extraBytes = 0; diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 3598d83..906100b 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -257,7 +257,7 @@ virStorageBackendFileSystemNetFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSE }; virStoragePoolSourcePtr source = NULL; char *retval = NULL; - unsigned int i; + size_t i; virCommandPtr cmd = NULL; virCheckFlags(0, NULL); diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 0a4cd22..350c42d 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -555,7 +555,7 @@ virStorageBackendISCSIFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED, size_t ntargets = 0; char **targets = NULL; char *ret = NULL; - int i; + size_t i; virStoragePoolSourceList list = { .type = VIR_STORAGE_POOL_ISCSI, .nsources = 0, diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 944aa0e..bf2d627 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -77,7 +77,8 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, regex_t *reg = NULL; regmatch_t *vars = NULL; char *p = NULL; - int i, err, nextents, nvars, ret = -1; + size_t i; + int err, nextents, nvars, ret = -1; const char *attrs = groups[9]; /* Skip inactive volume */ @@ -229,7 +230,8 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, /* vars[0] is skipped */ for (i = 0; i < nextents; i++) { - int j, len; + size_t j; + int len; char *offset_str = NULL; j = (i * 2) + 1; @@ -355,7 +357,7 @@ virStorageBackendLogicalFindPoolSourcesFunc(virStoragePoolObjPtr pool ATTRIBUTE_ virStoragePoolSourceListPtr sourceList = data; char *pvname = NULL; char *vgname = NULL; - int i; + size_t i; virStoragePoolSourceDevicePtr dev; virStoragePoolSource *thisSource; @@ -420,7 +422,7 @@ virStorageBackendLogicalFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED, virCommandPtr cmd; char *retval = NULL; virStoragePoolSourceList sourceList; - int i; + size_t i; virCheckFlags(0, NULL); diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 953a8ee..9d2455c 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -56,7 +56,7 @@ static int virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr *ptr, virBuffer mon_host = VIR_BUFFER_INITIALIZER; virSecretPtr secret = NULL; char secretUuid[VIR_UUID_STRING_BUFLEN]; - int i; + size_t i; char *mon_buff = NULL; VIR_DEBUG("Found Cephx username: %s", @@ -264,7 +264,7 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, size_t max_size = 1024; int ret = -1; int len = -1; - int i; + size_t i; char *name, *names = NULL; virStorageBackendRBDStatePtr ptr; ptr.cluster = NULL; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index d15b3d4..d90d164 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -67,7 +67,7 @@ static void storageDriverUnlock(virStorageDriverStatePtr driver) static void storageDriverAutostart(virStorageDriverStatePtr driver) { - unsigned int i; + size_t i; for (i = 0; i < driver->pools.count; i++) { virStoragePoolObjPtr pool = driver->pools.objs[i]; @@ -341,7 +341,8 @@ storageClose(virConnectPtr conn) { static int storageConnectNumOfStoragePools(virConnectPtr conn) { virStorageDriverStatePtr driver = conn->storagePrivateData; - unsigned int i, nactive = 0; + size_t i; + int nactive = 0; if (virConnectNumOfStoragePoolsEnsureACL(conn) < 0) return -1; @@ -398,7 +399,8 @@ storageConnectListStoragePools(virConnectPtr conn, static int storageConnectNumOfDefinedStoragePools(virConnectPtr conn) { virStorageDriverStatePtr driver = conn->storagePrivateData; - unsigned int i, nactive = 0; + size_t i; + int nactive = 0; if (virConnectNumOfDefinedStoragePoolsEnsureACL(conn) < 0) return -1; @@ -1199,7 +1201,8 @@ storagePoolListVolumes(virStoragePoolPtr obj, int maxnames) { virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool; - int i, n = 0; + size_t i; + int n = 0; memset(names, 0, maxnames * sizeof(*names)); @@ -1249,7 +1252,7 @@ storagePoolListAllVolumes(virStoragePoolPtr pool, unsigned int flags) { virStorageDriverStatePtr driver = pool->conn->storagePrivateData; virStoragePoolObjPtr obj; - int i; + size_t i; virStorageVolPtr *tmp_vols = NULL; virStorageVolPtr vol = NULL; int nvols = 0; @@ -1369,7 +1372,7 @@ static virStorageVolPtr storageVolLookupByKey(virConnectPtr conn, const char *key) { virStorageDriverStatePtr driver = conn->storagePrivateData; - unsigned int i; + size_t i; virStorageVolPtr ret = NULL; storageDriverLock(driver); @@ -1408,7 +1411,7 @@ static virStorageVolPtr storageVolLookupByPath(virConnectPtr conn, const char *path) { virStorageDriverStatePtr driver = conn->storagePrivateData; - unsigned int i; + size_t i; virStorageVolPtr ret = NULL; char *cleanpath; @@ -2282,7 +2285,7 @@ storageVolDelete(virStorageVolPtr obj, virStoragePoolObjPtr pool; virStorageBackendPtr backend; virStorageVolDefPtr vol = NULL; - unsigned int i; + size_t i; int ret = -1; storageDriverLock(driver); -- 1.8.1.4

On 07/08/2013 10:21 PM, Daniel P. Berrange wrote: missed int i, j in virStorageBackendRunProgRegex() missed storageConnectListStoragePools() storageConnectListDefinedStoragePools() storagePoolNumOfVolumes() Guannan

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; Convert the type of loop iterators named 'i', 'j', k', 'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or 'unsigned int', also santizing 'ii', 'jj', 'kk' to use the normal 'i', 'j', 'k' naming Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/vbox/vbox_XPCOMCGlue.c | 6 +- src/vbox/vbox_tmpl.c | 159 +++++++++++++++++++++++---------------------- 2 files changed, 85 insertions(+), 80 deletions(-) diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index 271d9ef..38d079b 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -186,7 +186,7 @@ cleanup: int VBoxCGlueInit(unsigned int *version) { - int i; + size_t i; static const char *knownDirs[] = { "/usr/lib/virtualbox", "/usr/lib/virtualbox-ose", @@ -336,7 +336,7 @@ vboxArrayGetWithUintArg(vboxArray *array, void *self, void *getter, PRUint32 arg void vboxArrayRelease(vboxArray *array) { - int i; + size_t i; nsISupports *supports; if (array->items == NULL) { @@ -363,7 +363,7 @@ vboxArrayRelease(vboxArray *array) void vboxArrayUnalloc(vboxArray *array) { - int i; + size_t i; void *item; if (array->items == NULL) { diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index d6d34c1..f551762 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -289,7 +289,7 @@ static void nsIDtoChar(unsigned char *uuid, const nsID *iid) { char uuidstrsrc[VIR_UUID_STRING_BUFLEN]; char uuidstrdst[VIR_UUID_STRING_BUFLEN]; unsigned char uuidinterim[VIR_UUID_BUFLEN]; - int i; + size_t i; memcpy(uuidinterim, iid, VIR_UUID_BUFLEN); virUUIDFormat(uuidinterim, uuidstrsrc); @@ -329,7 +329,7 @@ static void nsIDFromChar(nsID *iid, const unsigned char *uuid) { char uuidstrsrc[VIR_UUID_STRING_BUFLEN]; char uuidstrdst[VIR_UUID_STRING_BUFLEN]; unsigned char uuidinterim[VIR_UUID_BUFLEN]; - int i; + size_t i; virUUIDFormat(uuid, uuidstrsrc); @@ -1151,7 +1151,7 @@ static int vboxConnectListDomains(virConnectPtr conn, int *ids, int nids) { vboxArray machines = VBOX_ARRAY_INITIALIZER; PRUint32 state; nsresult rc; - int i, j; + size_t i, j; rc = vboxArrayGet(&machines, data->vboxObj, data->vboxObj->vtbl->GetMachines); if (NS_FAILED(rc)) { @@ -1188,7 +1188,7 @@ static int vboxConnectNumOfDomains(virConnectPtr conn) { vboxArray machines = VBOX_ARRAY_INITIALIZER; PRUint32 state; nsresult rc; - int i; + size_t i; rc = vboxArrayGet(&machines, data->vboxObj, data->vboxObj->vtbl->GetMachines); if (NS_FAILED(rc)) { @@ -1319,7 +1319,8 @@ static virDomainPtr vboxDomainLookupByUUID(virConnectPtr conn, const unsigned ch char *machineNameUtf8 = NULL; PRUnichar *machineNameUtf16 = NULL; unsigned char iid_as_uuid[VIR_UUID_BUFLEN]; - int i, matched = 0; + size_t i; + int matched = 0; nsresult rc; rc = vboxArrayGet(&machines, data->vboxObj, data->vboxObj->vtbl->GetMachines); @@ -1389,7 +1390,8 @@ static virDomainPtr vboxDomainLookupByName(virConnectPtr conn, const char *name) char *machineNameUtf8 = NULL; PRUnichar *machineNameUtf16 = NULL; unsigned char uuid[VIR_UUID_BUFLEN]; - int i, matched = 0; + size_t i; + int matched = 0; nsresult rc; rc = vboxArrayGet(&machines, data->vboxObj, data->vboxObj->vtbl->GetMachines); @@ -1457,7 +1459,8 @@ static int vboxDomainIsActive(virDomainPtr dom) { char *machineNameUtf8 = NULL; PRUnichar *machineNameUtf16 = NULL; unsigned char uuid[VIR_UUID_BUFLEN]; - int i, matched = 0; + size_t i; + int matched = 0; nsresult rc; rc = vboxArrayGet(&machines, data->vboxObj, data->vboxObj->vtbl->GetMachines); @@ -1917,7 +1920,7 @@ static int vboxDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) { char *machineName = NULL; PRUnichar *machineNameUtf16 = NULL; nsresult rc; - int i = 0; + size_t i = 0; rc = vboxArrayGet(&machines, data->vboxObj, data->vboxObj->vtbl->GetMachines); if (NS_FAILED(rc)) { @@ -2252,7 +2255,7 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) { machine->vtbl->GetAccessible(machine, &accessible); if (accessible) { - int i = 0; + size_t i = 0; PRBool PAEEnabled = PR_FALSE; PRBool ACPIEnabled = PR_FALSE; PRBool IOAPICEnabled = PR_FALSE; @@ -3459,7 +3462,7 @@ static int vboxConnectListDefinedDomains(virConnectPtr conn, char ** const names PRUnichar *machineNameUtf16 = NULL; PRUint32 state; nsresult rc; - int i, j; + size_t i, j; rc = vboxArrayGet(&machines, data->vboxObj, data->vboxObj->vtbl->GetMachines); if (NS_FAILED(rc)) { @@ -3469,6 +3472,8 @@ static int vboxConnectListDefinedDomains(virConnectPtr conn, char ** const names goto cleanup; } + memset(names, 0, sizeof(names[i]) * maxnames); + ret = 0; for (i = 0, j = 0; (i < machines.count) && (j < maxnames); i++) { IMachine *machine = machines.items[i]; @@ -3485,7 +3490,7 @@ static int vboxConnectListDefinedDomains(virConnectPtr conn, char ** const names if (VIR_STRDUP(names[j], machineName) < 0) { VBOX_UTF16_FREE(machineNameUtf16); VBOX_UTF8_FREE(machineName); - for (; j >= 0; j--) + for (j = 0; j < maxnames; j++) VIR_FREE(names[j]); ret = -1; goto cleanup; @@ -3509,7 +3514,7 @@ static int vboxConnectNumOfDefinedDomains(virConnectPtr conn) { vboxArray machines = VBOX_ARRAY_INITIALIZER; PRUint32 state = MachineState_Null; nsresult rc; - int i; + size_t i; rc = vboxArrayGet(&machines, data->vboxObj, data->vboxObj->vtbl->GetMachines); if (NS_FAILED(rc)) { @@ -3543,7 +3548,7 @@ cleanup: static int -vboxStartMachine(virDomainPtr dom, int i, IMachine *machine, +vboxStartMachine(virDomainPtr dom, int maxDomID, IMachine *machine, vboxIID *iid ATTRIBUTE_UNUSED /* >= 4.0 */) { VBOX_OBJECT_CHECK(dom->conn, int, -1); @@ -3694,7 +3699,7 @@ vboxStartMachine(virDomainPtr dom, int i, IMachine *machine, ret = -1; } else { /* all ok set the domid */ - dom->id = i + 1; + dom->id = maxDomID + 1; ret = 0; } } @@ -3714,7 +3719,7 @@ static int vboxDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) { vboxArray machines = VBOX_ARRAY_INITIALIZER; unsigned char uuid[VIR_UUID_BUFLEN] = {0}; nsresult rc; - int i = 0; + size_t i = 0; virCheckFlags(0, -1); @@ -3786,7 +3791,7 @@ vboxSetBootDeviceOrder(virDomainDefPtr def, vboxGlobalData *data, { ISystemProperties *systemProperties = NULL; PRUint32 maxBootPosition = 0; - int i = 0; + size_t i = 0; VIR_DEBUG("def->os.type %s", def->os.type); VIR_DEBUG("def->os.arch %s", virArchToString(def->os.arch)); @@ -3837,7 +3842,7 @@ vboxSetBootDeviceOrder(virDomainDefPtr def, vboxGlobalData *data, static void vboxAttachDrives(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) { - int i; + size_t i; nsresult rc; #if VBOX_API_VERSION < 3001 @@ -3845,18 +3850,18 @@ vboxAttachDrives(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) return; for (i = 0; i < def->ndisks; i++) { - VIR_DEBUG("disk(%d) type: %d", i, def->disks[i]->type); - VIR_DEBUG("disk(%d) device: %d", i, def->disks[i]->device); - VIR_DEBUG("disk(%d) bus: %d", i, def->disks[i]->bus); - VIR_DEBUG("disk(%d) src: %s", i, def->disks[i]->src); - VIR_DEBUG("disk(%d) dst: %s", i, def->disks[i]->dst); - VIR_DEBUG("disk(%d) driverName: %s", i, def->disks[i]->driverName); - VIR_DEBUG("disk(%d) driverType: %s", i, + VIR_DEBUG("disk(%zu) type: %d", i, def->disks[i]->type); + VIR_DEBUG("disk(%zu) device: %d", i, def->disks[i]->device); + VIR_DEBUG("disk(%zu) bus: %d", i, def->disks[i]->bus); + VIR_DEBUG("disk(%zu) src: %s", i, def->disks[i]->src); + VIR_DEBUG("disk(%zu) dst: %s", i, def->disks[i]->dst); + VIR_DEBUG("disk(%zu) driverName: %s", i, def->disks[i]->driverName); + VIR_DEBUG("disk(%zu) driverType: %s", i, virStorageFileFormatTypeToString(def->disks[i]->format)); - VIR_DEBUG("disk(%d) cachemode: %d", i, def->disks[i]->cachemode); - VIR_DEBUG("disk(%d) readonly: %s", i, (def->disks[i]->readonly + VIR_DEBUG("disk(%zu) cachemode: %d", i, def->disks[i]->cachemode); + VIR_DEBUG("disk(%zu) readonly: %s", i, (def->disks[i]->readonly ? "True" : "False")); - VIR_DEBUG("disk(%d) shared: %s", i, (def->disks[i]->shared + VIR_DEBUG("disk(%zu) shared: %s", i, (def->disks[i]->shared ? "True" : "False")); if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM) { @@ -4126,18 +4131,18 @@ vboxAttachDrives(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) } for (i = 0; i < def->ndisks && !error; i++) { - VIR_DEBUG("disk(%d) type: %d", i, def->disks[i]->type); - VIR_DEBUG("disk(%d) device: %d", i, def->disks[i]->device); - VIR_DEBUG("disk(%d) bus: %d", i, def->disks[i]->bus); - VIR_DEBUG("disk(%d) src: %s", i, def->disks[i]->src); - VIR_DEBUG("disk(%d) dst: %s", i, def->disks[i]->dst); - VIR_DEBUG("disk(%d) driverName: %s", i, def->disks[i]->driverName); - VIR_DEBUG("disk(%d) driverType: %s", i, + VIR_DEBUG("disk(%zu) type: %d", i, def->disks[i]->type); + VIR_DEBUG("disk(%zu) device: %d", i, def->disks[i]->device); + VIR_DEBUG("disk(%zu) bus: %d", i, def->disks[i]->bus); + VIR_DEBUG("disk(%zu) src: %s", i, def->disks[i]->src); + VIR_DEBUG("disk(%zu) dst: %s", i, def->disks[i]->dst); + VIR_DEBUG("disk(%zu) driverName: %s", i, def->disks[i]->driverName); + VIR_DEBUG("disk(%zu) driverType: %s", i, virStorageFileFormatTypeToString(def->disks[i]->format)); - VIR_DEBUG("disk(%d) cachemode: %d", i, def->disks[i]->cachemode); - VIR_DEBUG("disk(%d) readonly: %s", i, (def->disks[i]->readonly + VIR_DEBUG("disk(%zu) cachemode: %d", i, def->disks[i]->cachemode); + VIR_DEBUG("disk(%zu) readonly: %s", i, (def->disks[i]->readonly ? "True" : "False")); - VIR_DEBUG("disk(%d) shared: %s", i, (def->disks[i]->shared + VIR_DEBUG("disk(%zu) shared: %s", i, (def->disks[i]->shared ? "True" : "False")); if (def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_FILE && @@ -4368,7 +4373,7 @@ vboxAttachNetwork(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) PRUint32 chipsetType = ChipsetType_Null; #endif /* VBOX_API_VERSION >= 4001 */ PRUint32 networkAdapterCount = 0; - int i = 0; + size_t i = 0; #if VBOX_API_VERSION >= 4001 machine->vtbl->GetChipsetType(machine, &chipsetType); @@ -4407,20 +4412,20 @@ vboxAttachNetwork(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) def->nets[i]->mac.addr[5]); macaddrvbox[VIR_MAC_STRING_BUFLEN - 6] = '\0'; - VIR_DEBUG("NIC(%d): Type: %d", i, def->nets[i]->type); - VIR_DEBUG("NIC(%d): Model: %s", i, def->nets[i]->model); - VIR_DEBUG("NIC(%d): Mac: %s", i, macaddr); - VIR_DEBUG("NIC(%d): ifname: %s", i, def->nets[i]->ifname); + VIR_DEBUG("NIC(%zu): Type: %d", i, def->nets[i]->type); + VIR_DEBUG("NIC(%zu): Model: %s", i, def->nets[i]->model); + VIR_DEBUG("NIC(%zu): Mac: %s", i, macaddr); + VIR_DEBUG("NIC(%zu): ifname: %s", i, def->nets[i]->ifname); if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_NETWORK) { - VIR_DEBUG("NIC(%d): name: %s", i, def->nets[i]->data.network.name); + VIR_DEBUG("NIC(%zu): name: %s", i, def->nets[i]->data.network.name); } else if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_INTERNAL) { - VIR_DEBUG("NIC(%d): name: %s", i, def->nets[i]->data.internal.name); + VIR_DEBUG("NIC(%zu): name: %s", i, def->nets[i]->data.internal.name); } else if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_USER) { - VIR_DEBUG("NIC(%d): NAT.", i); + VIR_DEBUG("NIC(%zu): NAT.", i); } else if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_BRIDGE) { - VIR_DEBUG("NIC(%d): brname: %s", i, def->nets[i]->data.bridge.brname); - VIR_DEBUG("NIC(%d): script: %s", i, def->nets[i]->script); - VIR_DEBUG("NIC(%d): ipaddr: %s", i, def->nets[i]->data.bridge.ipaddr); + VIR_DEBUG("NIC(%zu): brname: %s", i, def->nets[i]->data.bridge.brname); + VIR_DEBUG("NIC(%zu): script: %s", i, def->nets[i]->script); + VIR_DEBUG("NIC(%zu): ipaddr: %s", i, def->nets[i]->data.bridge.ipaddr); } machine->vtbl->GetNetworkAdapter(machine, i, &adapter); @@ -4539,7 +4544,7 @@ vboxAttachSerial(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) { ISystemProperties *systemProperties = NULL; PRUint32 serialPortCount = 0; - int i = 0; + size_t i = 0; data->vboxObj->vtbl->GetSystemProperties(data->vboxObj, &systemProperties); if (systemProperties) { @@ -4554,8 +4559,8 @@ vboxAttachSerial(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) for (i = 0; (i < def->nserials) && (i < serialPortCount); i++) { ISerialPort *serialPort = NULL; - VIR_DEBUG("SerialPort(%d): Type: %d", i, def->serials[i]->source.type); - VIR_DEBUG("SerialPort(%d): target.port: %d", i, + VIR_DEBUG("SerialPort(%zu): Type: %d", i, def->serials[i]->source.type); + VIR_DEBUG("SerialPort(%zu): target.port: %d", i, def->serials[i]->target.port); machine->vtbl->GetSerialPort(machine, i, &serialPort); @@ -4582,12 +4587,12 @@ vboxAttachSerial(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) if (def->serials[i]->target.port == 0) { serialPort->vtbl->SetIRQ(serialPort, 4); serialPort->vtbl->SetIOBase(serialPort, 1016); - VIR_DEBUG(" serialPort-%d irq: %d, iobase 0x%x, path: %s", + VIR_DEBUG(" serialPort-%zu irq: %d, iobase 0x%x, path: %s", i, 4, 1016, def->serials[i]->source.data.file.path); } else if (def->serials[i]->target.port == 1) { serialPort->vtbl->SetIRQ(serialPort, 3); serialPort->vtbl->SetIOBase(serialPort, 760); - VIR_DEBUG(" serialPort-%d irq: %d, iobase 0x%x, path: %s", + VIR_DEBUG(" serialPort-%zu irq: %d, iobase 0x%x, path: %s", i, 3, 760, def->serials[i]->source.data.file.path); } @@ -4615,7 +4620,7 @@ vboxAttachParallel(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) { ISystemProperties *systemProperties = NULL; PRUint32 parallelPortCount = 0; - int i = 0; + size_t i = 0; data->vboxObj->vtbl->GetSystemProperties(data->vboxObj, &systemProperties); if (systemProperties) { @@ -4630,8 +4635,8 @@ vboxAttachParallel(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) for (i = 0; (i < def->nparallels) && (i < parallelPortCount); i++) { IParallelPort *parallelPort = NULL; - VIR_DEBUG("ParallelPort(%d): Type: %d", i, def->parallels[i]->source.type); - VIR_DEBUG("ParallelPort(%d): target.port: %d", i, + VIR_DEBUG("ParallelPort(%zu): Type: %d", i, def->parallels[i]->source.type); + VIR_DEBUG("ParallelPort(%zu): target.port: %d", i, def->parallels[i]->target.port); machine->vtbl->GetParallelPort(machine, i, &parallelPort); @@ -4653,12 +4658,12 @@ vboxAttachParallel(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) if (i == 0) { parallelPort->vtbl->SetIRQ(parallelPort, 7); parallelPort->vtbl->SetIOBase(parallelPort, 888); - VIR_DEBUG(" parallePort-%d irq: %d, iobase 0x%x, path: %s", + VIR_DEBUG(" parallePort-%zu irq: %d, iobase 0x%x, path: %s", i, 7, 888, def->parallels[i]->source.data.file.path); } else if (i == 1) { parallelPort->vtbl->SetIRQ(parallelPort, 5); parallelPort->vtbl->SetIOBase(parallelPort, 632); - VIR_DEBUG(" parallePort-%d irq: %d, iobase 0x%x, path: %s", + VIR_DEBUG(" parallePort-%zu irq: %d, iobase 0x%x, path: %s", i, 5, 632, def->parallels[i]->source.data.file.path); } } @@ -4706,7 +4711,7 @@ vboxAttachDisplay(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) int guiPresent = 0; char *guiDisplay = NULL; char *sdlDisplay = NULL; - int i = 0; + size_t i = 0; for (i = 0; i < def->ngraphics; i++) { #if VBOX_API_VERSION < 4000 @@ -4895,7 +4900,7 @@ static void vboxAttachUSB(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) { IUSBController *USBController = NULL; - int i = 0; + size_t i = 0; bool isUSB = false; if (def->nhostdevs == 0) @@ -4949,7 +4954,7 @@ vboxAttachUSB(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) /* Zero pad for nice alignment when fewer than 9999 * devices. */ - if (virAsprintf(&filtername, "filter%04d", i) < 0) { + if (virAsprintf(&filtername, "filter%04zu", i) < 0) { virReportOOMError(); } else { VBOX_UTF8_TO_UTF16(filtername, &filternameUtf16); @@ -5002,7 +5007,7 @@ vboxAttachUSB(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) static void vboxAttachSharedFolder(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) { - int i; + size_t i; PRUnichar *nameUtf16; PRUnichar *hostPathUtf16; PRBool writable; @@ -5269,7 +5274,7 @@ vboxDomainUndefineFlags(virDomainPtr dom, unsigned int flags) * remove them all so that the machine can be undefined */ vboxArray storageControllers = VBOX_ARRAY_INITIALIZER; - int i = 0, j = 0; + size_t i = 0, j = 0; vboxArrayGet(&storageControllers, machine, machine->vtbl->GetStorageControllers); @@ -5819,7 +5824,7 @@ vboxDomainSnapshotGetAll(virDomainPtr dom, top = 1; for (next = 0; next < count; next++) { vboxArray children = VBOX_ARRAY_INITIALIZER; - unsigned int i; + size_t i; if (!list[next]) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -5874,7 +5879,7 @@ vboxDomainSnapshotGet(vboxGlobalData *data, ISnapshot *snapshot = NULL; nsresult rc; int count = 0; - int i; + size_t i; if ((count = vboxDomainSnapshotGetAll(dom, machine, &snapshots)) < 0) goto cleanup; @@ -6208,7 +6213,7 @@ vboxDomainSnapshotListNames(virDomainPtr dom, nsresult rc; ISnapshot **snapshots = NULL; int count = 0; - int i; + size_t i; virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_ROOTS | VIR_DOMAIN_SNAPSHOT_LIST_METADATA, -1); @@ -6826,7 +6831,7 @@ vboxDomainSnapshotDeleteTree(vboxGlobalData *data, vboxArray children = VBOX_ARRAY_INITIALIZER; int ret = -1; nsresult rc; - unsigned int i; + size_t i; rc = vboxArrayGet(&children, snapshot, snapshot->vtbl->GetChildren); if (NS_FAILED(rc)) { @@ -7489,7 +7494,7 @@ static int vboxNetworkClose(virConnectPtr conn) { static int vboxConnectNumOfNetworks(virConnectPtr conn) { VBOX_OBJECT_HOST_CHECK(conn, int, 0); vboxArray networkInterfaces = VBOX_ARRAY_INITIALIZER; - int i = 0; + size_t i = 0; vboxArrayGet(&networkInterfaces, host, host->vtbl->GetNetworkInterfaces); @@ -7522,7 +7527,7 @@ static int vboxConnectNumOfNetworks(virConnectPtr conn) { static int vboxConnectListNetworks(virConnectPtr conn, char **const names, int nnames) { VBOX_OBJECT_HOST_CHECK(conn, int, 0); vboxArray networkInterfaces = VBOX_ARRAY_INITIALIZER; - int i = 0; + size_t i = 0; vboxArrayGet(&networkInterfaces, host, host->vtbl->GetNetworkInterfaces); @@ -7567,7 +7572,7 @@ static int vboxConnectListNetworks(virConnectPtr conn, char **const names, int n static int vboxConnectNumOfDefinedNetworks(virConnectPtr conn) { VBOX_OBJECT_HOST_CHECK(conn, int, 0); vboxArray networkInterfaces = VBOX_ARRAY_INITIALIZER; - int i = 0; + size_t i = 0; vboxArrayGet(&networkInterfaces, host, host->vtbl->GetNetworkInterfaces); @@ -7600,7 +7605,7 @@ static int vboxConnectNumOfDefinedNetworks(virConnectPtr conn) { static int vboxConnectListDefinedNetworks(virConnectPtr conn, char **const names, int nnames) { VBOX_OBJECT_HOST_CHECK(conn, int, 0); vboxArray networkInterfaces = VBOX_ARRAY_INITIALIZER; - int i = 0; + size_t i = 0; vboxArrayGet(&networkInterfaces, host, host->vtbl->GetNetworkInterfaces); @@ -8344,7 +8349,7 @@ static int vboxStoragePoolNumOfVolumes(virStoragePoolPtr pool) { vboxArray hardDisks = VBOX_ARRAY_INITIALIZER; PRUint32 hardDiskAccessible = 0; nsresult rc; - int i; + size_t i; rc = vboxArrayGet(&hardDisks, data->vboxObj, data->vboxObj->vtbl->GetHardDisks); if (NS_SUCCEEDED(rc)) { @@ -8377,7 +8382,7 @@ static int vboxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names vboxArray hardDisks = VBOX_ARRAY_INITIALIZER; PRUint32 numActive = 0; nsresult rc; - int i; + size_t i; rc = vboxArrayGet(&hardDisks, data->vboxObj, data->vboxObj->vtbl->GetHardDisks); if (NS_SUCCEEDED(rc)) { @@ -8424,7 +8429,7 @@ static virStorageVolPtr vboxStorageVolLookupByName(virStoragePoolPtr pool, const VBOX_OBJECT_CHECK(pool->conn, virStorageVolPtr, NULL); vboxArray hardDisks = VBOX_ARRAY_INITIALIZER; nsresult rc; - int i; + size_t i; if (!name) return ret; @@ -8729,8 +8734,8 @@ static int vboxStorageVolDelete(virStorageVolPtr vol, IHardDisk *hardDisk = NULL; int deregister = 0; nsresult rc; - int i = 0; - int j = 0; + size_t i = 0; + size_t j = 0; virCheckFlags(0, -1); @@ -9281,7 +9286,7 @@ vboxConnectListAllDomains(virConnectPtr conn, vboxIID iid = VBOX_IID_INITIALIZER; PRUint32 state; nsresult rc; - int i; + size_t i; virDomainPtr dom; virDomainPtr *doms = NULL; int count = 0; -- 1.8.1.4

On 07/08/2013 04:21 PM, Daniel P. Berrange wrote: startCell can be -1 here. ACK Jan

On Wed, Jul 10, 2013 at 12:05:25PM +0800, Guannan Ren wrote: Squashing in diff --git a/src/test/test_driver.c b/src/test/test_driver.c index b1c1917..f7eaf06 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2532,7 +2532,8 @@ static int testNodeGetCellsFreeMemory(virConnectPtr conn, unsigned long long *freemems, int startCell, int maxCells) { testConnPtr privconn = conn->privateData; - size_t i, j; + int cell; + size_t i; int ret = -1; testDriverLock(privconn); @@ -2542,12 +2543,12 @@ static int testNodeGetCellsFreeMemory(virConnectPtr conn, goto cleanup; } - for (i = startCell, j = 0; - (i < privconn->numCells && j < maxCells); - ++i, ++j) { - freemems[j] = privconn->cells[i].mem; + for (cell = startCell, i = 0; + (cell < privconn->numCells && i < maxCells); + ++cell, ++i) { + freemems[i] = privconn->cells[cell].mem; } - ret = j; + ret = i; cleanup: testDriverUnlock(privconn); @@ -2766,7 +2767,8 @@ testDomainSetSchedulerParametersFlags(virDomainPtr domain, { testConnPtr privconn = domain->conn->privateData; virDomainObjPtr privdom; - int ret = -1, i; + int ret = -1; + size_t i; virCheckFlags(0, -1); if (virTypedParamsValidate(params, nparams, @@ -2984,7 +2986,8 @@ cleanup: static int testConnectNumOfNetworks(virConnectPtr conn) { testConnPtr privconn = conn->privateData; - int numActive = 0, i; + int numActive = 0; + size_t i; testDriverLock(privconn); for (i = 0; i < privconn->networks.count; i++) { @@ -3000,7 +3003,8 @@ static int testConnectNumOfNetworks(virConnectPtr conn) { static int testConnectListNetworks(virConnectPtr conn, char **const names, int nnames) { testConnPtr privconn = conn->privateData; - int n = 0, i; + int n = 0; + size_t i; testDriverLock(privconn); memset(names, 0, sizeof(*names)*nnames); @@ -3026,7 +3030,8 @@ error: static int testConnectNumOfDefinedNetworks(virConnectPtr conn) { testConnPtr privconn = conn->privateData; - int numInactive = 0, i; + int numInactive = 0; + size_t i; testDriverLock(privconn); for (i = 0; i < privconn->networks.count; i++) { @@ -3042,7 +3047,8 @@ static int testConnectNumOfDefinedNetworks(virConnectPtr conn) { static int testConnectListDefinedNetworks(virConnectPtr conn, char **const names, int nnames) { testConnPtr privconn = conn->privateData; - int n = 0, i; + int n = 0; + size_t i; testDriverLock(privconn); memset(names, 0, sizeof(*names)*nnames); @@ -3470,7 +3476,8 @@ static int testConnectNumOfInterfaces(virConnectPtr conn) static int testConnectListInterfaces(virConnectPtr conn, char **const names, int nnames) { testConnPtr privconn = conn->privateData; - int n = 0, i; + int n = 0; + size_t i; testDriverLock(privconn); memset(names, 0, sizeof(*names)*nnames); @@ -3516,7 +3523,8 @@ static int testConnectNumOfDefinedInterfaces(virConnectPtr conn) static int testConnectListDefinedInterfaces(virConnectPtr conn, char **const names, int nnames) { testConnPtr privconn = conn->privateData; - int n = 0, i; + int n = 0; + size_t i; testDriverLock(privconn); memset(names, 0, sizeof(*names)*nnames); @@ -3942,7 +3950,8 @@ testStoragePoolLookupByVolume(virStorageVolPtr vol) { static int testConnectNumOfStoragePools(virConnectPtr conn) { testConnPtr privconn = conn->privateData; - int numActive = 0, i; + int numActive = 0; + size_t i; testDriverLock(privconn); for (i = 0; i < privconn->pools.count; i++) @@ -3958,7 +3967,8 @@ testConnectListStoragePools(virConnectPtr conn, char **const names, int nnames) { testConnPtr privconn = conn->privateData; - int n = 0, i; + int n = 0; + size_t i; testDriverLock(privconn); memset(names, 0, sizeof(*names)*nnames); @@ -3985,7 +3995,8 @@ error: static int testConnectNumOfDefinedStoragePools(virConnectPtr conn) { testConnPtr privconn = conn->privateData; - int numInactive = 0, i; + int numInactive = 0; + size_t i; testDriverLock(privconn); for (i = 0; i < privconn->pools.count; i++) { @@ -4004,7 +4015,8 @@ testConnectListDefinedStoragePools(virConnectPtr conn, char **const names, int nnames) { testConnPtr privconn = conn->privateData; - int n = 0, i; + int n = 0; + size_t i; testDriverLock(privconn); memset(names, 0, sizeof(*names)*nnames); Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

On 07/08/2013 10:21 PM, Daniel P. Berrange wrote: here I think ssize idx is better useless blank line here. ACK

On Wed, Jul 10, 2013 at 10:15:27AM +0200, Ján Tomko wrote: No it doesn't actually. Lets say ncleanupCallbacks = 5 Old code 1st iteration: i == 4, callback 4 is run New code, 1st iteration i == 0, callback (ncleanupCallbacks - (i + 1)) == (5 - (0 + 1)) == 4 is run Squashing in diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0756976..798a9b4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7505,12 +7505,14 @@ qemuBuildCommandLine(virConnectPtr conn, for (i = 0; i < def->nnets; i++) { virDomainNetDefPtr net = def->nets[i]; - int vlan = i; + int vlan; /* VLANs are not used with -netdev, so don't record them */ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) vlan = -1; + else + vlan = i; if (qemuBuildInterfaceCommandLine(cmd, driver, conn, def, net, qemuCaps, vlan, bootNet, vmop) < 0) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 37be3a6..687c873 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8970,7 +8970,7 @@ qemuDomainBlockResize(virDomainPtr dom, virQEMUDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm; qemuDomainObjPrivatePtr priv; - int ret = -1, i; + int ret = -1, idx; char *device = NULL; virDomainDiskDefPtr disk = NULL; @@ -9010,12 +9010,12 @@ qemuDomainBlockResize(virDomainPtr dom, goto endjob; } - if ((i = virDomainDiskIndexByName(vm->def, path, false)) < 0) { + if ((idx = virDomainDiskIndexByName(vm->def, path, false)) < 0) { virReportError(VIR_ERR_INVALID_ARG, _("invalid path: %s"), path); goto endjob; } - disk = vm->def->disks[i]; + disk = vm->def->disks[idx]; if (virAsprintf(&device, "%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.alias) < 0) @@ -12176,10 +12176,9 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver, ret = qemuMonitorTransaction(priv->mon, actions); virJSONValueFree(actions); if (ret < 0) { - int idx = i; /* Transaction failed; undo the changes to vm. */ bool need_unlink = !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT); - while (--idx >= 0) { + while (i-- > 0) { virDomainDiskDefPtr persistDisk = NULL; if (snap->def->disks[i].snapshot == @@ -12197,7 +12196,6 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver, snap->def->dom->disks[i], vm->def->disks[i], persistDisk, - need_unlink); } } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 3ffc6ac..adcd638 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4277,7 +4277,7 @@ qemuMigrationVPAssociatePortProfiles(virDomainDefPtr def) { return 0; err_exit: - for (i = 0; i < last_good_net; i++) { + for (i = 0; last_good_net != -1 && i < last_good_net; i++) { net = def->nets[i]; if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) { ignore_value(virNetDevVPortProfileDisassociate(net->ifname, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

On Wed, Jul 10, 2013 at 03:13:28PM +0800, Guannan Ren wrote: Squashing in diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index d21d6ef..0965f63 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -1335,7 +1335,8 @@ virNWFilterDHCPSnoopThread(void *req0) virNWFilterSnoopEthHdrPtr packet; int ifindex = 0; int errcount = 0; - int tmp = -1, i, rv, n, pollTo; + int tmp = -1, rv, n, pollTo; + size_t i; char *threadkey = NULL; virThreadPoolPtr worker = NULL; time_t last_displayed = 0, last_displayed_queue = 0; diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 62b317b..9bb4b4e 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -460,7 +460,8 @@ nwfilterConnectListNWFilters(virConnectPtr conn, char **const names, int nnames) { virNWFilterDriverStatePtr driver = conn->nwfilterPrivateData; - int got = 0, i; + int got = 0; + size_t i; if (virConnectListNWFiltersEnsureACL(conn) < 0) return -1; diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 9b032ce..0bbb7ea 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -3067,7 +3067,7 @@ _ebtablesRemoveSubChains(virBufferPtr buf, const char *chains) { char rootchain[MAX_CHAINNAME_LENGTH]; - unsigned i; + size_t i; NWFILTER_SET_EBTABLES_SHELLVAR(buf); @@ -3159,7 +3159,7 @@ ebtablesRenameTmpSubAndRootChains(virBufferPtr buf, const char *ifname) { char rootchain[MAX_CHAINNAME_LENGTH]; - unsigned i; + size_t i; char chains[3] = { CHAINPREFIX_HOST_IN_TEMP, CHAINPREFIX_HOST_OUT_TEMP, @@ -3664,7 +3664,8 @@ ebtablesCreateTmpRootAndSubChains(virBufferPtr buf, ebiptablesRuleInstPtr *inst, int *nRuleInstances) { - int rc = 0, i; + int rc = 0; + size_t i; virHashKeyValuePairPtr filter_names; const virNWFilterChainPriority *priority; Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

On 07/08/2013 04:21 PM, Daniel P. Berrange wrote: linuxParseCPUmax can return -1. ACK Jan

On 07/08/2013 10:21 PM, Daniel P. Berrange wrote: linuxParseCPUmax can return -1 to i. Guannan

On Wed, Jul 10, 2013 at 04:02:31PM +0800, Guannan Ren wrote: Squashing in: diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 463b697..a7ff602 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2795,7 +2795,8 @@ static int networkClose(virConnectPtr conn) { } static int networkConnectNumOfNetworks(virConnectPtr conn) { - int nactive = 0, i; + int nactive = 0; + size_t i; struct network_driver *driver = conn->networkPrivateData; if (virConnectNumOfNetworksEnsureACL(conn) < 0) @@ -2817,7 +2818,8 @@ static int networkConnectNumOfNetworks(virConnectPtr conn) { static int networkConnectListNetworks(virConnectPtr conn, char **const names, int nnames) { struct network_driver *driver = conn->networkPrivateData; - int got = 0, i; + int got = 0; + size_t i; if (virConnectListNetworksEnsureACL(conn) < 0) return -1; @@ -2848,7 +2850,8 @@ static int networkConnectListNetworks(virConnectPtr conn, char **const names, in } static int networkConnectNumOfDefinedNetworks(virConnectPtr conn) { - int ninactive = 0, i; + int ninactive = 0; + size_t i; struct network_driver *driver = conn->networkPrivateData; if (virConnectNumOfDefinedNetworksEnsureACL(conn) < 0) @@ -2870,7 +2873,8 @@ static int networkConnectNumOfDefinedNetworks(virConnectPtr conn) { static int networkConnectListDefinedNetworks(virConnectPtr conn, char **const names, int nnames) { struct network_driver *driver = conn->networkPrivateData; - int got = 0, i; + int got = 0; + size_t i; if (virConnectListDefinedNetworksEnsureACL(conn) < 0) return -1; @@ -3717,7 +3721,8 @@ networkCreateInterfacePool(virNetworkDefPtr netdef) { unsigned int num_virt_fns = 0; char **vfname = NULL; virPCIDeviceAddressPtr *virt_fns; - int ret = -1, i = 0; + int ret = -1; + size_t i; if ((virNetDevGetVirtualFunctions(netdef->forward.pfs->dev, &vfname, &virt_fns, &num_virt_fns)) < 0) { Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

On 07/08/2013 04:21 PM, Daniel P. Berrange wrote: In the cleanup section there is for (i = 0; i < count; i++) but count can be negative here. Same for these two functions. Same for slave_count here. And member_count here. Jan

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; Convert the type of loop iterators named 'i', 'j', k', 'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or 'unsigned int', also santizing 'ii', 'jj', 'kk' to use the normal 'i', 'j', 'k' naming Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/hyperv/hyperv_driver.c | 4 ++-- src/hyperv/hyperv_util.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index dd8d018..d603e79 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -935,7 +935,7 @@ hypervConnectListDefinedDomains(virConnectPtr conn, char **const names, int maxn Msvm_ComputerSystem *computerSystemList = NULL; Msvm_ComputerSystem *computerSystem = NULL; int count = 0; - int i; + size_t i; if (maxnames == 0) { return 0; @@ -1240,7 +1240,7 @@ hypervConnectListAllDomains(virConnectPtr conn, virDomainPtr *doms = NULL; int count = 0; int ret = -1; - int i; + size_t i; virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c index b7c2a17..c89ff59 100644 --- a/src/hyperv/hyperv_util.c +++ b/src/hyperv/hyperv_util.c @@ -39,7 +39,7 @@ int hypervParseUri(hypervParsedUri **parsedUri, virURIPtr uri) { int result = -1; - int i; + size_t i; if (parsedUri == NULL || *parsedUri != NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); -- 1.8.1.4

On 07/08/2013 04:21 PM, Daniel P. Berrange wrote: This misses some variables after the '=' sign: int n = 0, i; ACK Jan

On 07/10/2013 05:12 AM, Daniel P. Berrange wrote: Or you could solve it this way: "Laine, I know you're fond of "ii", but it annoys the rest of us. Please stop." :-)