From 863a6aa07e543e30f2075a597129f6c39222beef Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Thu, 3 Jul 2008 12:21:33 -0700 Subject: Fix warnings on FreeBSD-based platforms Fix two shadowed declaration warnings on FreeBSD-based platform: 'reboot' is a 4.0BSD syscall in unistd.h and 'tcp_seq' is a typedef in netinet/tcp.h. (This used to be commit 14d2a4da1da38d6f69c63505d35990322f253e5d) --- source3/librpc/gen_ndr/cli_initshutdown.c | 8 ++++---- source3/librpc/gen_ndr/cli_initshutdown.h | 4 ++-- source3/librpc/gen_ndr/cli_winreg.c | 8 ++++---- source3/librpc/gen_ndr/cli_winreg.h | 4 ++-- source3/librpc/gen_ndr/initshutdown.h | 4 ++-- source3/librpc/gen_ndr/ndr_initshutdown.c | 12 ++++++------ source3/librpc/gen_ndr/ndr_winreg.c | 12 ++++++------ source3/librpc/gen_ndr/winreg.h | 4 ++-- source3/librpc/idl/initshutdown.idl | 4 ++-- source3/librpc/idl/winreg.idl | 4 ++-- 10 files changed, 32 insertions(+), 32 deletions(-) (limited to 'source3/librpc') diff --git a/source3/librpc/gen_ndr/cli_initshutdown.c b/source3/librpc/gen_ndr/cli_initshutdown.c index d5e5ab63bc..ab48623ee1 100644 --- a/source3/librpc/gen_ndr/cli_initshutdown.c +++ b/source3/librpc/gen_ndr/cli_initshutdown.c @@ -12,7 +12,7 @@ NTSTATUS rpccli_initshutdown_Init(struct rpc_pipe_client *cli, struct initshutdown_String *message /* [in] [unique] */, uint32_t timeout /* [in] */, uint8_t force_apps /* [in] */, - uint8_t reboot /* [in] */, + uint8_t do_reboot /* [in] */, WERROR *werror) { struct initshutdown_Init r; @@ -23,7 +23,7 @@ NTSTATUS rpccli_initshutdown_Init(struct rpc_pipe_client *cli, r.in.message = message; r.in.timeout = timeout; r.in.force_apps = force_apps; - r.in.reboot = reboot; + r.in.do_reboot = do_reboot; if (DEBUGLEVEL >= 10) { NDR_PRINT_IN_DEBUG(initshutdown_Init, &r); @@ -106,7 +106,7 @@ NTSTATUS rpccli_initshutdown_InitEx(struct rpc_pipe_client *cli, struct initshutdown_String *message /* [in] [unique] */, uint32_t timeout /* [in] */, uint8_t force_apps /* [in] */, - uint8_t reboot /* [in] */, + uint8_t do_reboot /* [in] */, uint32_t reason /* [in] */, WERROR *werror) { @@ -118,7 +118,7 @@ NTSTATUS rpccli_initshutdown_InitEx(struct rpc_pipe_client *cli, r.in.message = message; r.in.timeout = timeout; r.in.force_apps = force_apps; - r.in.reboot = reboot; + r.in.do_reboot = do_reboot; r.in.reason = reason; if (DEBUGLEVEL >= 10) { diff --git a/source3/librpc/gen_ndr/cli_initshutdown.h b/source3/librpc/gen_ndr/cli_initshutdown.h index 4223a35cfa..c7d2cad664 100644 --- a/source3/librpc/gen_ndr/cli_initshutdown.h +++ b/source3/librpc/gen_ndr/cli_initshutdown.h @@ -7,7 +7,7 @@ NTSTATUS rpccli_initshutdown_Init(struct rpc_pipe_client *cli, struct initshutdown_String *message /* [in] [unique] */, uint32_t timeout /* [in] */, uint8_t force_apps /* [in] */, - uint8_t reboot /* [in] */, + uint8_t do_reboot /* [in] */, WERROR *werror); NTSTATUS rpccli_initshutdown_Abort(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, @@ -19,7 +19,7 @@ NTSTATUS rpccli_initshutdown_InitEx(struct rpc_pipe_client *cli, struct initshutdown_String *message /* [in] [unique] */, uint32_t timeout /* [in] */, uint8_t force_apps /* [in] */, - uint8_t reboot /* [in] */, + uint8_t do_reboot /* [in] */, uint32_t reason /* [in] */, WERROR *werror); #endif /* __CLI_INITSHUTDOWN__ */ diff --git a/source3/librpc/gen_ndr/cli_winreg.c b/source3/librpc/gen_ndr/cli_winreg.c index fe8c4f7726..29f7e50c45 100644 --- a/source3/librpc/gen_ndr/cli_winreg.c +++ b/source3/librpc/gen_ndr/cli_winreg.c @@ -1212,7 +1212,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdown(struct rpc_pipe_client *cli, struct initshutdown_String *message /* [in] [unique] */, uint32_t timeout /* [in] */, uint8_t force_apps /* [in] */, - uint8_t reboot /* [in] */, + uint8_t do_reboot /* [in] */, WERROR *werror) { struct winreg_InitiateSystemShutdown r; @@ -1223,7 +1223,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdown(struct rpc_pipe_client *cli, r.in.message = message; r.in.timeout = timeout; r.in.force_apps = force_apps; - r.in.reboot = reboot; + r.in.do_reboot = do_reboot; if (DEBUGLEVEL >= 10) { NDR_PRINT_IN_DEBUG(winreg_InitiateSystemShutdown, &r); @@ -1501,7 +1501,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdownEx(struct rpc_pipe_client *cli, struct initshutdown_String *message /* [in] [unique] */, uint32_t timeout /* [in] */, uint8_t force_apps /* [in] */, - uint8_t reboot /* [in] */, + uint8_t do_reboot /* [in] */, uint32_t reason /* [in] */, WERROR *werror) { @@ -1513,7 +1513,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdownEx(struct rpc_pipe_client *cli, r.in.message = message; r.in.timeout = timeout; r.in.force_apps = force_apps; - r.in.reboot = reboot; + r.in.do_reboot = do_reboot; r.in.reason = reason; if (DEBUGLEVEL >= 10) { diff --git a/source3/librpc/gen_ndr/cli_winreg.h b/source3/librpc/gen_ndr/cli_winreg.h index 8fc7610b05..793a4ffc5b 100644 --- a/source3/librpc/gen_ndr/cli_winreg.h +++ b/source3/librpc/gen_ndr/cli_winreg.h @@ -168,7 +168,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdown(struct rpc_pipe_client *cli, struct initshutdown_String *message /* [in] [unique] */, uint32_t timeout /* [in] */, uint8_t force_apps /* [in] */, - uint8_t reboot /* [in] */, + uint8_t do_reboot /* [in] */, WERROR *werror); NTSTATUS rpccli_winreg_AbortSystemShutdown(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, @@ -205,7 +205,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdownEx(struct rpc_pipe_client *cli, struct initshutdown_String *message /* [in] [unique] */, uint32_t timeout /* [in] */, uint8_t force_apps /* [in] */, - uint8_t reboot /* [in] */, + uint8_t do_reboot /* [in] */, uint32_t reason /* [in] */, WERROR *werror); NTSTATUS rpccli_winreg_SaveKeyEx(struct rpc_pipe_client *cli, diff --git a/source3/librpc/gen_ndr/initshutdown.h b/source3/librpc/gen_ndr/initshutdown.h index acfe98846f..366f017c97 100644 --- a/source3/librpc/gen_ndr/initshutdown.h +++ b/source3/librpc/gen_ndr/initshutdown.h @@ -23,7 +23,7 @@ struct initshutdown_Init { struct initshutdown_String *message;/* [unique] */ uint32_t timeout; uint8_t force_apps; - uint8_t reboot; + uint8_t do_reboot; } in; struct { @@ -51,7 +51,7 @@ struct initshutdown_InitEx { struct initshutdown_String *message;/* [unique] */ uint32_t timeout; uint8_t force_apps; - uint8_t reboot; + uint8_t do_reboot; uint32_t reason; } in; diff --git a/source3/librpc/gen_ndr/ndr_initshutdown.c b/source3/librpc/gen_ndr/ndr_initshutdown.c index 9d857feb82..5d6c0c3c08 100644 --- a/source3/librpc/gen_ndr/ndr_initshutdown.c +++ b/source3/librpc/gen_ndr/ndr_initshutdown.c @@ -116,7 +116,7 @@ static enum ndr_err_code ndr_push_initshutdown_Init(struct ndr_push *ndr, int fl } NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.timeout)); NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.force_apps)); - NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.reboot)); + NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.do_reboot)); } if (flags & NDR_OUT) { NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result)); @@ -157,7 +157,7 @@ static enum ndr_err_code ndr_pull_initshutdown_Init(struct ndr_pull *ndr, int fl } NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.timeout)); NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.force_apps)); - NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.reboot)); + NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.do_reboot)); } if (flags & NDR_OUT) { NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result)); @@ -189,7 +189,7 @@ _PUBLIC_ void ndr_print_initshutdown_Init(struct ndr_print *ndr, const char *nam ndr->depth--; ndr_print_uint32(ndr, "timeout", r->in.timeout); ndr_print_uint8(ndr, "force_apps", r->in.force_apps); - ndr_print_uint8(ndr, "reboot", r->in.reboot); + ndr_print_uint8(ndr, "do_reboot", r->in.do_reboot); ndr->depth--; } if (flags & NDR_OUT) { @@ -279,7 +279,7 @@ static enum ndr_err_code ndr_push_initshutdown_InitEx(struct ndr_push *ndr, int } NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.timeout)); NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.force_apps)); - NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.reboot)); + NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.do_reboot)); NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.reason)); } if (flags & NDR_OUT) { @@ -321,7 +321,7 @@ static enum ndr_err_code ndr_pull_initshutdown_InitEx(struct ndr_pull *ndr, int } NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.timeout)); NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.force_apps)); - NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.reboot)); + NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.do_reboot)); NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.reason)); } if (flags & NDR_OUT) { @@ -354,7 +354,7 @@ _PUBLIC_ void ndr_print_initshutdown_InitEx(struct ndr_print *ndr, const char *n ndr->depth--; ndr_print_uint32(ndr, "timeout", r->in.timeout); ndr_print_uint8(ndr, "force_apps", r->in.force_apps); - ndr_print_uint8(ndr, "reboot", r->in.reboot); + ndr_print_uint8(ndr, "do_reboot", r->in.do_reboot); ndr_print_uint32(ndr, "reason", r->in.reason); ndr->depth--; } diff --git a/source3/librpc/gen_ndr/ndr_winreg.c b/source3/librpc/gen_ndr/ndr_winreg.c index 1a861af29f..053e155616 100644 --- a/source3/librpc/gen_ndr/ndr_winreg.c +++ b/source3/librpc/gen_ndr/ndr_winreg.c @@ -3185,7 +3185,7 @@ static enum ndr_err_code ndr_push_winreg_InitiateSystemShutdown(struct ndr_push } NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.timeout)); NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.force_apps)); - NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.reboot)); + NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.do_reboot)); } if (flags & NDR_OUT) { NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result)); @@ -3226,7 +3226,7 @@ static enum ndr_err_code ndr_pull_winreg_InitiateSystemShutdown(struct ndr_pull } NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.timeout)); NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.force_apps)); - NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.reboot)); + NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.do_reboot)); } if (flags & NDR_OUT) { NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result)); @@ -3258,7 +3258,7 @@ _PUBLIC_ void ndr_print_winreg_InitiateSystemShutdown(struct ndr_print *ndr, con ndr->depth--; ndr_print_uint32(ndr, "timeout", r->in.timeout); ndr_print_uint8(ndr, "force_apps", r->in.force_apps); - ndr_print_uint8(ndr, "reboot", r->in.reboot); + ndr_print_uint8(ndr, "do_reboot", r->in.do_reboot); ndr->depth--; } if (flags & NDR_OUT) { @@ -3876,7 +3876,7 @@ static enum ndr_err_code ndr_push_winreg_InitiateSystemShutdownEx(struct ndr_pus } NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.timeout)); NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.force_apps)); - NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.reboot)); + NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.do_reboot)); NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.reason)); } if (flags & NDR_OUT) { @@ -3918,7 +3918,7 @@ static enum ndr_err_code ndr_pull_winreg_InitiateSystemShutdownEx(struct ndr_pul } NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.timeout)); NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.force_apps)); - NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.reboot)); + NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.do_reboot)); NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.reason)); } if (flags & NDR_OUT) { @@ -3951,7 +3951,7 @@ _PUBLIC_ void ndr_print_winreg_InitiateSystemShutdownEx(struct ndr_print *ndr, c ndr->depth--; ndr_print_uint32(ndr, "timeout", r->in.timeout); ndr_print_uint8(ndr, "force_apps", r->in.force_apps); - ndr_print_uint8(ndr, "reboot", r->in.reboot); + ndr_print_uint8(ndr, "do_reboot", r->in.do_reboot); ndr_print_uint32(ndr, "reason", r->in.reason); ndr->depth--; } diff --git a/source3/librpc/gen_ndr/winreg.h b/source3/librpc/gen_ndr/winreg.h index e765890f73..4a06e3bc83 100644 --- a/source3/librpc/gen_ndr/winreg.h +++ b/source3/librpc/gen_ndr/winreg.h @@ -479,7 +479,7 @@ struct winreg_InitiateSystemShutdown { struct initshutdown_String *message;/* [unique] */ uint32_t timeout; uint8_t force_apps; - uint8_t reboot; + uint8_t do_reboot; } in; struct { @@ -567,7 +567,7 @@ struct winreg_InitiateSystemShutdownEx { struct initshutdown_String *message;/* [unique] */ uint32_t timeout; uint8_t force_apps; - uint8_t reboot; + uint8_t do_reboot; uint32_t reason; } in; diff --git a/source3/librpc/idl/initshutdown.idl b/source3/librpc/idl/initshutdown.idl index 868e48e28a..8815a9a29e 100644 --- a/source3/librpc/idl/initshutdown.idl +++ b/source3/librpc/idl/initshutdown.idl @@ -28,7 +28,7 @@ [in,unique] initshutdown_String *message, [in] uint32 timeout, [in] uint8 force_apps, - [in] uint8 reboot + [in] uint8 do_reboot ); WERROR initshutdown_Abort( @@ -40,7 +40,7 @@ [in,unique] initshutdown_String *message, [in] uint32 timeout, [in] uint8 force_apps, - [in] uint8 reboot, + [in] uint8 do_reboot, [in] uint32 reason ); } diff --git a/source3/librpc/idl/winreg.idl b/source3/librpc/idl/winreg.idl index 2183a2cb2d..2f02419af5 100644 --- a/source3/librpc/idl/winreg.idl +++ b/source3/librpc/idl/winreg.idl @@ -307,7 +307,7 @@ import "lsa.idl", "initshutdown.idl", "security.idl"; [in,unique] initshutdown_String *message, [in] uint32 timeout, [in] uint8 force_apps, - [in] uint8 reboot + [in] uint8 do_reboot ); /******************/ @@ -363,7 +363,7 @@ import "lsa.idl", "initshutdown.idl", "security.idl"; [in,unique] initshutdown_String *message, [in] uint32 timeout, [in] uint8 force_apps, - [in] uint8 reboot, + [in] uint8 do_reboot, [in] uint32 reason ); -- cgit