svn commit: samba r23808 - in branches: SAMBA_3_2/source/include
SAMBA_3_2/source/librpc/gen_ndr SAMBA_3_2/source/librpc/idl
SAMBA_3_2_0/source/include SAMBA_3_2_0/source/librpc/gen_ndr
SAMBA_3_2_0/source/librpc/idl
vlendec at samba.org
vlendec at samba.org
Tue Jul 10 08:56:14 GMT 2007
Author: vlendec
Date: 2007-07-10 08:56:13 +0000 (Tue, 10 Jul 2007)
New Revision: 23808
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23808
Log:
Make us a bit more C++ friendly. Thanks to Constantine Vetoshev
<gepardcv at yahoo.com> for checking.
Modified:
branches/SAMBA_3_2/source/include/rpc_netlogon.h
branches/SAMBA_3_2/source/include/rpc_svcctl.h
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_svcctl.c
branches/SAMBA_3_2/source/librpc/gen_ndr/svcctl.h
branches/SAMBA_3_2/source/librpc/idl/svcctl.idl
branches/SAMBA_3_2_0/source/include/rpc_netlogon.h
branches/SAMBA_3_2_0/source/include/rpc_svcctl.h
branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_svcctl.c
branches/SAMBA_3_2_0/source/librpc/gen_ndr/svcctl.h
branches/SAMBA_3_2_0/source/librpc/idl/svcctl.idl
Changeset:
Modified: branches/SAMBA_3_2/source/include/rpc_netlogon.h
===================================================================
--- branches/SAMBA_3_2/source/include/rpc_netlogon.h 2007-07-10 08:07:42 UTC (rev 23807)
+++ branches/SAMBA_3_2/source/include/rpc_netlogon.h 2007-07-10 08:56:13 UTC (rev 23808)
@@ -1147,7 +1147,7 @@
} NET_Q_DSR_GETDCNAMEEX;
/* NET_R_DSR_GETDCNAMEEX */
-typedef struct NET_R_DSR_GETDCNAME NET_R_DSR_GETDCNAMEEX;
+typedef struct net_r_dsr_getdcnameex NET_R_DSR_GETDCNAMEEX;
/* NET_Q_DSR_GETDCNAMEEX2 */
typedef struct net_q_dsr_getdcnameex2 {
@@ -1165,8 +1165,8 @@
uint32 flags;
} NET_Q_DSR_GETDCNAMEEX2;
-/* NET_R_DSR_GETDCNAMEEX */
-typedef struct NET_R_DSR_GETDCNAME NET_R_DSR_GETDCNAMEEX2;
+/* NET_R_DSR_GETDCNAMEEX2 */
+typedef struct net_r_dsr_getdcnameex2 NET_R_DSR_GETDCNAMEEX2;
/* NET_Q_DSR_GESITENAME */
typedef struct net_q_dsr_getsitename {
Modified: branches/SAMBA_3_2/source/include/rpc_svcctl.h
===================================================================
--- branches/SAMBA_3_2/source/include/rpc_svcctl.h 2007-07-10 08:07:42 UTC (rev 23807)
+++ branches/SAMBA_3_2/source/include/rpc_svcctl.h 2007-07-10 08:56:13 UTC (rev 23808)
@@ -122,16 +122,12 @@
/* utility structures for RPCs */
-typedef struct {
- uint32 type;
- uint32 state;
- uint32 controls_accepted;
- WERROR win32_exit_code;
- uint32 service_exit_code;
- uint32 check_point;
- uint32 wait_hint;
-} SERVICE_STATUS;
+/*
+ * "struct SERVICE_STATUS" comes from librpc/gen_ndr/svcctl.h
+ */
+typedef struct SERVICE_STATUS SERVICE_STATUS;
+
typedef struct {
SERVICE_STATUS status;
uint32 process_id;
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_svcctl.c
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_svcctl.c 2007-07-10 08:07:42 UTC (rev 23807)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_svcctl.c 2007-07-10 08:56:13 UTC (rev 23808)
@@ -76,7 +76,7 @@
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->type));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->state));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->controls_accepted));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->win32_exit_code));
+ NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->win32_exit_code));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->service_exit_code));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->check_point));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->wait_hint));
@@ -93,7 +93,7 @@
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->type));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->state));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->controls_accepted));
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->win32_exit_code));
+ NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->win32_exit_code));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->service_exit_code));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->check_point));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->wait_hint));
@@ -110,7 +110,7 @@
ndr_print_uint32(ndr, "type", r->type);
ndr_print_uint32(ndr, "state", r->state);
ndr_print_uint32(ndr, "controls_accepted", r->controls_accepted);
- ndr_print_uint32(ndr, "win32_exit_code", r->win32_exit_code);
+ ndr_print_WERROR(ndr, "win32_exit_code", r->win32_exit_code);
ndr_print_uint32(ndr, "service_exit_code", r->service_exit_code);
ndr_print_uint32(ndr, "check_point", r->check_point);
ndr_print_uint32(ndr, "wait_hint", r->wait_hint);
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/svcctl.h
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/svcctl.h 2007-07-10 08:07:42 UTC (rev 23807)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/svcctl.h 2007-07-10 08:56:13 UTC (rev 23808)
@@ -27,7 +27,7 @@
uint32_t type;
uint32_t state;
uint32_t controls_accepted;
- uint32_t win32_exit_code;
+ WERROR win32_exit_code;
uint32_t service_exit_code;
uint32_t check_point;
uint32_t wait_hint;
Modified: branches/SAMBA_3_2/source/librpc/idl/svcctl.idl
===================================================================
--- branches/SAMBA_3_2/source/librpc/idl/svcctl.idl 2007-07-10 08:07:42 UTC (rev 23807)
+++ branches/SAMBA_3_2/source/librpc/idl/svcctl.idl 2007-07-10 08:56:13 UTC (rev 23808)
@@ -22,7 +22,7 @@
uint32 type;
uint32 state;
uint32 controls_accepted;
- uint32 win32_exit_code;
+ WERROR win32_exit_code;
uint32 service_exit_code;
uint32 check_point;
uint32 wait_hint;
Modified: branches/SAMBA_3_2_0/source/include/rpc_netlogon.h
===================================================================
--- branches/SAMBA_3_2_0/source/include/rpc_netlogon.h 2007-07-10 08:07:42 UTC (rev 23807)
+++ branches/SAMBA_3_2_0/source/include/rpc_netlogon.h 2007-07-10 08:56:13 UTC (rev 23808)
@@ -1139,7 +1139,7 @@
} NET_Q_DSR_GETDCNAMEEX;
/* NET_R_DSR_GETDCNAMEEX */
-typedef struct NET_R_DSR_GETDCNAME NET_R_DSR_GETDCNAMEEX;
+typedef struct net_r_dsr_getdcnameex NET_R_DSR_GETDCNAMEEX;
/* NET_Q_DSR_GETDCNAMEEX2 */
typedef struct net_q_dsr_getdcnameex2 {
@@ -1157,8 +1157,8 @@
uint32 flags;
} NET_Q_DSR_GETDCNAMEEX2;
-/* NET_R_DSR_GETDCNAMEEX */
-typedef struct NET_R_DSR_GETDCNAME NET_R_DSR_GETDCNAMEEX2;
+/* NET_R_DSR_GETDCNAMEEX2 */
+typedef struct net_r_dsr_getdcnameex2 NET_R_DSR_GETDCNAMEEX2;
/* NET_Q_DSR_GESITENAME */
typedef struct net_q_dsr_getsitename {
Modified: branches/SAMBA_3_2_0/source/include/rpc_svcctl.h
===================================================================
--- branches/SAMBA_3_2_0/source/include/rpc_svcctl.h 2007-07-10 08:07:42 UTC (rev 23807)
+++ branches/SAMBA_3_2_0/source/include/rpc_svcctl.h 2007-07-10 08:56:13 UTC (rev 23808)
@@ -122,16 +122,12 @@
/* utility structures for RPCs */
-typedef struct {
- uint32 type;
- uint32 state;
- uint32 controls_accepted;
- WERROR win32_exit_code;
- uint32 service_exit_code;
- uint32 check_point;
- uint32 wait_hint;
-} SERVICE_STATUS;
+/*
+ * "struct SERVICE_STATUS" comes from librpc/gen_ndr/svcctl.h
+ */
+typedef struct SERVICE_STATUS SERVICE_STATUS;
+
typedef struct {
SERVICE_STATUS status;
uint32 process_id;
Modified: branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_svcctl.c
===================================================================
--- branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_svcctl.c 2007-07-10 08:07:42 UTC (rev 23807)
+++ branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_svcctl.c 2007-07-10 08:56:13 UTC (rev 23808)
@@ -76,7 +76,7 @@
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->type));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->state));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->controls_accepted));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->win32_exit_code));
+ NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->win32_exit_code));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->service_exit_code));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->check_point));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->wait_hint));
@@ -93,7 +93,7 @@
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->type));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->state));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->controls_accepted));
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->win32_exit_code));
+ NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->win32_exit_code));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->service_exit_code));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->check_point));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->wait_hint));
@@ -110,7 +110,7 @@
ndr_print_uint32(ndr, "type", r->type);
ndr_print_uint32(ndr, "state", r->state);
ndr_print_uint32(ndr, "controls_accepted", r->controls_accepted);
- ndr_print_uint32(ndr, "win32_exit_code", r->win32_exit_code);
+ ndr_print_WERROR(ndr, "win32_exit_code", r->win32_exit_code);
ndr_print_uint32(ndr, "service_exit_code", r->service_exit_code);
ndr_print_uint32(ndr, "check_point", r->check_point);
ndr_print_uint32(ndr, "wait_hint", r->wait_hint);
Modified: branches/SAMBA_3_2_0/source/librpc/gen_ndr/svcctl.h
===================================================================
--- branches/SAMBA_3_2_0/source/librpc/gen_ndr/svcctl.h 2007-07-10 08:07:42 UTC (rev 23807)
+++ branches/SAMBA_3_2_0/source/librpc/gen_ndr/svcctl.h 2007-07-10 08:56:13 UTC (rev 23808)
@@ -27,7 +27,7 @@
uint32_t type;
uint32_t state;
uint32_t controls_accepted;
- uint32_t win32_exit_code;
+ WERROR win32_exit_code;
uint32_t service_exit_code;
uint32_t check_point;
uint32_t wait_hint;
Modified: branches/SAMBA_3_2_0/source/librpc/idl/svcctl.idl
===================================================================
--- branches/SAMBA_3_2_0/source/librpc/idl/svcctl.idl 2007-07-10 08:07:42 UTC (rev 23807)
+++ branches/SAMBA_3_2_0/source/librpc/idl/svcctl.idl 2007-07-10 08:56:13 UTC (rev 23808)
@@ -22,7 +22,7 @@
uint32 type;
uint32 state;
uint32 controls_accepted;
- uint32 win32_exit_code;
+ WERROR win32_exit_code;
uint32 service_exit_code;
uint32 check_point;
uint32 wait_hint;
More information about the samba-cvs
mailing list