diff options
Diffstat (limited to 'lang/python/helpers.c')
| -rw-r--r-- | lang/python/helpers.c | 124 |
1 files changed, 62 insertions, 62 deletions
diff --git a/lang/python/helpers.c b/lang/python/helpers.c index 3724752..8f71a30 100644 --- a/lang/python/helpers.c +++ b/lang/python/helpers.c @@ -33,7 +33,7 @@ #include "private.h" /* Flag specifying whether this is an in-tree build. */ -int pyme_in_tree_build = +int gpg_in_tree_build = #if IN_TREE_BUILD 1 #else @@ -43,7 +43,7 @@ int pyme_in_tree_build = static PyObject *GPGMEError = NULL; -void _pyme_exception_init(void) { +void _gpg_exception_init(void) { if (GPGMEError == NULL) { PyObject *errors; PyObject *from_list = PyList_New(0); @@ -58,11 +58,11 @@ void _pyme_exception_init(void) { } static PyObject * -_pyme_raise_exception(gpgme_error_t err) +_gpg_raise_exception(gpgme_error_t err) { PyObject *e; - _pyme_exception_init(); + _gpg_exception_init(); if (GPGMEError == NULL) return PyErr_Format(PyExc_RuntimeError, "Got gpgme_error_t %d", err); @@ -76,7 +76,7 @@ _pyme_raise_exception(gpgme_error_t err) return NULL; /* raise */ } -gpgme_error_t _pyme_exception2code(void) { +gpgme_error_t _gpg_exception2code(void) { gpgme_error_t err_status = gpg_error(GPG_ERR_GENERAL); if (GPGMEError && PyErr_ExceptionMatches(GPGMEError)) { PyObject *type = 0, *value = 0, *traceback = 0; @@ -94,7 +94,7 @@ gpgme_error_t _pyme_exception2code(void) { /* Exception support for callbacks. */ #define EXCINFO "_callback_excinfo" -static void _pyme_stash_callback_exception(PyObject *weak_self) +static void _gpg_stash_callback_exception(PyObject *weak_self) { PyObject *self, *ptype, *pvalue, *ptraceback, *excinfo; @@ -136,7 +136,7 @@ static void _pyme_stash_callback_exception(PyObject *weak_self) Py_DECREF(excinfo); } -PyObject *pyme_raise_callback_exception(PyObject *self) +PyObject *gpg_raise_callback_exception(PyObject *self) { PyGILState_STATE state = PyGILState_Ensure(); PyObject *ptype, *pvalue, *ptraceback, *excinfo; @@ -192,7 +192,7 @@ PyObject *pyme_raise_callback_exception(PyObject *self) /* Convert object to a pointer to gpgme type, generic version. */ PyObject * -_pyme_obj2gpgme_t(PyObject *input, const char *objtype, int argnum) +_gpg_obj2gpgme_t(PyObject *input, const char *objtype, int argnum) { PyObject *pyname = NULL, *pypointer = NULL; pyname = PyObject_GetAttrString(input, "_ctype"); @@ -229,7 +229,7 @@ _pyme_obj2gpgme_t(PyObject *input, const char *objtype, int argnum) objects with a fileno method, returning it in WRAPPER. This object must be de-referenced when no longer needed. */ PyObject * -_pyme_obj2gpgme_data_t(PyObject *input, int argnum, gpgme_data_t *wrapper, +_gpg_obj2gpgme_data_t(PyObject *input, int argnum, gpgme_data_t *wrapper, PyObject **bytesio, Py_buffer *view) { gpgme_error_t err; @@ -242,9 +242,9 @@ _pyme_obj2gpgme_data_t(PyObject *input, int argnum, gpgme_data_t *wrapper, err = gpgme_data_new_from_fd(wrapper, (int) PyLong_AsLong(fd)); Py_DECREF(fd); if (err) - return _pyme_raise_exception (err); + return _gpg_raise_exception (err); - return _pyme_wrap_gpgme_data_t(*wrapper); + return _gpg_wrap_gpgme_data_t(*wrapper); } else PyErr_Clear(); @@ -283,17 +283,17 @@ _pyme_obj2gpgme_data_t(PyObject *input, int argnum, gpgme_data_t *wrapper, err = gpgme_data_new_from_mem(wrapper, view->buf, (size_t) view->len, 0); if (err) - return _pyme_raise_exception (err); + return _gpg_raise_exception (err); - return _pyme_wrap_gpgme_data_t(*wrapper); + return _gpg_wrap_gpgme_data_t(*wrapper); } /* As last resort we assume it is a wrapped data object. */ if (PyObject_HasAttrString(data, "_ctype")) - return _pyme_obj2gpgme_t(data, "gpgme_data_t", argnum); + return _gpg_obj2gpgme_t(data, "gpgme_data_t", argnum); return PyErr_Format(PyExc_TypeError, - "arg %d: expected pyme.Data, file, or an object " + "arg %d: expected gpg.Data, file, or an object " "implementing the buffer protocol, got %s", argnum, data->ob_type->tp_name); } @@ -301,7 +301,7 @@ _pyme_obj2gpgme_data_t(PyObject *input, int argnum, gpgme_data_t *wrapper, PyObject * -_pyme_wrap_result(PyObject *fragile, const char *classname) +_gpg_wrap_result(PyObject *fragile, const char *classname) { static PyObject *results; PyObject *class; @@ -348,7 +348,7 @@ static gpgme_error_t pyPassphraseCb(void *hook, PyObject *encoded = NULL; gpgme_error_t err_status = 0; - _pyme_exception_init(); + _gpg_exception_init(); assert (PyTuple_Check(pyhook)); assert (PyTuple_Size(pyhook) == 2 || PyTuple_Size(pyhook) == 3); @@ -385,12 +385,12 @@ static gpgme_error_t pyPassphraseCb(void *hook, retval = PyObject_CallObject(func, args); Py_DECREF(args); if (PyErr_Occurred()) { - err_status = _pyme_exception2code(); + err_status = _gpg_exception2code(); } else { if (!retval) { if (write(fd, "\n", 1) < 0) { err_status = gpgme_error_from_syserror (); - _pyme_raise_exception (err_status); + _gpg_raise_exception (err_status); } } else { char *buf; @@ -425,11 +425,11 @@ static gpgme_error_t pyPassphraseCb(void *hook, if (write(fd, buf, len) < 0) { err_status = gpgme_error_from_syserror (); - _pyme_raise_exception (err_status); + _gpg_raise_exception (err_status); } if (! err_status && write(fd, "\n", 1) < 0) { err_status = gpgme_error_from_syserror (); - _pyme_raise_exception (err_status); + _gpg_raise_exception (err_status); } Py_DECREF(retval); @@ -438,7 +438,7 @@ static gpgme_error_t pyPassphraseCb(void *hook, leave: if (err_status) - _pyme_stash_callback_exception(self); + _gpg_stash_callback_exception(self); Py_XDECREF(encoded); PyGILState_Release(state); @@ -446,7 +446,7 @@ static gpgme_error_t pyPassphraseCb(void *hook, } PyObject * -pyme_set_passphrase_cb(PyObject *self, PyObject *cb) { +gpg_set_passphrase_cb(PyObject *self, PyObject *cb) { PyGILState_STATE state = PyGILState_Ensure(); PyObject *wrapped; gpgme_ctx_t ctx; @@ -459,7 +459,7 @@ pyme_set_passphrase_cb(PyObject *self, PyObject *cb) { return NULL; } - ctx = _pyme_unwrap_gpgme_ctx_t(wrapped); + ctx = _gpg_unwrap_gpgme_ctx_t(wrapped); Py_DECREF(wrapped); if (ctx == NULL) { @@ -512,7 +512,7 @@ static void pyProgressCb(void *hook, const char *what, int type, int current, PyTuple_SetItem(args, 0, PyUnicode_DecodeUTF8(what, strlen (what), "strict")); if (PyErr_Occurred()) { - _pyme_stash_callback_exception(self); + _gpg_stash_callback_exception(self); Py_DECREF(args); PyGILState_Release(state); return; @@ -527,14 +527,14 @@ static void pyProgressCb(void *hook, const char *what, int type, int current, retval = PyObject_CallObject(func, args); if (PyErr_Occurred()) - _pyme_stash_callback_exception(self); + _gpg_stash_callback_exception(self); Py_DECREF(args); Py_XDECREF(retval); PyGILState_Release(state); } PyObject * -pyme_set_progress_cb(PyObject *self, PyObject *cb) { +gpg_set_progress_cb(PyObject *self, PyObject *cb) { PyGILState_STATE state = PyGILState_Ensure(); PyObject *wrapped; gpgme_ctx_t ctx; @@ -547,7 +547,7 @@ pyme_set_progress_cb(PyObject *self, PyObject *cb) { return NULL; } - ctx = _pyme_unwrap_gpgme_ctx_t(wrapped); + ctx = _gpg_unwrap_gpgme_ctx_t(wrapped); Py_DECREF(wrapped); if (ctx == NULL) { @@ -624,19 +624,19 @@ static gpgme_error_t pyStatusCb(void *hook, const char *keyword, retval = PyObject_CallObject(func, pyargs); if (PyErr_Occurred()) - err = _pyme_exception2code(); + err = _gpg_exception2code(); Py_DECREF(pyargs); Py_XDECREF(retval); leave: if (err) - _pyme_stash_callback_exception(self); + _gpg_stash_callback_exception(self); PyGILState_Release(state); return err; } PyObject * -pyme_set_status_cb(PyObject *self, PyObject *cb) { +gpg_set_status_cb(PyObject *self, PyObject *cb) { PyGILState_STATE state = PyGILState_Ensure(); PyObject *wrapped; gpgme_ctx_t ctx; @@ -649,7 +649,7 @@ pyme_set_status_cb(PyObject *self, PyObject *cb) { return NULL; } - ctx = _pyme_unwrap_gpgme_ctx_t(wrapped); + ctx = _gpg_unwrap_gpgme_ctx_t(wrapped); Py_DECREF(wrapped); if (ctx == NULL) { @@ -684,7 +684,7 @@ pyme_set_status_cb(PyObject *self, PyObject *cb) { /* Interact callbacks. */ gpgme_error_t -_pyme_interact_cb(void *opaque, const char *keyword, +_gpg_interact_cb(void *opaque, const char *keyword, const char *args, int fd) { PyGILState_STATE state = PyGILState_Ensure(); @@ -694,7 +694,7 @@ _pyme_interact_cb(void *opaque, const char *keyword, gpgme_error_t err_status = 0; PyObject *self = NULL; - _pyme_exception_init(); + _gpg_exception_init(); assert (PyTuple_Check(pyopaque)); assert (PyTuple_Size(pyopaque) == 2 || PyTuple_Size(pyopaque) == 3); @@ -725,7 +725,7 @@ _pyme_interact_cb(void *opaque, const char *keyword, retval = PyObject_CallObject(func, pyargs); Py_DECREF(pyargs); if (PyErr_Occurred()) { - err_status = _pyme_exception2code(); + err_status = _gpg_exception2code(); } else { if (fd>=0 && retval && PyUnicode_Check(retval)) { PyObject *encoded = NULL; @@ -747,18 +747,18 @@ _pyme_interact_cb(void *opaque, const char *keyword, if (write(fd, buffer, size) < 0) { err_status = gpgme_error_from_syserror (); - _pyme_raise_exception (err_status); + _gpg_raise_exception (err_status); } if (! err_status && write(fd, "\n", 1) < 0) { err_status = gpgme_error_from_syserror (); - _pyme_raise_exception (err_status); + _gpg_raise_exception (err_status); } Py_DECREF(encoded); } } leave: if (err_status) - _pyme_stash_callback_exception(self); + _gpg_stash_callback_exception(self); Py_XDECREF(retval); PyGILState_Release(state); @@ -804,7 +804,7 @@ static ssize_t pyDataReadCb(void *hook, void *buffer, size_t size) retval = PyObject_CallObject(func, pyargs); Py_DECREF(pyargs); if (PyErr_Occurred()) { - _pyme_stash_callback_exception(self); + _gpg_stash_callback_exception(self); result = -1; goto leave; } @@ -813,7 +813,7 @@ static ssize_t pyDataReadCb(void *hook, void *buffer, size_t size) PyErr_Format(PyExc_TypeError, "expected bytes from read callback, got %s", retval->ob_type->tp_name); - _pyme_stash_callback_exception(self); + _gpg_stash_callback_exception(self); result = -1; goto leave; } @@ -822,7 +822,7 @@ static ssize_t pyDataReadCb(void *hook, void *buffer, size_t size) PyErr_Format(PyExc_TypeError, "expected %zu bytes from read callback, got %zu", size, PyBytes_Size(retval)); - _pyme_stash_callback_exception(self); + _gpg_stash_callback_exception(self); result = -1; goto leave; } @@ -871,7 +871,7 @@ static ssize_t pyDataWriteCb(void *hook, const void *buffer, size_t size) retval = PyObject_CallObject(func, pyargs); Py_DECREF(pyargs); if (PyErr_Occurred()) { - _pyme_stash_callback_exception(self); + _gpg_stash_callback_exception(self); result = -1; goto leave; } @@ -887,7 +887,7 @@ static ssize_t pyDataWriteCb(void *hook, const void *buffer, size_t size) PyErr_Format(PyExc_TypeError, "expected int from write callback, got %s", retval->ob_type->tp_name); - _pyme_stash_callback_exception(self); + _gpg_stash_callback_exception(self); result = -1; } @@ -938,7 +938,7 @@ static off_t pyDataSeekCb(void *hook, off_t offset, int whence) retval = PyObject_CallObject(func, pyargs); Py_DECREF(pyargs); if (PyErr_Occurred()) { - _pyme_stash_callback_exception(self); + _gpg_stash_callback_exception(self); result = -1; goto leave; } @@ -958,7 +958,7 @@ static off_t pyDataSeekCb(void *hook, off_t offset, int whence) PyErr_Format(PyExc_TypeError, "expected int from seek callback, got %s", retval->ob_type->tp_name); - _pyme_stash_callback_exception(self); + _gpg_stash_callback_exception(self); result = -1; } @@ -1000,12 +1000,12 @@ static void pyDataReleaseCb(void *hook) Py_XDECREF(retval); Py_DECREF(pyargs); if (PyErr_Occurred()) - _pyme_stash_callback_exception(self); + _gpg_stash_callback_exception(self); PyGILState_Release(state); } PyObject * -pyme_data_new_from_cbs(PyObject *self, +gpg_data_new_from_cbs(PyObject *self, PyObject *pycbs, gpgme_data_t *r_data) { @@ -1026,7 +1026,7 @@ pyme_data_new_from_cbs(PyObject *self, err = gpgme_data_new_from_cbs(r_data, &cbs, (void *) pycbs); if (err) - return _pyme_raise_exception(err); + return _gpg_raise_exception(err); PyObject_SetAttrString(self, "_data_cbs", pycbs); @@ -1040,7 +1040,7 @@ pyme_data_new_from_cbs(PyObject *self, /* The assuan callbacks. */ gpgme_error_t -_pyme_assuan_data_cb (void *hook, const void *data, size_t datalen) +_gpg_assuan_data_cb (void *hook, const void *data, size_t datalen) { PyGILState_STATE state = PyGILState_Ensure(); gpgme_error_t err = 0; @@ -1059,25 +1059,25 @@ _pyme_assuan_data_cb (void *hook, const void *data, size_t datalen) py_data = PyBytes_FromStringAndSize(data, datalen); if (py_data == NULL) { - err = _pyme_exception2code(); + err = _gpg_exception2code(); goto leave; } retval = PyObject_CallFunctionObjArgs(func, py_data, NULL); if (PyErr_Occurred()) - err = _pyme_exception2code(); + err = _gpg_exception2code(); Py_DECREF(py_data); Py_XDECREF(retval); leave: if (err) - _pyme_stash_callback_exception(self); + _gpg_stash_callback_exception(self); PyGILState_Release(state); return err; } gpgme_error_t -_pyme_assuan_inquire_cb (void *hook, const char *name, const char *args, +_gpg_assuan_inquire_cb (void *hook, const char *name, const char *args, gpgme_data_t *r_data) { PyGILState_STATE state = PyGILState_Ensure(); @@ -1098,20 +1098,20 @@ _pyme_assuan_inquire_cb (void *hook, const char *name, const char *args, py_name = PyUnicode_FromString(name); if (py_name == NULL) { - err = _pyme_exception2code(); + err = _gpg_exception2code(); goto leave; } py_args = PyUnicode_FromString(args); if (py_args == NULL) { - err = _pyme_exception2code(); + err = _gpg_exception2code(); goto leave; } retval = PyObject_CallFunctionObjArgs(func, py_name, py_args, NULL); if (PyErr_Occurred()) - err = _pyme_exception2code(); + err = _gpg_exception2code(); Py_XDECREF(retval); /* FIXME: Returning data is not yet implemented. */ @@ -1121,13 +1121,13 @@ _pyme_assuan_inquire_cb (void *hook, const char *name, const char *args, Py_XDECREF(py_name); Py_XDECREF(py_args); if (err) - _pyme_stash_callback_exception(self); + _gpg_stash_callback_exception(self); PyGILState_Release(state); return err; } gpgme_error_t -_pyme_assuan_status_cb (void *hook, const char *status, const char *args) +_gpg_assuan_status_cb (void *hook, const char *status, const char *args) { PyGILState_STATE state = PyGILState_Ensure(); gpgme_error_t err = 0; @@ -1147,27 +1147,27 @@ _pyme_assuan_status_cb (void *hook, const char *status, const char *args) py_status = PyUnicode_FromString(status); if (py_status == NULL) { - err = _pyme_exception2code(); + err = _gpg_exception2code(); goto leave; } py_args = PyUnicode_FromString(args); if (py_args == NULL) { - err = _pyme_exception2code(); + err = _gpg_exception2code(); goto leave; } retval = PyObject_CallFunctionObjArgs(func, py_status, py_args, NULL); if (PyErr_Occurred()) - err = _pyme_exception2code(); + err = _gpg_exception2code(); Py_XDECREF(retval); leave: Py_XDECREF(py_status); Py_XDECREF(py_args); if (err) - _pyme_stash_callback_exception(self); + _gpg_stash_callback_exception(self); PyGILState_Release(state); return err; } |