##// END OF EJS Templates
parsers: ensure correct return type for inline_scan...
Henrik Stuart -
r22401:9ba8a93e default
parent child Browse files
Show More
@@ -524,7 +524,7 b' static Py_ssize_t index_length(const ind'
524 static PyObject *nullentry;
524 static PyObject *nullentry;
525 static const char nullid[20];
525 static const char nullid[20];
526
526
527 static long inline_scan(indexObject *self, const char **offsets);
527 static Py_ssize_t inline_scan(indexObject *self, const char **offsets);
528
528
529 #if LONG_MAX == 0x7fffffffL
529 #if LONG_MAX == 0x7fffffffL
530 static char *tuple_format = "Kiiiiiis#";
530 static char *tuple_format = "Kiiiiiis#";
@@ -1853,7 +1853,7 b' static int index_assign_subscript(indexO'
1853 * Find all RevlogNG entries in an index that has inline data. Update
1853 * Find all RevlogNG entries in an index that has inline data. Update
1854 * the optional "offsets" table with those entries.
1854 * the optional "offsets" table with those entries.
1855 */
1855 */
1856 static long inline_scan(indexObject *self, const char **offsets)
1856 static Py_ssize_t inline_scan(indexObject *self, const char **offsets)
1857 {
1857 {
1858 const char *data = PyString_AS_STRING(self->data);
1858 const char *data = PyString_AS_STRING(self->data);
1859 Py_ssize_t pos = 0;
1859 Py_ssize_t pos = 0;
@@ -1913,7 +1913,7 b' static int index_init(indexObject *self,'
1913 Py_INCREF(self->data);
1913 Py_INCREF(self->data);
1914
1914
1915 if (self->inlined) {
1915 if (self->inlined) {
1916 long len = inline_scan(self, NULL);
1916 Py_ssize_t len = inline_scan(self, NULL);
1917 if (len == -1)
1917 if (len == -1)
1918 goto bail;
1918 goto bail;
1919 self->raw_length = len;
1919 self->raw_length = len;
General Comments 0
You need to be logged in to leave comments. Login now