subject:"\[libvirt\] \[PATCH 11\/32\] Convert 'int i' to 'size

Re: [libvirt] [PATCH 11/32] Convert 'int i' to 'size_t i' in src/test/ files

2013-07-10 Thread Daniel P. Berrange

On Wed, Jul 10, 2013 at 12:05:25PM +0800, Guannan Ren wrote:
 On 07/08/2013 10:21 PM, Daniel P. Berrange wrote:
 From: Daniel P. Berrange berra...@redhat.com
 
 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 berra...@redhat.com
 ---
   src/test/test_driver.c | 50 
  ++
   1 file changed, 30 insertions(+), 20 deletions(-)
 
 
 missed testDomainSetSchedulerParametersFlags()
 testConnectNumOfNetworks()
 testConnectListNetworks()
 testConnectNumOfDefinedNetworks()
 testConnectListDefinedNetworks()
 testConnectListInterfaces()
 testConnectListDefinedInterfaces()
 testConnectNumOfStoragePools()
 testConnectListStoragePools()
 testConnectNumOfDefinedStoragePools()
 testConnectListDefinedStoragePools()

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;

Re: [libvirt] [PATCH 11/32] Convert 'int i' to 'size_t i' in src/test/ files

2013-07-09 Thread Ján Tomko

On 07/08/2013 04:21 PM, Daniel P. Berrange wrote:
 From: Daniel P. Berrange berra...@redhat.com
 
 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 berra...@redhat.com
 ---
  src/test/test_driver.c | 50 
 ++
  1 file changed, 30 insertions(+), 20 deletions(-)
 

 @@ -2548,7 +2554,7 @@ static int testNodeGetCellsFreeMemory(virConnectPtr 
 conn,
unsigned long long *freemems,
int startCell, int maxCells) {
  testConnPtr privconn = conn-privateData;
 -int i, j;
 +size_t i, j;

startCell can be -1 here.

  int ret = -1;
  
  testDriverLock(privconn);

ACK

Jan

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 11/32] Convert 'int i' to 'size_t i' in src/test/ files

2013-07-09 Thread Guannan Ren


On 07/08/2013 10:21 PM, Daniel P. Berrange wrote:

