equal
deleted
inserted
replaced
46 { |
46 { |
47 PyObject *mfdict, *fdict; |
47 PyObject *mfdict, *fdict; |
48 char *str, *start, *end; |
48 char *str, *start, *end; |
49 int len; |
49 int len; |
50 |
50 |
51 if (!PyArg_ParseTuple(args, "O!O!s#:parse_manifest", &PyDict_Type, |
51 if (!PyArg_ParseTuple( |
52 &mfdict, &PyDict_Type, &fdict, &str, &len)) |
52 args, PY23("O!O!s#:parse_manifest", "O!O!y#:parse_manifest"), |
|
53 &PyDict_Type, &mfdict, &PyDict_Type, &fdict, &str, &len)) |
53 goto quit; |
54 goto quit; |
54 |
55 |
55 start = str; |
56 start = str; |
56 end = str + len; |
57 end = str + len; |
57 while (start < end) { |
58 while (start < end) { |
239 char state, *cur, *str, *cpos; |
240 char state, *cur, *str, *cpos; |
240 int mode, size, mtime; |
241 int mode, size, mtime; |
241 unsigned int flen, len, pos = 40; |
242 unsigned int flen, len, pos = 40; |
242 int readlen; |
243 int readlen; |
243 |
244 |
244 if (!PyArg_ParseTuple(args, "O!O!s#:parse_dirstate", &PyDict_Type, |
245 if (!PyArg_ParseTuple( |
245 &dmap, &PyDict_Type, &cmap, &str, &readlen)) |
246 args, PY23("O!O!s#:parse_dirstate", "O!O!y#:parse_dirstate"), |
|
247 &PyDict_Type, &dmap, &PyDict_Type, &cmap, &str, &readlen)) |
246 goto quit; |
248 goto quit; |
247 |
249 |
248 len = readlen; |
250 len = readlen; |
249 |
251 |
250 /* read parents */ |
252 /* read parents */ |
643 const char *data, *dataend; |
645 const char *data, *dataend; |
644 int datalen; |
646 int datalen; |
645 Py_ssize_t offset, stop; |
647 Py_ssize_t offset, stop; |
646 PyObject *markers = NULL; |
648 PyObject *markers = NULL; |
647 |
649 |
648 if (!PyArg_ParseTuple(args, "s#nn", &data, &datalen, &offset, &stop)) { |
650 if (!PyArg_ParseTuple(args, PY23("s#nn", "y#nn"), &data, &datalen, |
|
651 &offset, &stop)) { |
649 return NULL; |
652 return NULL; |
650 } |
653 } |
651 dataend = data + datalen; |
654 dataend = data + datalen; |
652 data += offset; |
655 data += offset; |
653 markers = PyList_New(0); |
656 markers = PyList_New(0); |