|
Marty Plummer |
d5fd27 |
From 8740a288ca468433141341347aa115b9544891d3 Mon Sep 17 00:00:00 2001
|
|
Marty Plummer |
d5fd27 |
From: Thomas Klausner <wiz@NetBSD.org>
|
|
Marty Plummer |
d5fd27 |
Date: Thu, 19 May 2016 17:31:18 +0200
|
|
Marty Plummer |
d5fd27 |
Subject: Fix inconsistent use of tabs vs. space.
|
|
Marty Plummer |
d5fd27 |
|
|
Marty Plummer |
d5fd27 |
Needed for at least python-3.5.x.
|
|
Marty Plummer |
d5fd27 |
|
|
Marty Plummer |
d5fd27 |
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
|
|
Marty Plummer |
d5fd27 |
Signed-off-by: Uli Schlachter <psychon@znc.in>
|
|
Marty Plummer |
d5fd27 |
|
|
Marty Plummer |
d5fd27 |
diff --git a/src/c_client.py b/src/c_client.py
|
|
Marty Plummer |
d5fd27 |
index 57de3fb..043338d 100644
|
|
Marty Plummer |
d5fd27 |
--- a/src/c_client.py
|
|
Marty Plummer |
d5fd27 |
+++ b/src/c_client.py
|
|
Marty Plummer |
d5fd27 |
@@ -1364,7 +1364,7 @@ def _c_serialize(context, self):
|
|
Marty Plummer |
d5fd27 |
_c(' unsigned int xcb_align_to = 0;')
|
|
Marty Plummer |
d5fd27 |
if self.is_switch:
|
|
Marty Plummer |
d5fd27 |
_c(' unsigned int xcb_padding_offset = %d;',
|
|
Marty Plummer |
d5fd27 |
- self.get_align_offset() )
|
|
Marty Plummer |
d5fd27 |
+ self.get_align_offset() )
|
|
Marty Plummer |
d5fd27 |
prefix = [('_aux', '->', self)]
|
|
Marty Plummer |
d5fd27 |
aux_ptr = 'xcb_out'
|
|
Marty Plummer |
d5fd27 |
|
|
Marty Plummer |
d5fd27 |
@@ -1390,7 +1390,7 @@ def _c_serialize(context, self):
|
|
Marty Plummer |
d5fd27 |
_c(' unsigned int xcb_align_to = 0;')
|
|
Marty Plummer |
d5fd27 |
if self.is_switch:
|
|
Marty Plummer |
d5fd27 |
_c(' unsigned int xcb_padding_offset = %d;',
|
|
Marty Plummer |
d5fd27 |
- self.get_align_offset() )
|
|
Marty Plummer |
d5fd27 |
+ self.get_align_offset() )
|
|
Marty Plummer |
d5fd27 |
|
|
Marty Plummer |
d5fd27 |
elif 'sizeof' == context:
|
|
Marty Plummer |
d5fd27 |
param_names = [p[2] for p in params]
|
|
Marty Plummer |
d5fd27 |
@@ -1930,14 +1930,14 @@ def _c_accessors_list(self, field):
|
|
Marty Plummer |
d5fd27 |
# from the request size and divide that by the member size
|
|
Marty Plummer |
d5fd27 |
return '(((R->length * 4) - sizeof('+ self.c_type + '))/'+'sizeof('+field.type.member.c_wiretype+'))'
|
|
Marty Plummer |
d5fd27 |
else:
|
|
Marty Plummer |
d5fd27 |
- # use the accessor to get the start of the list, then
|
|
Marty Plummer |
d5fd27 |
- # compute the length of it by subtracting it from
|
|
Marty Plummer |
d5fd27 |
+ # use the accessor to get the start of the list, then
|
|
Marty Plummer |
d5fd27 |
+ # compute the length of it by subtracting it from
|
|
Marty Plummer |
d5fd27 |
# the adress of the first byte after the end of the
|
|
Marty Plummer |
d5fd27 |
# request
|
|
Marty Plummer |
d5fd27 |
- after_end_of_request = '(((char*)R) + R->length * 4)'
|
|
Marty Plummer |
d5fd27 |
- start_of_list = '%s(R)' % (field.c_accessor_name)
|
|
Marty Plummer |
d5fd27 |
+ after_end_of_request = '(((char*)R) + R->length * 4)'
|
|
Marty Plummer |
d5fd27 |
+ start_of_list = '%s(R)' % (field.c_accessor_name)
|
|
Marty Plummer |
d5fd27 |
bytesize_of_list = '%s - (char*)(%s)' % (after_end_of_request, start_of_list)
|
|
Marty Plummer |
d5fd27 |
- return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype)
|
|
Marty Plummer |
d5fd27 |
+ return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype)
|
|
Marty Plummer |
d5fd27 |
else:
|
|
Marty Plummer |
d5fd27 |
raise Exception(
|
|
Marty Plummer |
d5fd27 |
"lengthless lists with varsized members are not supported. Fieldname '%s'"
|
|
Marty Plummer |
d5fd27 |
--
|
|
Marty Plummer |
d5fd27 |
cgit v0.10.2
|
|
Marty Plummer |
d5fd27 |
|