Author: jerry Date: 2006-09-22 04:31:11 +0000 (Fri, 22 Sep 2006) New Revision: 18811
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18811 Log: rename stat field to avoid compiler warnings about shadowed variables Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/cli_srvsvc.c branches/SAMBA_3_0/source/librpc/gen_ndr/cli_srvsvc.h branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_srvsvc.c branches/SAMBA_3_0/source/librpc/gen_ndr/srv_srvsvc.c branches/SAMBA_3_0/source/librpc/gen_ndr/srv_srvsvc.h branches/SAMBA_3_0/source/librpc/gen_ndr/srvsvc.h branches/SAMBA_3_0/source/librpc/idl/srvsvc.idl Changeset: Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/cli_srvsvc.c =================================================================== --- branches/SAMBA_3_0/source/librpc/gen_ndr/cli_srvsvc.c 2006-09-22 04:16:58 UTC (rev 18810) +++ branches/SAMBA_3_0/source/librpc/gen_ndr/cli_srvsvc.c 2006-09-22 04:31:11 UTC (rev 18811) @@ -738,7 +738,7 @@ return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_srvsvc_NetServerStatisticsGet(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *server_unc, const char *service, uint32_t level, uint32_t options, struct srvsvc_Statistics *stat) +NTSTATUS rpccli_srvsvc_NetServerStatisticsGet(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *server_unc, const char *service, uint32_t level, uint32_t options, struct srvsvc_Statistics *stats) { struct srvsvc_NetServerStatisticsGet r; NTSTATUS status; @@ -762,7 +762,7 @@ } /* Return variables */ - *stat = *r.out.stat; + *stats = *r.out.stats; /* Return result */ return werror_to_ntstatus(r.out.result); Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/cli_srvsvc.h =================================================================== --- branches/SAMBA_3_0/source/librpc/gen_ndr/cli_srvsvc.h 2006-09-22 04:16:58 UTC (rev 18810) +++ branches/SAMBA_3_0/source/librpc/gen_ndr/cli_srvsvc.h 2006-09-22 04:31:11 UTC (rev 18811) @@ -25,7 +25,7 @@ NTSTATUS rpccli_srvsvc_NetSrvGetInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *server_unc, uint32_t level, union srvsvc_NetSrvInfo *info); NTSTATUS rpccli_srvsvc_NetSrvSetInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *server_unc, uint32_t level, union srvsvc_NetSrvInfo info, uint32_t *parm_error); NTSTATUS rpccli_srvsvc_NetDiskEnum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *server_unc, uint32_t level, struct srvsvc_NetDiskInfo *info, uint32_t maxlen, uint32_t *totalentries, uint32_t *resume_handle); -NTSTATUS rpccli_srvsvc_NetServerStatisticsGet(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *server_unc, const char *service, uint32_t level, uint32_t options, struct srvsvc_Statistics *stat); +NTSTATUS rpccli_srvsvc_NetServerStatisticsGet(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *server_unc, const char *service, uint32_t level, uint32_t options, struct srvsvc_Statistics *stats); NTSTATUS rpccli_srvsvc_NetTransportAdd(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *server_unc, uint32_t level, union srvsvc_NetTransportInfo info); NTSTATUS rpccli_srvsvc_NetTransportEnum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *server_unc, uint32_t *level, union srvsvc_NetTransportCtr *transports, uint32_t max_buffer, uint32_t *totalentries, uint32_t *resume_handle); NTSTATUS rpccli_srvsvc_NetTransportDel(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *server_unc, uint32_t unknown, struct srvsvc_NetTransportInfo0 transport); Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_srvsvc.c =================================================================== --- branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_srvsvc.c 2006-09-22 04:16:58 UTC (rev 18810) +++ branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_srvsvc.c 2006-09-22 04:31:11 UTC (rev 18811) @@ -16485,8 +16485,8 @@ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.options)); } if (flags & NDR_OUT) { - if (r->out.stat == NULL) return NT_STATUS_INVALID_PARAMETER_MIX; - NDR_CHECK(ndr_push_srvsvc_Statistics(ndr, NDR_SCALARS, r->out.stat)); + if (r->out.stats == NULL) return NT_STATUS_INVALID_PARAMETER_MIX; + NDR_CHECK(ndr_push_srvsvc_Statistics(ndr, NDR_SCALARS, r->out.stats)); NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result)); } return NT_STATUS_OK; @@ -16498,7 +16498,7 @@ uint32_t _ptr_service; TALLOC_CTX *_mem_save_server_unc_0; TALLOC_CTX *_mem_save_service_0; - TALLOC_CTX *_mem_save_stat_0; + TALLOC_CTX *_mem_save_stats_0; if (flags & NDR_IN) { ZERO_STRUCT(r->out); @@ -16540,17 +16540,17 @@ } NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.level)); NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.options)); - NDR_PULL_ALLOC(ndr, r->out.stat); - ZERO_STRUCTP(r->out.stat); + NDR_PULL_ALLOC(ndr, r->out.stats); + ZERO_STRUCTP(r->out.stats); } if (flags & NDR_OUT) { if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { - NDR_PULL_ALLOC(ndr, r->out.stat); + NDR_PULL_ALLOC(ndr, r->out.stats); } - _mem_save_stat_0 = NDR_PULL_GET_MEM_CTX(ndr); - NDR_PULL_SET_MEM_CTX(ndr, r->out.stat, LIBNDR_FLAG_REF_ALLOC); - NDR_CHECK(ndr_pull_srvsvc_Statistics(ndr, NDR_SCALARS, r->out.stat)); - NDR_PULL_SET_MEM_CTX(ndr, _mem_save_stat_0, LIBNDR_FLAG_REF_ALLOC); + _mem_save_stats_0 = NDR_PULL_GET_MEM_CTX(ndr); + NDR_PULL_SET_MEM_CTX(ndr, r->out.stats, LIBNDR_FLAG_REF_ALLOC); + NDR_CHECK(ndr_pull_srvsvc_Statistics(ndr, NDR_SCALARS, r->out.stats)); + NDR_PULL_SET_MEM_CTX(ndr, _mem_save_stats_0, LIBNDR_FLAG_REF_ALLOC); NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result)); } return NT_STATUS_OK; @@ -16585,9 +16585,9 @@ if (flags & NDR_OUT) { ndr_print_struct(ndr, "out", "srvsvc_NetServerStatisticsGet"); ndr->depth++; - ndr_print_ptr(ndr, "stat", r->out.stat); + ndr_print_ptr(ndr, "stats", r->out.stats); ndr->depth++; - ndr_print_srvsvc_Statistics(ndr, "stat", r->out.stat); + ndr_print_srvsvc_Statistics(ndr, "stats", r->out.stats); ndr->depth--; ndr_print_WERROR(ndr, "result", r->out.result); ndr->depth--; Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/srv_srvsvc.c =================================================================== --- branches/SAMBA_3_0/source/librpc/gen_ndr/srv_srvsvc.c 2006-09-22 04:16:58 UTC (rev 18810) +++ branches/SAMBA_3_0/source/librpc/gen_ndr/srv_srvsvc.c 2006-09-22 04:31:11 UTC (rev 18811) @@ -1498,13 +1498,13 @@ NDR_PRINT_IN_DEBUG(srvsvc_NetServerStatisticsGet, &r); ZERO_STRUCT(r.out); - r.out.stat = talloc_zero_size(mem_ctx, sizeof(*r.out.stat)); - if (r.out.stat == NULL) { + r.out.stats = talloc_zero_size(mem_ctx, sizeof(*r.out.stats)); + if (r.out.stats == NULL) { talloc_free(mem_ctx); return False; } - r.out.result = _srvsvc_NetServerStatisticsGet(p, r.in.server_unc, r.in.service, r.in.level, r.in.options, r.out.stat); + r.out.result = _srvsvc_NetServerStatisticsGet(p, r.in.server_unc, r.in.service, r.in.level, r.in.options, r.out.stats); if (DEBUGLEVEL >= 10) NDR_PRINT_OUT_DEBUG(srvsvc_NetServerStatisticsGet, &r); Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/srv_srvsvc.h =================================================================== --- branches/SAMBA_3_0/source/librpc/gen_ndr/srv_srvsvc.h 2006-09-22 04:16:58 UTC (rev 18810) +++ branches/SAMBA_3_0/source/librpc/gen_ndr/srv_srvsvc.h 2006-09-22 04:31:11 UTC (rev 18811) @@ -25,7 +25,7 @@ WERROR _srvsvc_NetSrvGetInfo(pipes_struct *p, const char *server_unc, uint32_t level, union srvsvc_NetSrvInfo *info); WERROR _srvsvc_NetSrvSetInfo(pipes_struct *p, const char *server_unc, uint32_t level, union srvsvc_NetSrvInfo info, uint32_t *parm_error); WERROR _srvsvc_NetDiskEnum(pipes_struct *p, const char *server_unc, uint32_t level, struct srvsvc_NetDiskInfo *info, uint32_t maxlen, uint32_t *totalentries, uint32_t *resume_handle); -WERROR _srvsvc_NetServerStatisticsGet(pipes_struct *p, const char *server_unc, const char *service, uint32_t level, uint32_t options, struct srvsvc_Statistics *stat); +WERROR _srvsvc_NetServerStatisticsGet(pipes_struct *p, const char *server_unc, const char *service, uint32_t level, uint32_t options, struct srvsvc_Statistics *stats); WERROR _srvsvc_NetTransportAdd(pipes_struct *p, const char *server_unc, uint32_t level, union srvsvc_NetTransportInfo info); WERROR _srvsvc_NetTransportEnum(pipes_struct *p, const char *server_unc, uint32_t *level, union srvsvc_NetTransportCtr *transports, uint32_t max_buffer, uint32_t *totalentries, uint32_t *resume_handle); WERROR _srvsvc_NetTransportDel(pipes_struct *p, const char *server_unc, uint32_t unknown, struct srvsvc_NetTransportInfo0 transport); Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/srvsvc.h =================================================================== --- branches/SAMBA_3_0/source/librpc/gen_ndr/srvsvc.h 2006-09-22 04:16:58 UTC (rev 18810) +++ branches/SAMBA_3_0/source/librpc/gen_ndr/srvsvc.h 2006-09-22 04:31:11 UTC (rev 18811) @@ -1380,7 +1380,7 @@ } in; struct { - struct srvsvc_Statistics *stat;/* [ref] */ + struct srvsvc_Statistics *stats;/* [ref] */ WERROR result; } out; Modified: branches/SAMBA_3_0/source/librpc/idl/srvsvc.idl =================================================================== --- branches/SAMBA_3_0/source/librpc/idl/srvsvc.idl 2006-09-22 04:16:58 UTC (rev 18810) +++ branches/SAMBA_3_0/source/librpc/idl/srvsvc.idl 2006-09-22 04:31:11 UTC (rev 18811) @@ -1177,7 +1177,7 @@ [in] [string,charset(UTF16)] uint16 *service, [in] uint32 level, [in] uint32 options, - [out,ref] srvsvc_Statistics *stat + [out,ref] srvsvc_Statistics *stats ); /**************************/
