@@ -38,10 +38,11 @@ def __init__(self, size, datatype = 'char', sizetype = 'int', sizeformat = None)
3838 self .sizeformat = sizeformat or type2format [sizetype ]
3939 self .label_needed = 0
4040
41- def getDeclarations (self , name , reference = False ):
41+ def getArgDeclarations (self , name , reference = False ):
4242 if reference :
4343 raise RuntimeError , "Cannot pass buffer types by reference"
44- return self .getBufferDeclarations (name ) + self .getSizeDeclarations (name )
44+ return (self .getBufferDeclarations (name ) +
45+ self .getSizeDeclarations (name ))
4546
4647 def getBufferDeclarations (self , name ):
4748 return self .getInputBufferDeclarations (name ) + self .getOutputBufferDeclarations (name )
@@ -53,10 +54,10 @@ def getOutputBufferDeclarations(self, name):
5354 return ["%s %s__out__[%s]" % (self .datatype , name , self .size )]
5455
5556 def getSizeDeclarations (self , name ):
56- return [
57- "%s %s__len__" % ( self . sizetype , name ),
58- "int %s__in_len__" % ( name )
59- ]
57+ return ["%s %s__len__" % ( self . sizetype , name )]
58+
59+ def getAuxDeclarations ( self , name ):
60+ return [ "int %s__in_len__" % ( name ) ]
6061
6162 def getargsFormat (self ):
6263 return "s#"
@@ -189,6 +190,9 @@ def getInputBufferDeclarations(self, name):
189190 return ["%s *%s__in__" % (self .type , name )]
190191
191192 def getSizeDeclarations (self , name ):
193+ return []
194+
195+ def getAuxDeclarations (self , name ):
192196 return ["int %s__in_len__" % (name )]
193197
194198 def getOutputBufferDeclarations (self , name ):
@@ -248,6 +252,9 @@ class StructOutputBufferType(OutputOnlyBufferMixIn, StructInputOutputBufferType)
248252 def getSizeDeclarations (self , name ):
249253 return []
250254
255+ def getAuxDeclarations (self , name ):
256+ return []
257+
251258 def passOutput (self , name ):
252259 return "&%s__out__" % name
253260
@@ -262,5 +269,8 @@ class ArrayOutputBufferType(OutputOnlyBufferMixIn, StructInputOutputBufferType):
262269 def getSizeDeclarations (self , name ):
263270 return []
264271
272+ def getAuxDeclarations (self , name ):
273+ return []
274+
265275 def passOutput (self , name ):
266276 return "%s__out__" % name
0 commit comments