svn commit: samba r12517 - in branches/SAMBA_4_0/source: librpc
librpc/idl pidl/lib/Parse/Pidl/Samba4/NDR scripting/ejs
jelmer at samba.org
jelmer at samba.org
Tue Dec 27 19:13:19 GMT 2005
Author: jelmer
Date: 2005-12-27 19:13:18 +0000 (Tue, 27 Dec 2005)
New Revision: 12517
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12517
Log:
Don't generate empty init functions
Modified:
branches/SAMBA_4_0/source/librpc/config.mk
branches/SAMBA_4_0/source/librpc/idl/nbt.idl
branches/SAMBA_4_0/source/librpc/idl/winsrepl.idl
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
branches/SAMBA_4_0/source/scripting/ejs/config.mk
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/config.mk
===================================================================
--- branches/SAMBA_4_0/source/librpc/config.mk 2005-12-27 18:15:18 UTC (rev 12516)
+++ branches/SAMBA_4_0/source/librpc/config.mk 2005-12-27 19:13:18 UTC (rev 12517)
@@ -34,7 +34,6 @@
REQUIRED_SUBSYSTEMS = LIBNDR
[SUBSYSTEM::NDR_DCERPC]
-INIT_FUNCTION = dcerpc_dcerpc_init
OBJ_FILES = gen_ndr/ndr_dcerpc.o
NOPROTO = YES
REQUIRED_SUBSYSTEMS = LIBNDR
@@ -70,7 +69,6 @@
REQUIRED_SUBSYSTEMS = LIBNDR
[SUBSYSTEM::NDR_MISC]
-INIT_FUNCTION = dcerpc_misc_init
OBJ_FILES = gen_ndr/ndr_misc.o
NOPROTO = YES
REQUIRED_SUBSYSTEMS = LIBNDR
@@ -229,7 +227,6 @@
OBJ_FILES = ndr/ndr_orpc.o
[SUBSYSTEM::NDR_ORPC]
-INIT_FUNCTION = dcerpc_orpc_init
OBJ_FILES = gen_ndr/ndr_orpc.o
NOPROTO = YES
REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC_MANUAL
@@ -295,7 +292,6 @@
REQUIRED_SUBSYSTEMS = LIBNDR
[SUBSYSTEM::NDR_KRB5PAC]
-INIT_FUNCTION = dcerpc_krb5pac_init
OBJ_FILES = gen_ndr/ndr_krb5pac.o
NOPROTO = YES
REQUIRED_SUBSYSTEMS = LIBNDR NDR_KRB5PAC_UTIL
@@ -304,26 +300,22 @@
OBJ_FILES = ndr/ndr_krb5pac.o
[SUBSYSTEM::NDR_XATTR]
-INIT_FUNCTION = dcerpc_xattr_init
OBJ_FILES = gen_ndr/ndr_xattr.o
NOPROTO = YES
REQUIRED_SUBSYSTEMS = LIBNDR
[SUBSYSTEM::NDR_SCHANNEL]
-INIT_FUNCTION = dcerpc_schannel_init
OBJ_FILES = gen_ndr/ndr_schannel.o
NOPROTO = YES
REQUIRED_SUBSYSTEMS = LIBNDR
[SUBSYSTEM::NDR_NBT]
OBJ_FILES = gen_ndr/ndr_nbt.o
-INIT_FUNCTION = dcerpc_nbt_init
NOPROTO = YES
REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC
[SUBSYSTEM::NDR_WINSREPL]
OBJ_FILES = gen_ndr/ndr_winsrepl.o
-INIT_FUNCTION = dcerpc_winsrepl_init
NOPROTO = YES
REQUIRED_SUBSYSTEMS = LIBNDR NDR_NBT
@@ -659,12 +651,3 @@
SUBSYSTEM = SMBCALLS
REQUIRED_SUBSYSTEMS = LIBRPC NDR_IRPC
NOPROTO = YES
-
-################################################
-# Start SUBSYSTEM RPC_EJS
-[SUBSYSTEM::RPC_EJS]
-REQUIRED_SUBSYSTEMS = RPC_EJS_ECHO RPC_EJS_MISC RPC_EJS_SAMR RPC_EJS_SECURITY \
- RPC_EJS_LSA RPC_EJS_SRVSVC RPC_EJS_SVCCTL RPC_EJS_IRPC RPC_EJS_WINREG \
- RPC_EJS_INITSHUTDOWN
-# End SUBSYSTEM RPC_EJS
-################################################
Modified: branches/SAMBA_4_0/source/librpc/idl/nbt.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/nbt.idl 2005-12-27 18:15:18 UTC (rev 12516)
+++ branches/SAMBA_4_0/source/librpc/idl/nbt.idl 2005-12-27 19:13:18 UTC (rev 12517)
@@ -8,9 +8,7 @@
encoding if it doesn't work out
*/
-[ uuid("1-2-3-4"),
- version(1.0),
- depends(security)
+[ depends(security)
] interface nbt
{
const int NBT_NAME_SERVICE_PORT = 137;
Modified: branches/SAMBA_4_0/source/librpc/idl/winsrepl.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/winsrepl.idl 2005-12-27 18:15:18 UTC (rev 12516)
+++ branches/SAMBA_4_0/source/librpc/idl/winsrepl.idl 2005-12-27 19:13:18 UTC (rev 12517)
@@ -10,8 +10,6 @@
*/
[
- uuid("0-1-2-3-4"),
- version(0.0),
pointer_default(unique),
pointer_default_top(unique),
depends(nbt)
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm 2005-12-27 18:15:18 UTC (rev 12516)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm 2005-12-27 19:13:18 UTC (rev 12517)
@@ -2158,13 +2158,10 @@
my $count = 0;
my $uname = uc $interface->{NAME};
- $count = $#{$interface->{FUNCTIONS}}+1;
-
- return if ($count == 0);
+ return if ($#{$interface->{FUNCTIONS}}+1 == 0);
return unless defined ($interface->{PROPERTIES}->{uuid});
pidl "static const struct dcerpc_interface_call $interface->{NAME}\_calls[] = {";
- $count = 0;
foreach my $d (@{$interface->{FUNCTIONS}}) {
next if not defined($d->{OPNUM});
pidl "\t{";
@@ -2343,26 +2340,26 @@
{
my ($idl,$basename) = @_;
- pidl "NTSTATUS dcerpc_$basename\_init(void)";
- pidl "{";
- indent;
- pidl "NTSTATUS status = NT_STATUS_OK;";
+ my $body = "";
+
foreach my $interface (@{$idl}) {
next if $interface->{TYPE} ne "INTERFACE";
-
- my $count = ($#{$interface->{FUNCTIONS}}+1);
-
- next if ($count == 0);
+ next if ($#{$interface->{FUNCTIONS}}+1 == 0);
next unless defined ($interface->{PROPERTIES}->{uuid});
- pidl "status = dcerpc_ndr_$interface->{NAME}_init();";
- pidl "if (NT_STATUS_IS_ERR(status)) {";
- pidl "\treturn status;";
- pidl "}";
- pidl "";
+ $body .= "\tstatus = dcerpc_ndr_$interface->{NAME}_init();\n";
+ $body .= "\tif (NT_STATUS_IS_ERR(status)) {\n";
+ $body .= "\t\treturn status;\n";
+ $body .= "\t}\n";
+ $body .= "\n";
}
- pidl "return status;";
- deindent;
+
+ return unless $body;
+
+ pidl "NTSTATUS dcerpc_$basename\_init(void)";
+ pidl "{";
+ pidl "\tNTSTATUS status = NT_STATUS_OK;";
+ pidl "$body\treturn status;";
pidl "}";
pidl "";
}
Modified: branches/SAMBA_4_0/source/scripting/ejs/config.mk
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/config.mk 2005-12-27 18:15:18 UTC (rev 12516)
+++ branches/SAMBA_4_0/source/scripting/ejs/config.mk 2005-12-27 19:13:18 UTC (rev 12517)
@@ -3,7 +3,6 @@
[SUBSYSTEM::EJSRPC]
OBJ_FILES = \
ejsrpc.o
-REQUIRED_SUBSYSTEMS = RPC_EJS
NOPROTO = YES
# End SUBSYSTEM EJSRPC
#######################
@@ -30,7 +29,8 @@
smbcalls_param.o \
ejsnet.o \
mprutil.o
-REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3 LIBNET NDR_ALL
+REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3 LIBNET \
+ NDR_ALL
# End SUBSYSTEM SMBCALLS
#######################
More information about the samba-cvs
mailing list