Changeset 53885 in vbox

Timestamp:

Jan 21, 2015 2:57:33 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

97725

Message:

micro opts.

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (2 diffs)
• idl/apiwrap-server.xsl (modified) (5 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -1189 +1189 @@
         $(call MSG_L1,Generating C++ Server API wrapper header files from XIDL)
         $(QUIET)$(RM) -f -- $(filter-out $(VBOX_MAIN_APIWRAPPER_GEN_HDRS), $(wildcard $(VBoxAPIWrap_0_OUTDIR)/*.h))
-        $(QUIET)kmk_time $(VBOX_XSLTPROC) --stringparam KBUILD_HOST $(KBUILD_HOST) \
+        $(QUIET)$(VBOX_XSLTPROC) --stringparam KBUILD_HOST $(KBUILD_HOST) \
                 --stringparam generating "headers" \
                 --stringparam filelistonly "" \
@@ -1205 +1205 @@
         $(call MSG_L1,Generating DTrace Provider for the VBox API (from XIDL))
         $(QUIET)$(RM) -f -- "$@" "[email protected]"
-        $(QUIET)kmk_time $(VBOX_XSLTPROC) --stringparam KBUILD_HOST $(KBUILD_HOST) \
+        $(QUIET)$(VBOX_XSLTPROC) --stringparam KBUILD_HOST $(KBUILD_HOST) \
                 --stringparam generating "dtrace-probes" \
                 --stringparam filelistonly "" \

trunk/src/VBox/Main/idl/apiwrap-server.xsl

@@ -479 +479 @@
             <xsl:value-of select="$dtracetypefield"/>
         </xsl:when>
+        <xsl:when test="$type='$unknown'">
+            <!-- <xsl:text>struct IUnknown *</xsl:text> -->
+            <xsl:text>void *</xsl:text>
+        </xsl:when>
         <xsl:when test="//enum[@name=$type]">
             <!-- <xsl:value-of select="concat($type, '_T')"/> - later we can emit enums into dtrace the library -->
             <xsl:text>int</xsl:text>
-        </xsl:when>
-        <xsl:when test="$type='$unknown'">
-            <!-- <xsl:text>struct IUnknown *</xsl:text> -->
-            <xsl:text>void *</xsl:text>
         </xsl:when>
         <xsl:when test="//interface[@name=$type]">
@@ -610 +610 @@
         </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="lastchar">
+        <xsl:value-of select="substring($wraptype, string-length($wraptype))"/>
+    </xsl:variable>
 
     <xsl:choose>
@@ -618 +621 @@
             <xsl:text>std::vector&lt;</xsl:text>
             <xsl:choose>
-                <xsl:when test="substring($wraptype,string-length($wraptype))='&amp;'">
+                <xsl:when test="$lastchar = '&amp;'">
                     <xsl:variable name="wraptype2">
-                        <xsl:value-of select="substring($wraptype,1,string-length($wraptype)-2)"/>
+                        <xsl:value-of select="substring($wraptype, 1, string-length($wraptype)-2)"/>
                     </xsl:variable>
-
-                    <xsl:choose>
-                        <xsl:when test="substring($wraptype2,string-length($wraptype2))='&gt;'">
-                            <xsl:value-of select="concat($wraptype2, ' ')"/>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:value-of select="$wraptype2"/>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                </xsl:when>
-                <xsl:when test="substring($wraptype,string-length($wraptype))='&gt;'">
+                    <xsl:value-of select="$wraptype2"/>
+                    <xsl:if test="substring($wraptype2,string-length($wraptype2)) = '&gt;'">
+                        <xsl:text> </xsl:text>
+                    </xsl:if>
+                </xsl:when>
+                <xsl:when test="lastchar = '&gt;'">
                     <xsl:value-of select="concat($wraptype, ' ')"/>
                 </xsl:when>
@@ -643 +641 @@
         <xsl:otherwise>
             <xsl:value-of select="$wraptype"/>
-            <xsl:if test="substring($wraptype,string-length($wraptype))!='&amp;'">
-                <xsl:if test="substring($wraptype,string-length($wraptype))!='*'">
+            <xsl:if test="$lastchar != '&amp;'">
+                <xsl:if test="$lastchar != '*'">
                     <xsl:text> </xsl:text>
                 </xsl:if>
@@ -863 +861 @@
     <xsl:variable name="type" select="."/>
     <xsl:choose>
-        <xsl:when test="$type = 'wstring' or $type = '$unknown' or $type = 'uuid' or ../@safearray = 'yes'">
+        <xsl:when test="$type = 'wstring' or $type = '$unknown' or $type = 'uuid'">
+            <xsl:text>yes</xsl:text>
+        </xsl:when>
+        <xsl:when test="$type = 'boolean' or $type = 'long' or $type = 'long' or $type = 'long long'"/>
+        <xsl:when test="../@safearray = 'yes'">
             <xsl:text>yes</xsl:text>
         </xsl:when>