From fc4c633d9f2f6fc1869aa38194585da5c0be1249 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 20 May 2005 23:19:06 +0000
Subject: r6926: More build farm fixes:  - Warn about unknown attributes in .mk
  - Remove more unused functions (This used to be commit
 6bf8126ae9368dc56cf0cd91b972a2d939974679)

---
 source4/build/pidl/idl.pm  |  2 +-
 source4/build/pidl/idl.yp  |  2 +-
 source4/build/pidl/pidl.pl | 16 +++-------------
 source4/build/pidl/test.pm |  2 +-
 source4/build/pidl/util.pm |  1 +
 5 files changed, 7 insertions(+), 16 deletions(-)

(limited to 'source4/build/pidl')

diff --git a/source4/build/pidl/idl.pm b/source4/build/pidl/idl.pm
index 636bcfb51c..53c06f22d8 100644
--- a/source4/build/pidl/idl.pm
+++ b/source4/build/pidl/idl.pm
@@ -2400,7 +2400,7 @@ sub parse_idl($$)
 		}
 	}
 
-	return $idl;
+	return util::CleanData($idl);
 }
 
 1;
diff --git a/source4/build/pidl/idl.yp b/source4/build/pidl/idl.yp
index 775e1fbd38..186f003396 100644
--- a/source4/build/pidl/idl.yp
+++ b/source4/build/pidl/idl.yp
@@ -388,5 +388,5 @@ sub parse_idl($$)
 		}
 	}
 
-	return $idl;
+	return util::CleanData($idl);
 }
diff --git a/source4/build/pidl/pidl.pl b/source4/build/pidl/pidl.pl
index b80832dd99..2305d9243b 100755
--- a/source4/build/pidl/pidl.pl
+++ b/source4/build/pidl/pidl.pl
@@ -4,6 +4,7 @@
 # package to parse IDL files and generate code for
 # rpc functions in Samba
 # Copyright tridge@samba.org 2000-2003
+# Copyright jelmer@samba.org 2005
 # released under the GNU GPL
 
 use strict;
@@ -13,9 +14,9 @@ use lib "$RealBin";
 use lib "$RealBin/lib";
 use Getopt::Long;
 use File::Basename;
-use idl;
 use dump;
 use ndr_client;
+use idl;
 use ndr_header;
 use ndr_parser;
 use server;
@@ -50,16 +51,6 @@ my($opt_output);
 
 my $idl_parser = new idl;
 
-#####################################################################
-# parse an IDL file returning a structure containing all the data
-sub IdlParse($)
-{
-    my $filename = shift;
-    my $idl = $idl_parser->parse_idl($filename);
-    util::CleanData($idl);
-    return $idl;
-}
-
 #########################################
 # display help text
 sub ShowHelp()
@@ -137,7 +128,7 @@ sub process_file($)
 	unless ($opt_quiet) { print "Compiling $idl_file\n"; }
 
 	if ($opt_parse) {
-		$pidl = IdlParse($idl_file);
+		$pidl = $idl_parser->parse_idl($idl_file);
 		defined @$pidl || die "Failed to parse $idl_file";
 		typelist::LoadIdl($pidl);
 		IdlValidator::Validate($pidl);
@@ -271,7 +262,6 @@ $dcom
 	}
 }
 
-
 foreach my $filename (@ARGV) {
 	process_file($filename);
 }
diff --git a/source4/build/pidl/test.pm b/source4/build/pidl/test.pm
index 5f25d4195c..920db52aa5 100644
--- a/source4/build/pidl/test.pm
+++ b/source4/build/pidl/test.pm
@@ -87,7 +87,7 @@ sub link_files($$)
 {
 	my ($exe_name,$objs) = @_;
 
-	return system($cc, @ldflags, '-Lbin', '-lrpc', '-o', $exe_name, @$objs);
+	return system($cc, @ldflags, '-Lbin', '-o', $exe_name, @$objs, '-lrpc', '-ldl', '-lldap');
 }
 
 sub test_idl($$$$)
diff --git a/source4/build/pidl/util.pm b/source4/build/pidl/util.pm
index 5adbea3859..0037de8713 100644
--- a/source4/build/pidl/util.pm
+++ b/source4/build/pidl/util.pm
@@ -83,6 +83,7 @@ sub CleanData($)
 	    if (ref($v->{$x}) eq "ARRAY" && $#{$v->{$x}}==-1) { delete($v->{$x}); next; }
 	}
     }
+	return $v;
 }
 
 
-- 
cgit