summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2003-11-20 02:03:36 +0000
committerAndrew Tridgell <tridge@samba.org>2003-11-20 02:03:36 +0000
commit52461a3d14465b6c732d31a37bad6465818bbe7f (patch)
tree146f22d143abd587977ab99f32e649781a334f2a /source4
parent427bb5541b25752cd9e77b61b6bf7f2f91010788 (diff)
downloadsamba-52461a3d14465b6c732d31a37bad6465818bbe7f.tar.gz
samba-52461a3d14465b6c732d31a37bad6465818bbe7f.tar.bz2
samba-52461a3d14465b6c732d31a37bad6465818bbe7f.zip
its LoadStructure() in util.pm that doesn't like strict perl - any
perl gurus out there know why? (This used to be commit a1d9afc92fce52a76c0a233513b2cb24f0cb9cf5)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/pidl/util.pm20
1 files changed, 9 insertions, 11 deletions
diff --git a/source4/build/pidl/util.pm b/source4/build/pidl/util.pm
index 192d56316a..53ad4942c7 100644
--- a/source4/build/pidl/util.pm
+++ b/source4/build/pidl/util.pm
@@ -6,12 +6,17 @@ package util;
use Data::Dumper;
-sub dumpit($)
+#####################################################################
+# load a data structure from a file (as saved with SaveStructure)
+sub LoadStructure($)
{
- my $a = shift;
- return Dumper $a;
+ my $f = shift;
+ my $contents = FileLoad($f);
+ return eval "$contents";
}
+use strict;
+
#####################################################################
# flatten an array of arrays into a single array
sub FlattenArray2($)
@@ -137,13 +142,6 @@ sub SaveStructure($$)
}
#####################################################################
-# load a data structure from a file (as saved with SaveStructure)
-sub LoadStructure($)
-{
- return eval FileLoad(shift);
-}
-
-#####################################################################
# see if a pidl property list contains a give property
sub has_property($$)
{
@@ -242,7 +240,6 @@ sub need_wire_pointer($)
return undef;
}
-
# determine if an element is a pass-by-reference structure
sub is_ref_struct($)
{
@@ -319,6 +316,7 @@ sub c_push_prefix($)
return "";
}
+
# determine the C prefix used to refer to a variable when passing to a pull
# return '&' or ''
sub c_pull_prefix($)