summaryrefslogtreecommitdiff
path: root/controller.c
diff options
context:
space:
mode:
authorBert Vermeulen <bert@biot.com>2013-03-19 01:01:25 +0100
committerBert Vermeulen <bert@biot.com>2013-03-19 01:58:22 +0100
commit0ff2d191726ef2e5a30ce697c7c93e4b0b1605f3 (patch)
treedc27afab26a0f72f46f8d8c9bbc7d715db1359ed /controller.c
parent47198f313a3c3e6431f5896fae3fb556f38746ed (diff)
downloadlibsigrokdecode-0ff2d191726ef2e5a30ce697c7c93e4b0b1605f3.tar.gz
libsigrokdecode-0ff2d191726ef2e5a30ce697c7c93e4b0b1605f3.zip
code cleanup
Diffstat (limited to 'controller.c')
-rw-r--r--controller.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/controller.c b/controller.c
index e35b8be..cabca3b 100644
--- a/controller.c
+++ b/controller.c
@@ -286,7 +286,7 @@ SRD_PRIV int srd_decoder_searchpath_add(const char *path)
* @return SRD_OK upon success, a (negative) error code otherwise.
*/
SRD_API int srd_inst_option_set(struct srd_decoder_inst *di,
- GHashTable *options)
+ GHashTable *options)
{
PyObject *py_dec_options, *py_dec_optkeys, *py_di_options, *py_optval;
PyObject *py_optlist, *py_classval;
@@ -414,7 +414,7 @@ static gint compare_probe_id(const struct srd_probe *a, const char *probe_id)
* @return SRD_OK upon success, a (negative) error code otherwise.
*/
SRD_API int srd_inst_probe_set_all(struct srd_decoder_inst *di,
- GHashTable *new_probes)
+ GHashTable *new_probes)
{
GList *l;
GSList *sl;
@@ -503,7 +503,7 @@ SRD_API int srd_inst_probe_set_all(struct srd_decoder_inst *di,
* NULL in case of failure.
*/
SRD_API struct srd_decoder_inst *srd_inst_new(const char *decoder_id,
- GHashTable *options)
+ GHashTable *options)
{
int i;
struct srd_decoder *dec;
@@ -578,7 +578,7 @@ SRD_API struct srd_decoder_inst *srd_inst_new(const char *decoder_id,
* @return SRD_OK upon success, a (negative) error code otherwise.
*/
SRD_API int srd_inst_stack(struct srd_decoder_inst *di_from,
- struct srd_decoder_inst *di_to)
+ struct srd_decoder_inst *di_to)
{
if (!di_from || !di_to) {
srd_err("Invalid from/to instance pair.");
@@ -639,9 +639,8 @@ SRD_API struct srd_decoder_inst *srd_inst_find_by_id(const char *inst_id)
* @private
*/
SRD_PRIV struct srd_decoder_inst *srd_inst_find_by_obj(const GSList *stack,
- const PyObject *obj)
+ const PyObject *obj)
{
-// TODO?
const GSList *l;
struct srd_decoder_inst *tmp, *di;
@@ -711,8 +710,8 @@ SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di, PyObject *args)
* @private
*/
SRD_PRIV int srd_inst_decode(uint64_t start_samplenum,
- const struct srd_decoder_inst *di,
- const uint8_t *inbuf, uint64_t inbuflen)
+ const struct srd_decoder_inst *di, const uint8_t *inbuf,
+ uint64_t inbuflen)
{
PyObject *py_res;
srd_logic *logic;
@@ -756,7 +755,7 @@ SRD_PRIV int srd_inst_decode(uint64_t start_samplenum,
end_samplenum, logic))) {
srd_exception_catch("Protocol decoder instance %s: ",
di->inst_id);
- return SRD_ERR_PYTHON; /* TODO: More specific error? */
+ return SRD_ERR_PYTHON;
}
Py_DecRef(py_res);
@@ -869,7 +868,7 @@ SRD_API int srd_session_start(int num_probes, int unitsize, uint64_t samplerate)
* @return SRD_OK upon success, a (negative) error code otherwise.
*/
SRD_API int srd_session_send(uint64_t start_samplenum, const uint8_t *inbuf,
- uint64_t inbuflen)
+ uint64_t inbuflen)
{
GSList *d;
int ret;
@@ -900,7 +899,7 @@ SRD_API int srd_session_send(uint64_t start_samplenum, const uint8_t *inbuf,
* @param cb_data Private data for the callback function. Can be NULL.
*/
SRD_API int srd_pd_output_callback_add(int output_type,
- srd_pd_output_callback_t cb, void *cb_data)
+ srd_pd_output_callback_t cb, void *cb_data)
{
struct srd_pd_callback *pd_cb;