summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-03-10 02:50:32 +0100
committerGünther Deschner <gd@samba.org>2010-03-10 02:54:26 +0100
commit0a253e6b72dbf5cfe6be1952fde72cf492680e36 (patch)
tree8ae4925ade3994ef338cc6e2b6d7ec89562590db
parent3855c948c029490c616f4b4aa81b47e6df8c12a0 (diff)
downloadsamba-0a253e6b72dbf5cfe6be1952fde72cf492680e36.tar.gz
samba-0a253e6b72dbf5cfe6be1952fde72cf492680e36.tar.bz2
samba-0a253e6b72dbf5cfe6be1952fde72cf492680e36.zip
s4-smbtorture: fix some build warnings in RPC-SPOOLSS test.
Guenther
-rw-r--r--source4/torture/rpc/spoolss.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 84e73c337f..73787a98e8 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -3504,7 +3504,7 @@ static bool test_SetPrinterDataEx_matrix(struct torture_context *tctx,
c = strchr(key, '\\');
if (c) {
- int i;
+ int k;
/* we have subkeys */
@@ -3514,9 +3514,9 @@ static bool test_SetPrinterDataEx_matrix(struct torture_context *tctx,
return false;
}
- for (i=0; subkeys && subkeys[i]; i++) {
+ for (k=0; subkeys && subkeys[k]; k++) {
- const char *current_key = talloc_asprintf(tctx, "%s\\%s", key, subkeys[i]);
+ const char *current_key = talloc_asprintf(tctx, "%s\\%s", key, subkeys[k]);
if (!test_DeletePrinterKey(tctx, p, handle, current_key)) {
return false;
@@ -4278,7 +4278,7 @@ static bool test_EnumPrinters_findname(struct torture_context *tctx,
for (i=0; i < count; i++) {
const char *current = NULL;
- const char *p;
+ const char *q;
switch (level) {
case 1:
@@ -4291,14 +4291,14 @@ static bool test_EnumPrinters_findname(struct torture_context *tctx,
break;
}
- p = strrchr(current, '\\');
- if (p) {
+ q = strrchr(current, '\\');
+ if (q) {
if (!e.in.server) {
torture_warning(tctx,
"server returns printername %s incl. servername although we did not set servername", current);
}
- p++;
- if (strequal(p, name)) {
+ q++;
+ if (strequal(q, name)) {
*found = true;
break;
}