From: Daniel P. Berrange berra...@redhat.com

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 berra...@redhat.com
---
  src/test/test_driver.c | 50 ++
  1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 80a84d5..8e8e3f2 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -167,7 +167,7 @@ testBuildCapabilities(virConnectPtr conn) {
  virCapsPtr caps;
  virCapsGuestPtr guest;
  const char *const guest_types[] = { hvm, xen };
-int i;
+size_t i;
  
  if ((caps = virCapabilitiesNew(VIR_ARCH_I686, 0, 0)) == NULL)

  goto no_memory;
@@ -331,7 +331,8 @@ static int testNodeGetInfo(virConnectPtr conn, 
virNodeInfoPtr info);
  static char *
  testDomainGenerateIfname(virDomainDefPtr domdef) {
  int maxif = 1024;
-int ifctr, i;
+int ifctr;
+size_t i;
  
  for (ifctr = 0; ifctr  maxif; ++ifctr) {

  char *ifname;
@@ -363,7 +364,7 @@ testDomainGenerateIfname(virDomainDefPtr domdef) {
  static int
  testDomainGenerateIfnames(virDomainDefPtr domdef)
  {
-int i = 0;
+size_t i = 0;
  
  for (i = 0; i  domdef-nnets; i++) {

  char *ifname;
@@ -391,7 +392,7 @@ testDomainUpdateVCPU(virConnectPtr conn ATTRIBUTE_UNUSED,
  testDomainObjPrivatePtr privdata = dom-privateData;
  virVcpuInfoPtr info = privdata-vcpu_infos[vcpu];
  unsigned char *cpumap = VIR_GET_CPUMAP(privdata-cpumaps, maplen, vcpu);
-int j;
+size_t j;
  bool cpu;
  
  memset(info, 0, sizeof(virVcpuInfo));

@@ -440,7 +441,8 @@ testDomainUpdateVCPUs(virConnectPtr conn,
  {
  testConnPtr privconn = conn-privateData;
  testDomainObjPrivatePtr privdata = dom-privateData;
-int i, ret = -1;
+size_t i;
+int ret = -1;
  int cpumaplen, maxcpu;
  
  maxcpu  = VIR_NODEINFO_MAXCPUS(privconn-nodeInfo);

@@ -705,7 +707,8 @@ static int testOpenVolumesForPool(xmlDocPtr xml,
virStoragePoolObjPtr pool,
int poolidx) {
  char *vol_xpath;
-int i, ret, func_ret = -1;
+size_t i;
+int ret, func_ret = -1;
  xmlNodePtr *vols = NULL;
  virStorageVolDefPtr def = NULL;
  
@@ -778,7 +781,8 @@ error:
  
  static int testOpenFromFile(virConnectPtr conn,

  const char *file) {
-int i, ret;
+size_t i;
+int ret;
  long l;
  char *str;
  xmlDocPtr xml = NULL;
@@ -2303,7 +2307,8 @@ static int testDomainGetVcpus(virDomainPtr domain,
  testConnPtr privconn = domain-conn-privateData;
  testDomainObjPrivatePtr privdomdata;
  virDomainObjPtr privdom;
-int i, v, maxcpu, hostcpus;
+size_t i;
+int v, maxcpu, hostcpus;
  int ret = -1;
  struct timeval tv;
  unsigned long long statbase;
@@ -2391,7 +2396,8 @@ static int testDomainPinVcpu(virDomainPtr domain,
  testDomainObjPrivatePtr privdomdata;
  virDomainObjPtr privdom;
  unsigned char *privcpumap;
-int i, maxcpu, hostcpus, privmaplen;
+size_t i;
+int maxcpu, hostcpus, privmaplen;
  int ret = -1;
  
  testDriverLock(privconn);

@@ -2548,7 +2554,7 @@ static int testNodeGetCellsFreeMemory(virConnectPtr conn,
unsigned long long *freemems,
int startCell, int maxCells) {
  testConnPtr privconn = conn-privateData;
-int i, j;
+size_t i, j;
  int ret = -1;
  
  testDriverLock(privconn);

@@ -2879,7 +2885,8 @@ static int testDomainInterfaceStats(virDomainPtr domain,
  virDomainObjPtr privdom;
  struct timeval tv;
  unsigned long long statbase;
-int i, found = 0, ret = -1;
+size_t i;
+int found = 0, ret = -1;
  
  testDriverLock(privconn);

  privdom = virDomainObjListFindByName(privconn-domains,
@@ -3467,7 +3474,8 @@ static int testInterfaceClose(virConnectPtr conn)
  static int testConnectNumOfInterfaces(virConnectPtr conn)
  {
  testConnPtr privconn = conn-privateData;
-int i, count = 0;
+size_t i;
+int count = 0;
  
  testDriverLock(privconn);

  for (i = 0; (i  privconn-ifaces.count); i++) {
@@ -3512,7 +3520,8 @@ error:
  static int testConnectNumOfDefinedInterfaces(virConnectPtr conn)
  {
  testConnPtr privconn = conn-privateData;
-int i, count = 0;
+size_t i;
+int count = 0;
  
  testDriverLock(privconn);

  for (i = 0; i  privconn-ifaces.count; i++) {
@@ -4612,7 +4621,8 @@ testStoragePoolListVolumes(virStoragePoolPtr pool,
 int maxnames) {
  testConnPtr privconn = pool-conn-privateData;
  virStoragePoolObjPtr privpool;
-int i = 0, n = 0;
+

[libvirt] [PATCH 11/32] Convert 'int i' to 'size_t i' in src/test/ files

2013-07-08 Thread Daniel P. Berrange

From: Daniel P. Berrange berra...@redhat.com

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 berra...@redhat.com
---
 src/test/test_driver.c | 50 ++
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 80a84d5..8e8e3f2 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -167,7 +167,7 @@ testBuildCapabilities(virConnectPtr conn) {
 virCapsPtr caps;
 virCapsGuestPtr guest;
 const char *const guest_types[] = { hvm, xen };
-int i;
+size_t i;
 
 if ((caps = virCapabilitiesNew(VIR_ARCH_I686, 0, 0)) == NULL)
 goto no_memory;
@@ -331,7 +331,8 @@ static int testNodeGetInfo(virConnectPtr conn, 
virNodeInfoPtr info);
 static char *
 testDomainGenerateIfname(virDomainDefPtr domdef) {
 int maxif = 1024;
-int ifctr, i;
+int ifctr;
+size_t i;
 
 for (ifctr = 0; ifctr  maxif; ++ifctr) {
 char *ifname;
@@ -363,7 +364,7 @@ testDomainGenerateIfname(virDomainDefPtr domdef) {
 static int
 testDomainGenerateIfnames(virDomainDefPtr domdef)
 {
-int i = 0;
+size_t i = 0;
 
 for (i = 0; i  domdef-nnets; i++) {
 char *ifname;
@@ -391,7 +392,7 @@ testDomainUpdateVCPU(virConnectPtr conn ATTRIBUTE_UNUSED,
 testDomainObjPrivatePtr privdata = dom-privateData;
 virVcpuInfoPtr info = privdata-vcpu_infos[vcpu];
 unsigned char *cpumap = VIR_GET_CPUMAP(privdata-cpumaps, maplen, vcpu);
-int j;
+size_t j;
 bool cpu;
 
 memset(info, 0, sizeof(virVcpuInfo));
@@ -440,7 +441,8 @@ testDomainUpdateVCPUs(virConnectPtr conn,
 {
 testConnPtr privconn = conn-privateData;
 testDomainObjPrivatePtr privdata = dom-privateData;
-int i, ret = -1;
+size_t i;
+int ret = -1;
 int cpumaplen, maxcpu;
 
 maxcpu  = VIR_NODEINFO_MAXCPUS(privconn-nodeInfo);
@@ -705,7 +707,8 @@ static int testOpenVolumesForPool(xmlDocPtr xml,
   virStoragePoolObjPtr pool,
   int poolidx) {
 char *vol_xpath;
-int i, ret, func_ret = -1;
+size_t i;
+int ret, func_ret = -1;
 xmlNodePtr *vols = NULL;
 virStorageVolDefPtr def = NULL;
 
@@ -778,7 +781,8 @@ error:
 
 static int testOpenFromFile(virConnectPtr conn,
 const char *file) {
-int i, ret;
+size_t i;
+int ret;
 long l;
 char *str;
 xmlDocPtr xml = NULL;
@@ -2303,7 +2307,8 @@ static int testDomainGetVcpus(virDomainPtr domain,
 testConnPtr privconn = domain-conn-privateData;
 testDomainObjPrivatePtr privdomdata;
 virDomainObjPtr privdom;
-int i, v, maxcpu, hostcpus;
+size_t i;
+int v, maxcpu, hostcpus;
 int ret = -1;
 struct timeval tv;
 unsigned long long statbase;
@@ -2391,7 +2396,8 @@ static int testDomainPinVcpu(virDomainPtr domain,
 testDomainObjPrivatePtr privdomdata;
 virDomainObjPtr privdom;
 unsigned char *privcpumap;
-int i, maxcpu, hostcpus, privmaplen;
+size_t i;
+int maxcpu, hostcpus, privmaplen;
 int ret = -1;
 
 testDriverLock(privconn);
@@ -2548,7 +2554,7 @@ static int testNodeGetCellsFreeMemory(virConnectPtr conn,
   unsigned long long *freemems,
   int startCell, int maxCells) {
 testConnPtr privconn = conn-privateData;
-int i, j;
+size_t i, j;
 int ret = -1;
 
 testDriverLock(privconn);
@@ -2879,7 +2885,8 @@ static int testDomainInterfaceStats(virDomainPtr domain,
 virDomainObjPtr privdom;
 struct timeval tv;
 unsigned long long statbase;
-int i, found = 0, ret = -1;
+size_t i;
+int found = 0, ret = -1;
 
 testDriverLock(privconn);
 privdom = virDomainObjListFindByName(privconn-domains,
@@ -3467,7 +3474,8 @@ static int testInterfaceClose(virConnectPtr conn)
 static int testConnectNumOfInterfaces(virConnectPtr conn)
 {
 testConnPtr privconn = conn-privateData;
-int i, count = 0;
+size_t i;
+int count = 0;
 
 testDriverLock(privconn);
 for (i = 0; (i  privconn-ifaces.count); i++) {
@@ -3512,7 +3520,8 @@ error:
 static int testConnectNumOfDefinedInterfaces(virConnectPtr conn)
 {
 testConnPtr privconn = conn-privateData;
-int i, count = 0;
+size_t i;
+int count = 0;
 
 testDriverLock(privconn);
 for (i = 0; i  privconn-ifaces.count; i++) {
@@ -4612,7 +4621,8 @@ testStoragePoolListVolumes(virStoragePoolPtr pool,
int maxnames) {
 testConnPtr privconn = pool-conn-privateData;
 virStoragePoolObjPtr privpool;
-int i = 0, n = 0;
+size_t i = 0;
+int n = 0;
 
 memset(names, 0, maxnames * sizeof(*names));
 
@@ -4657,7 +4667,7 @@

Re: [libvirt] [PATCH 11/32] Convert 'int i' to 'size_t i' in src/test/ files

Re: [libvirt] [PATCH 11/32] Convert 'int i' to 'size_t i' in src/test/ files

Re: [libvirt] [PATCH 11/32] Convert 'int i' to 'size_t i' in src/test/ files

[libvirt] [PATCH 11/32] Convert 'int i' to 'size_t i' in src/test/ files

4 matches

Site Navigation

Mail list logo

Footer information