Show More
@@ -912,7 +912,7 static int check_filter(PyObject *filter | |||||
912 | } |
|
912 | } | |
913 |
|
913 | |||
914 | static Py_ssize_t add_roots_get_min(indexObject *self, PyObject *list, |
|
914 | static Py_ssize_t add_roots_get_min(indexObject *self, PyObject *list, | |
915 |
|
|
915 | Py_ssize_t marker, char *phases) | |
916 | { |
|
916 | { | |
917 | PyObject *iter = NULL; |
|
917 | PyObject *iter = NULL; | |
918 | PyObject *iter_item = NULL; |
|
918 | PyObject *iter_item = NULL; | |
@@ -938,7 +938,7 static Py_ssize_t add_roots_get_min(inde | |||||
938 | } |
|
938 | } | |
939 |
|
939 | |||
940 | static inline void set_phase_from_parents(char *phases, int parent_1, |
|
940 | static inline void set_phase_from_parents(char *phases, int parent_1, | |
941 |
int parent_2, |
|
941 | int parent_2, Py_ssize_t i) | |
942 | { |
|
942 | { | |
943 | if (parent_1 >= 0 && phases[parent_1] > phases[i]) |
|
943 | if (parent_1 >= 0 && phases[parent_1] > phases[i]) | |
944 | phases[i] = phases[parent_1]; |
|
944 | phases[i] = phases[parent_1]; | |
@@ -960,7 +960,7 static PyObject *compute_phases(indexObj | |||||
960 | Py_ssize_t minrevallphases = 0; |
|
960 | Py_ssize_t minrevallphases = 0; | |
961 | Py_ssize_t minrevphase = 0; |
|
961 | Py_ssize_t minrevphase = 0; | |
962 | Py_ssize_t i = 0; |
|
962 | Py_ssize_t i = 0; | |
963 |
|
|
963 | int parent_1, parent_2; | |
964 | char *phases = NULL; |
|
964 | char *phases = NULL; | |
965 | const char *data; |
|
965 | const char *data; | |
966 |
|
966 | |||
@@ -998,8 +998,8 static PyObject *compute_phases(indexObj | |||||
998 | PyErr_SetString(PyExc_TypeError, "revlog parents are invalid"); |
|
998 | PyErr_SetString(PyExc_TypeError, "revlog parents are invalid"); | |
999 | goto release_phases; |
|
999 | goto release_phases; | |
1000 | } |
|
1000 | } | |
1001 | parent_1 = PyInt_AS_LONG(p1); |
|
1001 | parent_1 = (int)PyInt_AS_LONG(p1); | |
1002 | parent_2 = PyInt_AS_LONG(p2); |
|
1002 | parent_2 = (int)PyInt_AS_LONG(p2); | |
1003 | set_phase_from_parents(phases, parent_1, parent_2, i+self->raw_length); |
|
1003 | set_phase_from_parents(phases, parent_1, parent_2, i+self->raw_length); | |
1004 | } |
|
1004 | } | |
1005 | } |
|
1005 | } |
General Comments 0
You need to be logged in to leave comments.
Login now