Author: metze Date: 2006-01-18 16:20:33 +0000 (Wed, 18 Jan 2006) New Revision: 13004
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13004 Log: fix compiler warnings metze Modified: branches/SAMBA_4_0/source/torture/basic/mangle_test.c branches/SAMBA_4_0/source/torture/raw/composite.c branches/SAMBA_4_0/source/torture/raw/open.c branches/SAMBA_4_0/source/torture/raw/oplock.c branches/SAMBA_4_0/source/torture/raw/search.c branches/SAMBA_4_0/source/torture/rpc/lsa.c Changeset: Modified: branches/SAMBA_4_0/source/torture/basic/mangle_test.c =================================================================== --- branches/SAMBA_4_0/source/torture/basic/mangle_test.c 2006-01-18 16:07:04 UTC (rev 13003) +++ branches/SAMBA_4_0/source/torture/basic/mangle_test.c 2006-01-18 16:20:33 UTC (rev 13004) @@ -90,7 +90,7 @@ data = tdb_fetch_bystring(tdb, shortname); if (data.dptr) { /* maybe its a duplicate long name? */ - if (strcasecmp(name, data.dptr) != 0) { + if (strcasecmp(name, (const char *)data.dptr) != 0) { /* we have a collision */ collisions++; printf("Collision between %s and %s -> %s " @@ -101,7 +101,7 @@ } else { TDB_DATA namedata; /* store it for later */ - namedata.dptr = discard_const_p(char, name); + namedata.dptr = discard_const_p(uint8_t, name); namedata.dsize = strlen(name)+1; tdb_store_bystring(tdb, shortname, namedata, TDB_REPLACE); } Modified: branches/SAMBA_4_0/source/torture/raw/composite.c =================================================================== --- branches/SAMBA_4_0/source/torture/raw/composite.c 2006-01-18 16:07:04 UTC (rev 13003) +++ branches/SAMBA_4_0/source/torture/raw/composite.c 2006-01-18 16:20:33 UTC (rev 13004) @@ -48,7 +48,7 @@ struct smb_composite_savefile io1; struct smb_composite_loadfile io2; struct composite_context **c; - char *data; + uint8_t *data; size_t len = random() % 100000; const int num_ops = 50; int i; @@ -124,7 +124,7 @@ struct smb_composite_savefile io1; struct smb_composite_fetchfile io2; struct composite_context **c; - char *data; + uint8_t *data; int i; size_t len = random() % 10000; extern int torture_numops; Modified: branches/SAMBA_4_0/source/torture/raw/open.c =================================================================== --- branches/SAMBA_4_0/source/torture/raw/open.c 2006-01-18 16:07:04 UTC (rev 13003) +++ branches/SAMBA_4_0/source/torture/raw/open.c 2006-01-18 16:20:33 UTC (rev 13004) @@ -1247,7 +1247,7 @@ io.openxreadx.in.mincnt = sizeof(buf); io.openxreadx.in.maxcnt = sizeof(buf); io.openxreadx.in.remaining = 0; - io.openxreadx.out.data = buf2; + io.openxreadx.out.data = (uint8_t *)buf2; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); Modified: branches/SAMBA_4_0/source/torture/raw/oplock.c =================================================================== --- branches/SAMBA_4_0/source/torture/raw/oplock.c 2006-01-18 16:07:04 UTC (rev 13003) +++ branches/SAMBA_4_0/source/torture/raw/oplock.c 2006-01-18 16:20:33 UTC (rev 13004) @@ -366,7 +366,7 @@ wr.write.in.count = 1; wr.write.in.offset = 0; wr.write.in.remaining = 0; - wr.write.in.data = "x"; + wr.write.in.data = (const uint8_t *)"x"; status = smb_raw_write(cli->tree, &wr); CHECK_STATUS(status, NT_STATUS_OK); } @@ -383,7 +383,7 @@ wr.write.in.count = 1; wr.write.in.offset = 0; wr.write.in.remaining = 0; - wr.write.in.data = "x"; + wr.write.in.data = (const uint8_t *)"x"; status = smb_raw_write(cli->tree, &wr); CHECK_STATUS(status, NT_STATUS_OK); } @@ -437,7 +437,7 @@ wr.write.in.count = 1; wr.write.in.offset = 0; wr.write.in.remaining = 0; - wr.write.in.data = "x"; + wr.write.in.data = (const uint8_t *)"x"; status = smb_raw_write(cli->tree, &wr); CHECK_STATUS(status, NT_STATUS_OK); } @@ -454,7 +454,7 @@ wr.write.in.count = 1; wr.write.in.offset = 0; wr.write.in.remaining = 0; - wr.write.in.data = "x"; + wr.write.in.data = (const uint8_t *)"x"; status = smb_raw_write(cli->tree, &wr); CHECK_STATUS(status, NT_STATUS_OK); } Modified: branches/SAMBA_4_0/source/torture/raw/search.c =================================================================== --- branches/SAMBA_4_0/source/torture/raw/search.c 2006-01-18 16:07:04 UTC (rev 13003) +++ branches/SAMBA_4_0/source/torture/raw/search.c 2006-01-18 16:20:33 UTC (rev 13004) @@ -1286,14 +1286,14 @@ CHECK_STRING(result.list[1].ea_list.name.s, "file2.txt"); CHECK_STRING(result.list[1].ea_list.eas.eas[0].name.s, "SECOND EA"); CHECK_VALUE(result.list[1].ea_list.eas.eas[0].value.length, 9); - CHECK_STRING(result.list[1].ea_list.eas.eas[0].value.data, "Value Two"); + CHECK_STRING((const char *)result.list[1].ea_list.eas.eas[0].value.data, "Value Two"); CHECK_STRING(result.list[1].ea_list.eas.eas[1].name.s, "THIRD EA"); CHECK_VALUE(result.list[1].ea_list.eas.eas[1].value.length, 0); CHECK_STRING(result.list[2].ea_list.name.s, "file3.txt"); CHECK_STRING(result.list[2].ea_list.eas.eas[0].name.s, "SECOND EA"); CHECK_VALUE(result.list[2].ea_list.eas.eas[0].value.length, 9); - CHECK_STRING(result.list[2].ea_list.eas.eas[0].value.data, "Value Two"); + CHECK_STRING((const char *)result.list[2].ea_list.eas.eas[0].value.data, "Value Two"); CHECK_STRING(result.list[2].ea_list.eas.eas[1].name.s, "THIRD EA"); CHECK_VALUE(result.list[2].ea_list.eas.eas[1].value.length, 0); Modified: branches/SAMBA_4_0/source/torture/rpc/lsa.c =================================================================== --- branches/SAMBA_4_0/source/torture/rpc/lsa.c 2006-01-18 16:07:04 UTC (rev 13003) +++ branches/SAMBA_4_0/source/torture/rpc/lsa.c 2006-01-18 16:20:33 UTC (rev 13004) @@ -1401,9 +1401,9 @@ } for (i = 0; i< privs1.count; i++) { - test_LookupPrivDisplayName(p, mem_ctx, handle, &privs1.privs[i].name); - test_LookupPrivValue(p, mem_ctx, handle, &privs1.privs[i].name); - if (!test_EnumAccountsWithUserRight(p, mem_ctx, handle, &privs1.privs[i].name)) { + test_LookupPrivDisplayName(p, mem_ctx, handle, (struct lsa_String *)&privs1.privs[i].name); + test_LookupPrivValue(p, mem_ctx, handle, (struct lsa_String *)&privs1.privs[i].name); + if (!test_EnumAccountsWithUserRight(p, mem_ctx, handle, (struct lsa_String *)&privs1.privs[i].name)) { ret = False; } } @@ -1606,7 +1606,7 @@ domsid[i] = dom_sid_parse_talloc(mem_ctx, trust_sid); trustinfo.sid = domsid[i]; - init_lsa_String(&trustinfo.name, trust_name); + init_lsa_String((struct lsa_String *)&trustinfo.name, trust_name); r.in.handle = handle; r.in.info = &trustinfo;
