External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

Convert 'int i' to 'size_t i' in src/locking/ files

Browse Source 
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@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-07-08 15:09:33 +01:00
parent a4b57dfb9e
commit 88e4e9c6b2
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/locking/domain_lock.c
View File

@ -102,7 +102,7 @@ static virLockManagerPtr virDomainLockManagerNew(virLockManagerPluginPtr plugin,
bool withResources)
{
virLockManagerPtr lock;
int i;
size_t i;
virLockManagerParam params[] = {
{ .type = VIR_LOCK_MANAGER_PARAM_TYPE_UUID,
.key = "uuid",
@ -113,11 +113,11 @@ static virLockManagerPtr virDomainLockManagerNew(virLockManagerPluginPtr plugin,
},
{ .type = VIR_LOCK_MANAGER_PARAM_TYPE_UINT,
.key = "id",
.value = { .i = dom->def->id },
.value = { .iv = dom->def->id },
},
{ .type = VIR_LOCK_MANAGER_PARAM_TYPE_UINT,
.key = "pid",
.value = { .i = dom->pid },
.value = { .iv = dom->pid },
},
{ .type = VIR_LOCK_MANAGER_PARAM_TYPE_CSTRING,
.key = "uri",

2
src/locking/lock_driver.h
View File

@ -80,7 +80,7 @@ struct _virLockManagerParam {
int type;
const char *key;
union {
int i;
int iv;
long long l;
unsigned int ui;
unsigned long long ul;

6
src/locking/lock_driver_lockd.c
View File

@ -461,9 +461,9 @@ static int virLockManagerLockDaemonNew(virLockManagerPtr lock,
if (VIR_STRDUP(priv->name, params[i].value.str) < 0)
return -1;
} else if (STREQ(params[i].key, "id")) {
priv->id = params[i].value.i;
priv->id = params[i].value.iv;
} else if (STREQ(params[i].key, "pid")) {
priv->pid = params[i].value.i;
priv->pid = params[i].value.iv;
} else if (STREQ(params[i].key, "uri")) {
/* ignored */
} else {
@ -512,7 +512,7 @@ static char *virLockManagerLockDaemonDiskLeaseName(const char *path)
{
unsigned char buf[SHA256_DIGEST_SIZE];
char *ret;
int i;
size_t i;
if (!(sha256_buffer(path, strlen(path), buf))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",

10
src/locking/lock_driver_sanlock.c
View File

@ -447,7 +447,7 @@ static int virLockManagerSanlockNew(virLockManagerPtr lock,
{
virLockManagerParamPtr param;
virLockManagerSanlockPrivatePtr priv;
int i;
size_t i;
virCheckFlags(0, -1);
@ -500,7 +500,7 @@ error:
static void virLockManagerSanlockFree(virLockManagerPtr lock)
{
virLockManagerSanlockPrivatePtr priv = lock->privateData;
int i;
size_t i;
if (!priv)
return;
@ -520,7 +520,7 @@ static int virLockManagerSanlockDiskLeaseName(const char *path,
size_t strbuflen)
{
unsigned char buf[MD5_DIGEST_SIZE];
int i;
size_t i;
if (strbuflen < ((MD5_DIGEST_SIZE * 2) + 1)) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -551,7 +551,7 @@ static int virLockManagerSanlockAddLease(virLockManagerPtr lock,
virLockManagerSanlockPrivatePtr priv = lock->privateData;
int ret = -1;
struct sanlk_resource *res = NULL;
int i;
size_t i;
if (VIR_ALLOC_VAR(res, struct sanlk_disk, 1) < 0)
goto cleanup;
@ -893,7 +893,7 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock,
bool res_free = false;
int sock = -1;
int rv;
int i;
size_t i;
virCheckFlags(VIR_LOCK_MANAGER_ACQUIRE_RESTRICT |
VIR_LOCK_MANAGER_ACQUIRE_REGISTER_ONLY, -1);

4
src/locking/lock_manager.c
View File

@ -77,12 +77,12 @@ virLockManagerSetPluginDir(const char *dir)
static void virLockManagerLogParams(size_t nparams,
virLockManagerParamPtr params)
{
int i;
size_t i;
char uuidstr[VIR_UUID_STRING_BUFLEN];
for (i = 0; i < nparams; i++) {
switch (params[i].type) {
case VIR_LOCK_MANAGER_PARAM_TYPE_INT:
VIR_DEBUG(" key=%s type=int value=%d", params[i].key, params[i].value.i);
VIR_DEBUG(" key=%s type=int value=%d", params[i].key, params[i].value.iv);
break;
case VIR_LOCK_MANAGER_PARAM_TYPE_UINT:
VIR_DEBUG(" key=%s type=uint value=%u", params[i].key, params[i].value.ui);