svn commit: samba r3282 - in branches/SAMBA_4_0/source/build/pidl: .

[tridge]

Author: tridge
Date: 2004-10-27 04:43:01 +0000 (Wed, 27 Oct 2004)
New Revision: 3282

WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source/build/pidl&rev=3282&nolog=1

Log:
some C pre-processors don't like expressions like
uuid(1ff70682-0a51-30e8-076d-740be8cee98b) so we now accept
uuid("1ff70682-0a51-30e8-076d-740be8cee98b") in pidl, and
automagically add quotes only if needed


Modified:
   branches/SAMBA_4_0/source/build/pidl/header.pm
   branches/SAMBA_4_0/source/build/pidl/swig.pm
   branches/SAMBA_4_0/source/build/pidl/util.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/header.pm
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/header.pm      2004-10-27 04:33:36 UTC (rev 
3281)
+++ branches/SAMBA_4_0/source/build/pidl/header.pm      2004-10-27 04:43:01 UTC (rev 
3282)
@@ -280,7 +280,8 @@
 
     if (defined $interface->{PROPERTIES}->{uuid}) {
            my $name = uc $interface->{NAME};
-           $res .= "#define DCERPC_$name\_UUID 
\"$interface->{PROPERTIES}->{uuid}\"\n";
+           $res .= "#define DCERPC_$name\_UUID " . 
+               util::make_str($interface->{PROPERTIES}->{uuid}) . "\n";
 
                if(!defined $interface->{PROPERTIES}->{version}) { 
$interface->{PROPERTIES}->{version} = "0.0"; }
            $res .= "#define DCERPC_$name\_VERSION 
$interface->{PROPERTIES}->{version}\n";

Modified: branches/SAMBA_4_0/source/build/pidl/swig.pm
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/swig.pm        2004-10-27 04:33:36 UTC (rev 
3281)
+++ branches/SAMBA_4_0/source/build/pidl/swig.pm        2004-10-27 04:43:01 UTC (rev 
3282)
@@ -662,7 +662,8 @@
 
     if ($hdr->{PROPERTIES}{uuid}) {
        my($name) = $hdr->{NAME};
-       $result .= "#define DCERPC_" . uc($name) . "_UUID 
\"$hdr->{PROPERTIES}->{uuid}\"\n";
+       $result .= "#define DCERPC_" . uc($name) . "_UUID " . 
+           util::make_str($hdr->{PROPERTIES}->{uuid}) . "\n";
        $result .= "const int DCERPC_" . uc($name) . "_VERSION = " . 
$hdr->{PROPERTIES}->{version} . ";\n";
        $result .= "#define DCERPC_" . uc($name) . "_NAME \"" . $name . "\"\n";
        $result .= "\n";

Modified: branches/SAMBA_4_0/source/build/pidl/util.pm
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/util.pm        2004-10-27 04:33:36 UTC (rev 
3281)
+++ branches/SAMBA_4_0/source/build/pidl/util.pm        2004-10-27 04:43:01 UTC (rev 
3282)
@@ -390,5 +390,15 @@
        return 0;
 }
 
+# return a "" quoted string, unless already quoted
+sub make_str($)
+{
+       my $str = shift;
+       if (substr($str, 0, 1) eq "\"") {
+               return $str;
+       }
+       return "\"" . $str . "\"";
+}
+
 1;