Meliae

Merge lp:~cjwatson/meliae/syntax-cleanups into lp:meliae

  1. syntax-cleanups
  2. Merge into trunk
Proposed by Colin Watson
Status: Merged
Approved by: John A Meinel
Approved revision: 202
Merged at revision: 205
Proposed branch: lp:~cjwatson/meliae/syntax-cleanups
Merge into: lp:meliae
Prerequisite: lp:~cjwatson/meliae/tox
Diff against target: 131 lines (+20/-12)
4 files modified
meliae/_intset.pyx (+6/-3)
meliae/_loader.pyx (+8/-3)
meliae/_scanner_core.c (+4/-4)
meliae/_scanner_core.h (+2/-2)
To merge this branch: bzr merge lp:~cjwatson/meliae/syntax-cleanups
Reviewer Review Type Date Requested Status
John A Meinel Approve
Review via email: mp+378249@code.launchpad.net

Commit message

Fix some minor Cython/C warnings.

To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

LGTM, assuming the precursor lands

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'meliae/_intset.pyx'
2--- meliae/_intset.pyx 2010-07-28 21:13:06 +0000
3+++ meliae/_intset.pyx 2020-01-29 13:16:24 +0000
4@@ -85,7 +85,8 @@
5 cdef int_type *_lookup(self, int_type c_val) except NULL:
6 """Taken from the set() algorithm."""
7 cdef size_t offset, perturb
8- cdef int_type *entry, *freeslot
9+ cdef int_type *entry
10+ cdef int_type *freeslot
11
12 if self._array == NULL:
13 raise RuntimeError('cannot _lookup without _array allocated.')
14@@ -145,7 +146,8 @@
15 cdef int _grow(self) except -1:
16 cdef int i
17 cdef Py_ssize_t old_mask, old_size, new_size, old_count
18- cdef int_type *old_array, val
19+ cdef int_type *old_array
20+ cdef int_type val
21
22 old_mask = self._mask
23 old_size = old_mask + 1
24@@ -244,7 +246,8 @@
25 cdef int_type *_lookup(self, int_type c_val) except NULL:
26 """Taken from the set() algorithm."""
27 cdef size_t offset, perturb
28- cdef int_type *entry, *freeslot
29+ cdef int_type *entry
30+ cdef int_type *freeslot
31 cdef int_type internal_val
32
33 if self._array == NULL:
34
35=== modified file 'meliae/_loader.pyx'
36--- meliae/_loader.pyx 2013-05-19 06:13:48 +0000
37+++ meliae/_loader.pyx 2020-01-29 13:16:24 +0000
38@@ -705,7 +705,9 @@
39 cdef long the_hash
40 cdef size_t i, n_lookup
41 cdef long mask
42- cdef _MemObject **table, **slot, **free_slot
43+ cdef _MemObject **table
44+ cdef _MemObject **slot
45+ cdef _MemObject **free_slot
46 cdef PyObject *py_addr
47
48 py_addr = <PyObject *>address
49@@ -859,7 +861,9 @@
50 """
51 cdef int new_size, remaining
52 cdef size_t n_bytes
53- cdef _MemObject **old_table, **old_slot, **new_table
54+ cdef _MemObject **old_table
55+ cdef _MemObject **old_slot
56+ cdef _MemObject **new_table
57
58 new_size = 1024
59 while new_size <= min_active and new_size > 0:
60@@ -896,7 +900,8 @@
61 def add(self, address, type_str, size, children=(), length=0,
62 value=None, name=None, parent_list=(), total_size=0):
63 """Add a new MemObject to this collection."""
64- cdef _MemObject **slot, *new_entry
65+ cdef _MemObject **slot
66+ cdef _MemObject *new_entry
67 cdef _MemObjectProxy proxy
68
69 slot = self._lookup(address)
70
71=== modified file 'meliae/_scanner_core.c'
72--- meliae/_scanner_core.c 2012-11-20 10:46:37 +0000
73+++ meliae/_scanner_core.c 2020-01-29 13:16:24 +0000
74@@ -60,7 +60,7 @@
75 #else
76 static void _write_to_ref_info(struct ref_info *info, const char *fmt_string, ...);
77 #endif
78-static PyObject * _get_specials();
79+static PyObject * _get_specials(void);
80
81 /* The address of the last thing we dumped. Stuff like dumping the string
82 * interned dictionary will dump the same string 2x in a row. This helps
83@@ -70,7 +70,7 @@
84 static PyObject *_special_case_dict = NULL;
85
86 void
87-_clear_last_dumped()
88+_clear_last_dumped(void)
89 {
90 _last_dumped = NULL;
91 }
92@@ -617,7 +617,7 @@
93 }
94
95 static PyObject *
96-_get_specials()
97+_get_specials(void)
98 {
99 if (_special_case_dict == NULL) {
100 _special_case_dict = PyDict_New();
101@@ -626,7 +626,7 @@
102 }
103
104 PyObject *
105-_get_special_case_dict()
106+_get_special_case_dict(void)
107 {
108 PyObject *ret;
109
110
111=== modified file 'meliae/_scanner_core.h'
112--- meliae/_scanner_core.h 2010-08-09 22:16:14 +0000
113+++ meliae/_scanner_core.h 2020-01-29 13:16:24 +0000
114@@ -50,7 +50,7 @@
115 /**
116 * Clear out what the last object we dumped was.
117 */
118-extern void _clear_last_dumped();
119+extern void _clear_last_dumped(void);
120
121 /**
122 * Return a PyList of all objects referenced via tp_traverse.
123@@ -64,7 +64,7 @@
124 * figured out via trial-and-error.
125 * The key is tp_name strings, the value is a PyInt of the appropriate size.
126 */
127-extern PyObject *_get_special_case_dict();
128+extern PyObject *_get_special_case_dict(void);
129
130
131 #endif // _SCANNER_CORE_H_

Subscribers

People subscribed via source and target branches

to all changes: