shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-25 10:03:49 +03:00
Code Releases Activity

util: Use new array management macros

Browse Source 
Like commit 94a26c7e from Eric Blake, the old fuzzy code should
be replaced by the new array management macros now.

And the type of scsi->count should be changed into "size_t", and
thus virSCSIDeviceListCount should return size_t instead, similar
for vir{PCI,USB}DeviceListCount.
This commit is contained in:
Osier Yang 2014-01-07 22:44:27 +08:00
parent 8560093394
commit 6f9894856c
6 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/util/virpci.c
View File

@ -1752,7 +1752,7 @@ virPCIDeviceListGet(virPCIDeviceListPtr list,
return list->devs[idx]; return list->devs[idx];
} }
int size_t
virPCIDeviceListCount(virPCIDeviceListPtr list) virPCIDeviceListCount(virPCIDeviceListPtr list)
{ {
return list->count; return list->count;

2
src/util/virpci.h
View File

@ -86,7 +86,7 @@ int virPCIDeviceListAdd(virPCIDeviceListPtr list,
int virPCIDeviceListAddCopy(virPCIDeviceListPtr list, virPCIDevicePtr dev); int virPCIDeviceListAddCopy(virPCIDeviceListPtr list, virPCIDevicePtr dev);
virPCIDevicePtr virPCIDeviceListGet(virPCIDeviceListPtr list, virPCIDevicePtr virPCIDeviceListGet(virPCIDeviceListPtr list,
int idx); int idx);
int virPCIDeviceListCount(virPCIDeviceListPtr list); size_t virPCIDeviceListCount(virPCIDeviceListPtr list);
virPCIDevicePtr virPCIDeviceListSteal(virPCIDeviceListPtr list, virPCIDevicePtr virPCIDeviceListSteal(virPCIDeviceListPtr list,
virPCIDevicePtr dev); virPCIDevicePtr dev);
virPCIDevicePtr virPCIDeviceListStealIndex(virPCIDeviceListPtr list, virPCIDevicePtr virPCIDeviceListStealIndex(virPCIDeviceListPtr list,

35
src/util/virscsi.c
View File

@ -62,7 +62,7 @@ struct _virSCSIDevice {
struct _virSCSIDeviceList { struct _virSCSIDeviceList {
virObjectLockable parent; virObjectLockable parent;
unsigned int count; size_t count;
virSCSIDevicePtr *devs; virSCSIDevicePtr *devs;
}; };
@ -356,12 +356,7 @@ virSCSIDeviceListAdd(virSCSIDeviceListPtr list,
return -1; return -1;
} }
if (VIR_REALLOC_N(list->devs, list->count + 1) < 0) return VIR_APPEND_ELEMENT(list->devs, list->count, dev);
return -1;
list->devs[list->count++] = dev;
return 0;
} }
virSCSIDevicePtr virSCSIDevicePtr
@ -373,7 +368,7 @@ virSCSIDeviceListGet(virSCSIDeviceListPtr list, int idx)
return list->devs[idx]; return list->devs[idx];
} }
int size_t
virSCSIDeviceListCount(virSCSIDeviceListPtr list) virSCSIDeviceListCount(virSCSIDeviceListPtr list)
{ {
return list->count; return list->count;
@ -387,24 +382,14 @@ virSCSIDeviceListSteal(virSCSIDeviceListPtr list,
size_t i; size_t i;
for (i = 0; i < list->count; i++) { for (i = 0; i < list->count; i++) {
if (list->devs[i]->adapter != dev->adapter || if (list->devs[i]->adapter == dev->adapter &&
list->devs[i]->bus != dev->bus || list->devs[i]->bus == dev->bus &&
list->devs[i]->target != dev->target || list->devs[i]->target == dev->target &&
list->devs[i]->unit != dev->unit) list->devs[i]->unit == dev->unit) {
continue; ret = list->devs[i];
VIR_DELETE_ELEMENT(list->devs, i, list->count);
ret = list->devs[i]; break;
if (i != list->count--)
memmove(&list->devs[i],
&list->devs[i+1],
sizeof(*list->devs) * (list->count - i));
if (VIR_REALLOC_N(list->devs, list->count) < 0) {
; /* not fatal */
} }
break;
} }
return ret; return ret;

2
src/util/virscsi.h
View File

@ -77,7 +77,7 @@ int virSCSIDeviceListAdd(virSCSIDeviceListPtr list,
virSCSIDevicePtr dev); virSCSIDevicePtr dev);
virSCSIDevicePtr virSCSIDeviceListGet(virSCSIDeviceListPtr list, virSCSIDevicePtr virSCSIDeviceListGet(virSCSIDeviceListPtr list,
int idx); int idx);
int virSCSIDeviceListCount(virSCSIDeviceListPtr list); size_t virSCSIDeviceListCount(virSCSIDeviceListPtr list);
virSCSIDevicePtr virSCSIDeviceListSteal(virSCSIDeviceListPtr list, virSCSIDevicePtr virSCSIDeviceListSteal(virSCSIDeviceListPtr list,
virSCSIDevicePtr dev); virSCSIDevicePtr dev);
void virSCSIDeviceListDel(virSCSIDeviceListPtr list, void virSCSIDeviceListDel(virSCSIDeviceListPtr list,

2
src/util/virusb.c
View File

@ -464,7 +464,7 @@ virUSBDeviceListGet(virUSBDeviceListPtr list,
return list->devs[idx]; return list->devs[idx];
} }
int size_t
virUSBDeviceListCount(virUSBDeviceListPtr list) virUSBDeviceListCount(virUSBDeviceListPtr list)
{ {
return list->count; return list->count;

2
src/util/virusb.h
View File

@ -86,7 +86,7 @@ int virUSBDeviceListAdd(virUSBDeviceListPtr list,
virUSBDevicePtr dev); virUSBDevicePtr dev);
virUSBDevicePtr virUSBDeviceListGet(virUSBDeviceListPtr list, virUSBDevicePtr virUSBDeviceListGet(virUSBDeviceListPtr list,
int idx); int idx);
int virUSBDeviceListCount(virUSBDeviceListPtr list); size_t virUSBDeviceListCount(virUSBDeviceListPtr list);
virUSBDevicePtr virUSBDeviceListSteal(virUSBDeviceListPtr list, virUSBDevicePtr virUSBDeviceListSteal(virUSBDeviceListPtr list,
virUSBDevicePtr dev); virUSBDevicePtr dev);
void virUSBDeviceListDel(virUSBDeviceListPtr list, void virUSBDeviceListDel(virUSBDeviceListPtr list,