The branch, master has been updated
via 2fe79f75847d43a626f64229366a44373a11e7b3 (commit)
via 4949a2cfaa13fc0311a209c5e72eee0378e8b35a (commit)
via 38cb53cdeb44873be70063d30dda5e4597fc11b7 (commit)
from 5c2404fb86bba0c0f137fdece38d390f0b291515 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2fe79f75847d43a626f64229366a44373a11e7b3
Author: Volker Lendecke <[email protected]>
Date: Sun May 3 22:46:05 2009 +0200
Fix an invalid type warning
commit 4949a2cfaa13fc0311a209c5e72eee0378e8b35a
Author: Volker Lendecke <[email protected]>
Date: Sun May 3 22:45:42 2009 +0200
Fix some warnings due to uint16_t!=-1 always being true
commit 38cb53cdeb44873be70063d30dda5e4597fc11b7
Author: Volker Lendecke <[email protected]>
Date: Sun May 3 22:44:36 2009 +0200
Fix a bunch of type-punned warnings -- gd, please fix properly :-)
-----------------------------------------------------------------------
Summary of changes:
source3/client/clitar.c | 2 +-
source3/torture/torture.c | 10 ++++----
source3/utils/net_rpc.c | 2 +-
source3/utils/net_rpc_printer.c | 45 ++++++++++++++++++++++++++-------------
4 files changed, 37 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index c7f2819..fd6c4cc 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -789,7 +789,7 @@ static void do_atar(const char *rname_in,char
*lname,file_info *finfo1)
cleanup:
- if (fnum != -1) {
+ if (fnum != (uint16_t)-1) {
cli_close(cli, fnum);
fnum = -1;
}
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 1f8ef7e..c9199eb 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -553,7 +553,7 @@ static bool rw_torture3(struct cli_state *c, char
*lockfname)
}
else
{
- for (i = 0; i < 500 && fnum == -1; i++)
+ for (i = 0; i < 500 && fnum == (uint16_t)-1; i++)
{
status = cli_open(c, lockfname, O_RDONLY,
DENY_NONE, &fnum);
@@ -3380,8 +3380,8 @@ static bool run_deletetest(int dummy)
* intialized, because these functions don't handle
* uninitialized connections. */
- if (fnum1 != -1) cli_close(cli1, fnum1);
- if (fnum2 != -1) cli_close(cli1, fnum2);
+ if (fnum1 != (uint16_t)-1) cli_close(cli1, fnum1);
+ if (fnum2 != (uint16_t)-1) cli_close(cli1, fnum2);
cli_setatr(cli1, fname, 0, 0);
cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
@@ -3835,7 +3835,7 @@ static bool run_opentest(int dummy)
printf("testing ctemp\n");
fnum1 = cli_ctemp(cli1, "\\", &tmp_path);
- if (fnum1 == -1) {
+ if (fnum1 == (uint16_t)-1) {
printf("ctemp failed (%s)\n", cli_errstr(cli1));
return False;
}
@@ -5671,7 +5671,7 @@ static bool run_getaddrinfo_send(int dummy)
goto fail;
}
tevent_req_set_callback(reqs[i], getaddrinfo_finished,
- names[i]);
+ (void *)names[i]);
}
for (i=0; i<ARRAY_SIZE(reqs); i++) {
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 8689a09..9f4470b 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -4319,7 +4319,7 @@ static void show_userlist(struct rpc_pipe_client
*pipe_hnd,
d_printf(" %s\n", tokens[i].name);
}
- if (fnum != -1)
+ if (fnum != (uint16_t)-1)
cli_close(cli, fnum);
cli_tdis(cli);
cli->cnum = cnum;
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 8e8103c..39b5e81 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -761,35 +761,45 @@ static bool net_spoolss_setprinter(struct rpc_pipe_client
*pipe_hnd,
info_ctr.level = level;
switch (level) {
case 0:
- info_ctr.info.info0 = (struct spoolss_SetPrinterInfo0
*)&info->info0;
+ info_ctr.info.info0 = (struct spoolss_SetPrinterInfo0 *)
+ (void *)&info->info0;
break;
case 1:
- info_ctr.info.info1 = (struct spoolss_SetPrinterInfo1
*)&info->info1;
+ info_ctr.info.info1 = (struct spoolss_SetPrinterInfo1 *)
+ (void *)&info->info1;
break;
case 2:
- info_ctr.info.info2 = (struct spoolss_SetPrinterInfo2
*)&info->info2;
+ info_ctr.info.info2 = (struct spoolss_SetPrinterInfo2 *)
+ (void *)&info->info2;
break;
case 3:
- info_ctr.info.info3 = (struct spoolss_SetPrinterInfo3
*)&info->info3;
+ info_ctr.info.info3 = (struct spoolss_SetPrinterInfo3 *)
+ (void *)&info->info3;
break;
case 4:
- info_ctr.info.info4 = (struct spoolss_SetPrinterInfo4
*)&info->info4;
+ info_ctr.info.info4 = (struct spoolss_SetPrinterInfo4 *)
+ (void *)&info->info4;
break;
case 5:
- info_ctr.info.info5 = (struct spoolss_SetPrinterInfo5
*)&info->info5;
+ info_ctr.info.info5 = (struct spoolss_SetPrinterInfo5 *)
+ (void *)&info->info5;
break;
case 6:
- info_ctr.info.info6 = (struct spoolss_SetPrinterInfo6
*)&info->info6;
+ info_ctr.info.info6 = (struct spoolss_SetPrinterInfo6 *)
+ (void *)&info->info6;
break;
case 7:
- info_ctr.info.info7 = (struct spoolss_SetPrinterInfo7
*)&info->info7;
+ info_ctr.info.info7 = (struct spoolss_SetPrinterInfo7 *)
+ (void *)&info->info7;
break;
#if 0 /* FIXME GD */
case 8:
- info_ctr.info.info8 = (struct spoolss_SetPrinterInfo8
*)&info->info8;
+ info_ctr.info.info8 = (struct spoolss_SetPrinterInfo8 *)
+ (void *)&info->info8;
break;
case 9:
- info_ctr.info.info9 = (struct spoolss_SetPrinterInfo9
*)&info->info9;
+ info_ctr.info.info9 = (struct spoolss_SetPrinterInfo9 *)
+ (void *)&info->info9;
break;
#endif
default:
@@ -1009,10 +1019,12 @@ static bool net_spoolss_addprinterdriver(struct
rpc_pipe_client *pipe_hnd,
switch (level) {
case 2:
- info_ctr.info.info2 = (struct spoolss_AddDriverInfo2
*)&info->info2;
+ info_ctr.info.info2 = (struct spoolss_AddDriverInfo2 *)
+ (void *)&info->info2;
break;
case 3:
- info_ctr.info.info3 = (struct spoolss_AddDriverInfo3
*)&info->info3;
+ info_ctr.info.info3 = (struct spoolss_AddDriverInfo3 *)
+ (void *)&info->info3;
break;
default:
printf("unsupported info level: %d\n", level);
@@ -1279,7 +1291,8 @@ static NTSTATUS rpc_printer_publish_internals_args(struct
rpc_pipe_client *pipe_
info.info7.action = action;
info_ctr.level = 7;
- info_ctr.info.info7 = (struct spoolss_SetPrinterInfo7
*)&info.info7;
+ info_ctr.info.info7 = (struct spoolss_SetPrinterInfo7 *)
+ (void *)&info.info7;
ZERO_STRUCT(devmode_ctr);
ZERO_STRUCT(secdesc_ctr);
@@ -1697,7 +1710,8 @@ NTSTATUS rpc_printer_migrate_forms_internals(struct
net_context *c,
f, forms[f].info1.form_name,
forms[f].info1.flags);
- info.info1 = (struct spoolss_AddFormInfo1
*)&forms[f].info1;
+ info.info1 = (struct spoolss_AddFormInfo1 *)
+ (void *)&forms[f].info1;
/* FIXME: there might be something wrong with samba's
builtin-forms */
@@ -2066,7 +2080,8 @@ NTSTATUS rpc_printer_migrate_printers_internals(struct
net_context *c,
d_printf("creating printer: %s\n", printername);
info_ctr.level = level;
- info_ctr.info.info2 = (struct spoolss_SetPrinterInfo2
*)&info_src.info2;
+ info_ctr.info.info2 = (struct spoolss_SetPrinterInfo2 *)
+ (void *)&info_src.info2;
result = rpccli_spoolss_addprinterex(pipe_hnd_dst,
mem_ctx,
--
Samba Shared Repository
