X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=retrace.py;h=392519b02739e6abcf1d6b3364e1940c2c3b032b;hb=75e8c9b7c7f2f10d9b7f479d45f58d81ea729d30;hp=55df6ce4bc77b1d14f68588083d1a03e3b1d0ae7;hpb=031b738d60ca4857d128c6b1770da57e2cb7c0fe;p=apitrace

diff --git a/retrace.py b/retrace.py
index 55df6ce..392519b 100644
--- a/retrace.py
+++ b/retrace.py
@@ -190,6 +190,7 @@ class Retracer:
 
     def retrace_function_body(self, function):
         if not function.sideeffects:
+            print '    (void)call;'
             return
 
         success = True
@@ -205,7 +206,9 @@ class Retracer:
                 success = False
                 print '    %s = 0; // FIXME' % arg.name
         if not success:
+            print '    if (1) {'
             self.fail_function(function)
+            print '    }'
         self.call_function(function)
         for arg in function.args:
             if arg.output:
@@ -231,12 +234,16 @@ class Retracer:
 
     def extract_arg(self, function, arg, arg_type, lvalue, rvalue):
         ValueExtractor().visit(arg_type, lvalue, rvalue)
+    
+    def extract_opaque_arg(self, function, arg, arg_type, lvalue, rvalue):
+        OpaqueValueExtractor().visit(arg_type, lvalue, rvalue)
 
     def call_function(self, function):
         arg_names = ", ".join([arg.name for arg in function.args])
         if function.type is not stdapi.Void:
             print '    %s __result;' % (function.type)
             print '    __result = %s(%s);' % (function.name, arg_names)
+            print '    (void)__result;'
         else:
             print '    %s(%s);' % (function.name, arg_names)
 
@@ -250,7 +257,7 @@ class Retracer:
             self.retrace_function(function)
 
         print 'void retrace::retrace_call(Trace::Call &call) {'
-        print '    const char *name = call.name().c_str();'
+        print '    const char *name = call.name();'
         print
 
         func_dict = dict([(function.name, function) for function in functions])