Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 1 | From 8740a288ca468433141341347aa115b9544891d3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Thomas Klausner <wiz@NetBSD.org> |
| 3 | Date: Thu, 19 May 2016 17:31:18 +0200 |
| 4 | Subject: [PATCH] Fix inconsistent use of tabs vs. space. |
| 5 | |
| 6 | Needed for at least python-3.5.x. |
| 7 | |
| 8 | Signed-off-by: Thomas Klausner <wiz@NetBSD.org> |
| 9 | Signed-off-by: Uli Schlachter <psychon@znc.in> |
| 10 | |
| 11 | Upstream-Status: Backport |
| 12 | |
| 13 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| 14 | --- |
| 15 | src/c_client.py | 14 +++++++------- |
| 16 | 1 file changed, 7 insertions(+), 7 deletions(-) |
| 17 | |
| 18 | diff --git a/src/c_client.py b/src/c_client.py |
| 19 | index 57de3fb..043338d 100644 |
| 20 | --- a/src/c_client.py |
| 21 | +++ b/src/c_client.py |
| 22 | @@ -1364,7 +1364,7 @@ def _c_serialize(context, self): |
| 23 | _c(' unsigned int xcb_align_to = 0;') |
| 24 | if self.is_switch: |
| 25 | _c(' unsigned int xcb_padding_offset = %d;', |
| 26 | - self.get_align_offset() ) |
| 27 | + self.get_align_offset() ) |
| 28 | prefix = [('_aux', '->', self)] |
| 29 | aux_ptr = 'xcb_out' |
| 30 | |
| 31 | @@ -1390,7 +1390,7 @@ def _c_serialize(context, self): |
| 32 | _c(' unsigned int xcb_align_to = 0;') |
| 33 | if self.is_switch: |
| 34 | _c(' unsigned int xcb_padding_offset = %d;', |
| 35 | - self.get_align_offset() ) |
| 36 | + self.get_align_offset() ) |
| 37 | |
| 38 | elif 'sizeof' == context: |
| 39 | param_names = [p[2] for p in params] |
| 40 | @@ -1930,14 +1930,14 @@ def _c_accessors_list(self, field): |
| 41 | # from the request size and divide that by the member size |
| 42 | return '(((R->length * 4) - sizeof('+ self.c_type + '))/'+'sizeof('+field.type.member.c_wiretype+'))' |
| 43 | else: |
| 44 | - # use the accessor to get the start of the list, then |
| 45 | - # compute the length of it by subtracting it from |
| 46 | + # use the accessor to get the start of the list, then |
| 47 | + # compute the length of it by subtracting it from |
| 48 | # the adress of the first byte after the end of the |
| 49 | # request |
| 50 | - after_end_of_request = '(((char*)R) + R->length * 4)' |
| 51 | - start_of_list = '%s(R)' % (field.c_accessor_name) |
| 52 | + after_end_of_request = '(((char*)R) + R->length * 4)' |
| 53 | + start_of_list = '%s(R)' % (field.c_accessor_name) |
| 54 | bytesize_of_list = '%s - (char*)(%s)' % (after_end_of_request, start_of_list) |
| 55 | - return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype) |
| 56 | + return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype) |
| 57 | else: |
| 58 | raise Exception( |
| 59 | "lengthless lists with varsized members are not supported. Fieldname '%s'" |
| 60 | -- |
| 61 | 2.9.0 |
| 62 | |