The branch, v4-0-test has been updated
via 79344c9c5e0e38155facb0c7b16e84a0dca3d2eb (commit)
from d6b06fc03e37781f5f59b15cff8fe3ee8df63444 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 79344c9c5e0e38155facb0c7b16e84a0dca3d2eb
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Fri Jan 11 20:19:47 2008 +0100
pidl: Remove multiple copies of get_pointer_of and get_value_of.
-----------------------------------------------------------------------
Summary of changes:
source/pidl/lib/Parse/Pidl/CUtil.pm | 39 +++++++++++++++++++++++
source/pidl/lib/Parse/Pidl/Samba4/EJS.pm | 27 +--------------
source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 24 +-------------
3 files changed, 42 insertions(+), 48 deletions(-)
create mode 100644 source/pidl/lib/Parse/Pidl/CUtil.pm
Changeset truncated at 500 lines:
diff --git a/source/pidl/lib/Parse/Pidl/CUtil.pm
b/source/pidl/lib/Parse/Pidl/CUtil.pm
new file mode 100644
index 0000000..bd7b168
--- /dev/null
+++ b/source/pidl/lib/Parse/Pidl/CUtil.pm
@@ -0,0 +1,39 @@
+###################################################
+# C utility functions for pidl
+# Copyright [EMAIL PROTECTED] 2005-2007
+# released under the GNU GPL
+package Parse::Pidl::CUtil;
+
+require Exporter;
[EMAIL PROTECTED] = qw(Exporter);
[EMAIL PROTECTED] = qw(get_pointer_to get_value_of);
+use vars qw($VERSION);
+$VERSION = '0.01';
+
+use strict;
+
+sub get_pointer_to($)
+{
+ my $var_name = shift;
+
+ if ($var_name =~ /^\*(.*)$/) {
+ return $1;
+ } elsif ($var_name =~ /^\&(.*)$/) {
+ return "&($var_name)";
+ } else {
+ return "&$var_name";
+ }
+}
+
+sub get_value_of($)
+{
+ my $var_name = shift;
+
+ if ($var_name =~ /^\&(.*)$/) {
+ return $1;
+ } else {
+ return "*$var_name";
+ }
+}
+
+1;
diff --git a/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm
b/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm
index 2e9bc09..36cc469 100644
--- a/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm
+++ b/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm
@@ -8,10 +8,11 @@ package Parse::Pidl::Samba4::EJS;
use Exporter;
@ISA = qw(Exporter);
[EMAIL PROTECTED] = qw(get_pointer_to get_value_of check_null_pointer
fn_declare TypeFunctionName);
[EMAIL PROTECTED] = qw(check_null_pointer fn_declare TypeFunctionName);
use strict;
use Parse::Pidl::Typelist;
+use Parse::Pidl::CUtil qw(get_pointer_to get_value_of);
use Parse::Pidl::Util qw(has_property ParseExpr);
use Parse::Pidl::NDR qw(GetPrevLevel GetNextLevel);
use Parse::Pidl::Samba4::NDR::Parser qw(GenerateStructEnv GenerateFunctionInEnv
@@ -54,30 +55,6 @@ sub deindent($)
$self->{tabs} = substr($self->{tabs}, 0, -1);
}
-sub get_pointer_to($)
-{
- my $var_name = shift;
-
- if ($var_name =~ /^\*(.*)$/) {
- return $1;
- } elsif ($var_name =~ /^\&(.*)$/) {
- return "&($var_name)";
- } else {
- return "&$var_name";
- }
-}
-
-sub get_value_of($)
-{
- my $var_name = shift;
-
- if ($var_name =~ /^\&(.*)$/) {
- return $1;
- } else {
- return "*$var_name";
- }
-}
-
#####################################################################
# check that a variable we get from ParseExpr isn't a null pointer
sub check_null_pointer($$)
diff --git a/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
b/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index c9b48b0..a261910 100644
--- a/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -14,6 +14,7 @@ require Exporter;
use strict;
use Parse::Pidl::Typelist qw(hasType getType mapTypeName);
use Parse::Pidl::Util qw(has_property ParseExpr ParseExprExt print_uuid);
+use Parse::Pidl::CUtil qw(get_pointer_to get_value_of);
use Parse::Pidl::NDR qw(GetPrevLevel GetNextLevel ContainsDeferred);
use Parse::Pidl::Samba4 qw(is_intree choose_header);
use Parse::Pidl qw(warning);
@@ -89,29 +90,6 @@ sub is_charset_array($$)
return has_property($e, "charset");
}
-sub get_pointer_to($)
-{
- my $var_name = shift;
-
- if ($var_name =~ /^\*(.*)$/) {
- return $1;
- } elsif ($var_name =~ /^\&(.*)$/) {
- return "&($var_name)";
- } else {
- return "&$var_name";
- }
-}
-
-sub get_value_of($)
-{
- my $var_name = shift;
-
- if ($var_name =~ /^\&(.*)$/) {
- return $1;
- } else {
- return "*$var_name";
- }
-}
####################################
# pidl() is our basic output routine
--
Samba Shared Repository
