Mercurial > hg
diff mercurial/cext/revlog.c @ 39219:f85b25608252
index: move raise_revlog_error() further up
I will add another caller below it.
Differential Revision: https://phab.mercurial-scm.org/D4119
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 03 Aug 2018 23:03:13 -0700 |
parents | b85b377e7fc2 |
children | fcaffbd7e635 |
line wrap: on
line diff
--- a/mercurial/cext/revlog.c Fri Jul 06 07:53:23 2018 -0700 +++ b/mercurial/cext/revlog.c Fri Aug 03 23:03:13 2018 -0700 @@ -103,6 +103,36 @@ /* A RevlogNG v1 index entry is 64 bytes long. */ static const long v1_hdrsize = 64; +static void raise_revlog_error(void) +{ + PyObject *mod = NULL, *dict = NULL, *errclass = NULL; + + mod = PyImport_ImportModule("mercurial.error"); + if (mod == NULL) { + goto cleanup; + } + + dict = PyModule_GetDict(mod); + if (dict == NULL) { + goto cleanup; + } + Py_INCREF(dict); + + errclass = PyDict_GetItemString(dict, "RevlogError"); + if (errclass == NULL) { + PyErr_SetString(PyExc_SystemError, + "could not find RevlogError"); + goto cleanup; + } + + /* value of exception is ignored by callers */ + PyErr_SetString(errclass, "RevlogError"); + +cleanup: + Py_XDECREF(dict); + Py_XDECREF(mod); +} + /* * Return a pointer to the beginning of a RevlogNG record. */ @@ -1284,36 +1314,6 @@ return -2; } -static void raise_revlog_error(void) -{ - PyObject *mod = NULL, *dict = NULL, *errclass = NULL; - - mod = PyImport_ImportModule("mercurial.error"); - if (mod == NULL) { - goto cleanup; - } - - dict = PyModule_GetDict(mod); - if (dict == NULL) { - goto cleanup; - } - Py_INCREF(dict); - - errclass = PyDict_GetItemString(dict, "RevlogError"); - if (errclass == NULL) { - PyErr_SetString(PyExc_SystemError, - "could not find RevlogError"); - goto cleanup; - } - - /* value of exception is ignored by callers */ - PyErr_SetString(errclass, "RevlogError"); - -cleanup: - Py_XDECREF(dict); - Py_XDECREF(mod); -} - static PyObject *index_getitem(indexObject *self, PyObject *value) { char *node;