From d841d5b26f2134143fc80c9898522d13387b7cc8 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Thu, 14 Aug 2014 18:51:11 +0200 Subject: Whitespace and consistency fixes. --- instance.c | 112 +++++++++++++++++++++++---------------------- libsigrokdecode-internal.h | 1 - libsigrokdecode.h | 8 ++-- tests/runtc.c | 18 +++----- 4 files changed, 68 insertions(+), 71 deletions(-) diff --git a/instance.c b/instance.c index 732bbc3..6df6e10 100644 --- a/instance.c +++ b/instance.c @@ -64,11 +64,11 @@ extern SRD_PRIV PyTypeObject srd_logic_type; SRD_API int srd_inst_option_set(struct srd_decoder_inst *di, GHashTable *options) { - struct srd_decoder_option *sdo; + struct srd_decoder_option *sdo; PyObject *py_di_options, *py_optval; GVariant *value; - GSList *l; - double val_double; + GSList *l; + double val_double; gint64 val_int; int ret; const char *val_str; @@ -96,7 +96,7 @@ SRD_API int srd_inst_option_set(struct srd_decoder_inst *di, } ret = SRD_ERR_PYTHON; - py_optval = NULL; + py_optval = NULL; /* * The 'options' tuple is a class variable, but we need to @@ -110,52 +110,53 @@ SRD_API int srd_inst_option_set(struct srd_decoder_inst *di, py_di_options = PyDict_New(); PyObject_SetAttrString(di->py_inst, "options", py_di_options); - for (l = di->decoder->options; l; l = l->next) { - sdo = l->data; - if ((value = g_hash_table_lookup(options, sdo->id))) { - /* A value was supplied for this option. */ - if (!g_variant_type_equal(g_variant_get_type(value), - g_variant_get_type(sdo->def))) { - srd_err("Option '%s' should have the same type " - "as the default value.", sdo->id); - goto err_out; - } - } else { - /* Use default for this option. */ - value = sdo->def; - } - if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) { - val_str = g_variant_get_string(value, NULL); - if (!(py_optval = PyUnicode_FromString(val_str))) { - /* Some UTF-8 encoding error. */ - PyErr_Clear(); - srd_err("Option '%s' requires a UTF-8 string value.", sdo->id); - goto err_out; - } - } else if (g_variant_is_of_type(value, G_VARIANT_TYPE_INT64)) { - val_int = g_variant_get_int64(value); - if (!(py_optval = PyLong_FromLong(val_int))) { - /* ValueError Exception */ - PyErr_Clear(); - srd_err("Option '%s' has invalid integer value.", sdo->id); - goto err_out; - } - } else if (g_variant_is_of_type(value, G_VARIANT_TYPE_DOUBLE)) { - val_double = g_variant_get_double(value); - if (!(py_optval = PyFloat_FromDouble(val_double))) { - /* ValueError Exception */ - PyErr_Clear(); - srd_err("Option '%s' has invalid float value.", sdo->id); - goto err_out; - } - } + for (l = di->decoder->options; l; l = l->next) { + sdo = l->data; + if ((value = g_hash_table_lookup(options, sdo->id))) { + /* A value was supplied for this option. */ + if (!g_variant_type_equal(g_variant_get_type(value), + g_variant_get_type(sdo-> def))) { + srd_err("Option '%s' should have the same type " + "as the default value.", sdo->id); + goto err_out; + } + } else { + /* Use default for this option. */ + value = sdo->def; + } + if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) { + val_str = g_variant_get_string(value, NULL); + if (!(py_optval = PyUnicode_FromString(val_str))) { + /* Some UTF-8 encoding error. */ + PyErr_Clear(); + srd_err("Option '%s' requires a UTF-8 string value.", sdo->id); + goto err_out; + } + } else if (g_variant_is_of_type(value, G_VARIANT_TYPE_INT64)) { + val_int = g_variant_get_int64(value); + if (!(py_optval = PyLong_FromLong(val_int))) { + /* ValueError Exception */ + PyErr_Clear(); + srd_err("Option '%s' has invalid integer value.", sdo->id); + goto err_out; + } + } else if (g_variant_is_of_type(value, G_VARIANT_TYPE_DOUBLE)) { + val_double = g_variant_get_double(value); + if (!(py_optval = PyFloat_FromDouble(val_double))) { + /* ValueError Exception */ + PyErr_Clear(); + srd_err("Option '%s' has invalid float value.", + sdo->id); + goto err_out; + } + } if (PyDict_SetItemString(py_di_options, sdo->id, py_optval) == -1) goto err_out; - /* Not harmful even if we used the default. */ - g_hash_table_remove(options, sdo->id); - } - if (g_hash_table_size(options) != 0) - srd_warn("Unknown options specified for '%s'", di->inst_id); + /* Not harmful even if we used the default. */ + g_hash_table_remove(options, sdo->id); + } + if (g_hash_table_size(options) != 0) + srd_warn("Unknown options specified for '%s'", di->inst_id); ret = SRD_OK; @@ -205,7 +206,8 @@ SRD_API int srd_inst_channel_set_all(struct srd_decoder_inst *di, char *channel_id; srd_dbg("Setting channels for instance %s with list of %d channels, " - "unitsize %d.", di->inst_id, g_hash_table_size(new_channels), unit_size); + "unitsize %d.", di->inst_id, g_hash_table_size(new_channels), + unit_size); if (g_hash_table_size(new_channels) == 0) /* No channels provided. */ @@ -253,9 +255,9 @@ SRD_API int srd_inst_channel_set_all(struct srd_decoder_inst *di, (GCompareFunc)compare_channel_id))) { /* Fall back on optional channels. */ if (!(sl = g_slist_find_custom(di->decoder->opt_channels, - channel_id, (GCompareFunc) compare_channel_id))) { + channel_id, (GCompareFunc)compare_channel_id))) { srd_err("Protocol decoder %s has no channel " - "'%s'.", di->decoder->name, channel_id); + "'%s'.", di->decoder->name, channel_id); g_free(new_channelmap); return SRD_ERR_ARG; } @@ -271,7 +273,7 @@ SRD_API int srd_inst_channel_set_all(struct srd_decoder_inst *di, num_required_channels = g_slist_length(di->decoder->channels); for (i = 0; i < di->dec_num_channels; i++) { srd_dbg(" - index %d = channel %d (%s)", i, new_channelmap[i], - (i < num_required_channels) ? "required" : "optional"); + (i < num_required_channels) ? "required" : "optional"); } /* Report an error if not all required channels were specified. */ @@ -421,7 +423,7 @@ SRD_API int srd_inst_stack(struct srd_session *sess, /* Stack on top of source di. */ di_bottom->next_di = g_slist_append(di_bottom->next_di, di_top); - srd_dbg("Stacked %s on top of %s.", di_top->inst_id, di_bottom->inst_id); + srd_dbg("Stacked %s onto %s.", di_top->inst_id, di_bottom->inst_id); return SRD_OK; } @@ -607,7 +609,8 @@ SRD_PRIV int srd_inst_decode(const struct srd_decoder_inst *di, Py_IncRef(di->py_inst); if (!(py_res = PyObject_CallMethod(di->py_inst, "decode", "KKO", start_samplenum, end_samplenum, logic))) { - srd_exception_catch("Protocol decoder instance %s: ", di->inst_id); + srd_exception_catch("Protocol decoder instance %s: ", + di->inst_id); return SRD_ERR_PYTHON; } Py_DecRef(py_res); @@ -661,4 +664,3 @@ SRD_PRIV void srd_inst_free_all(struct srd_session *sess, GSList *stack) } /** @} */ - diff --git a/libsigrokdecode-internal.h b/libsigrokdecode-internal.h index 7370410..e9aef64 100644 --- a/libsigrokdecode-internal.h +++ b/libsigrokdecode-internal.h @@ -47,7 +47,6 @@ struct srd_session { GSList *callbacks; }; - /* srd.c */ SRD_PRIV int srd_decoder_searchpath_add(const char *path); diff --git a/libsigrokdecode.h b/libsigrokdecode.h index 7f75ab2..4d18f3b 100644 --- a/libsigrokdecode.h +++ b/libsigrokdecode.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef LIBSIGROKDECODE_SIGROKDECODE_H -#define LIBSIGROKDECODE_SIGROKDECODE_H +#ifndef LIBSIGROKDECODE_LIBSIGROKDECODE_H +#define LIBSIGROKDECODE_LIBSIGROKDECODE_H #include #include @@ -179,7 +179,7 @@ struct srd_decoder { */ GSList *binary; - /** List of decoder options. */ + /** List of decoder options. */ GSList *options; /** Python module. */ @@ -208,7 +208,7 @@ struct srd_decoder_option { char *id; char *desc; GVariant *def; - GSList *values; + GSList *values; }; struct srd_decoder_annotation_row { diff --git a/tests/runtc.c b/tests/runtc.c index 11ae560..75bfff4 100644 --- a/tests/runtc.c +++ b/tests/runtc.c @@ -74,13 +74,11 @@ struct cvg { GSList *missed_lines; }; - struct cvg *get_mod_cov(PyObject *py_cov, char *module_name); void cvg_add(struct cvg *dst, struct cvg *src); struct cvg *cvg_new(void); gboolean find_missed_line(struct cvg *cvg, char *linespec); - static void logmsg(char *prefix, FILE *out, const char *format, va_list args) { if (prefix) @@ -190,9 +188,9 @@ static void srd_cb_py(struct srd_proto_data *pdata, void *cb_data) s = py_str_as_str(pyrepr); Py_DecRef(pyrepr); - /* Output format for testing is '- : \n' */ + /* Output format for testing is '- : \n'. */ out = g_string_sized_new(128); - g_string_printf(out, "%"PRIu64"-%"PRIu64" %s: %s\n", + g_string_printf(out, "%" PRIu64 "-%" PRIu64 " %s: %s\n", pdata->start_sample, pdata->end_sample, pdata->pdo->di->inst_id, s); g_free(s); @@ -226,7 +224,7 @@ static void srd_cb_bin(struct srd_proto_data *pdata, void *cb_data) return; out = g_string_sized_new(128); - g_string_printf(out, "%"PRIu64"-%"PRIu64" %s:", + g_string_printf(out, "%" PRIu64 "-%" PRIu64 " %s:", pdata->start_sample, pdata->end_sample, pdata->pdo->di->inst_id); for (i = 0; i < pdb->size; i++) { @@ -264,7 +262,7 @@ static void srd_cb_ann(struct srd_proto_data *pdata, void *cb_data) dec_ann = g_slist_nth_data(dec->annotations, pda->ann_format); line = g_string_sized_new(256); - g_string_printf(line, "%"PRIu64"-%"PRIu64" %s: %s:", + g_string_printf(line, "%" PRIu64 "-%" PRIu64 " %s: %s:", pdata->start_sample, pdata->end_sample, pdata->pdo->di->inst_id, dec_ann[0]); for (i = 0; pda->ann_text[i]; i++) @@ -558,7 +556,7 @@ struct cvg *get_mod_cov(PyObject *py_cov, char *module_name) cvg_mod->coverage = 100 - ((float)cvg_mod->num_missed / (float)cvg_mod->num_lines * 100); Py_DecRef(py_mod); - Py_DecRef(py_path); + Py_DecRef(py_path); return cvg_mod; } @@ -588,7 +586,6 @@ void cvg_add(struct cvg *dst, struct cvg *src) GSList *l; char *linespec; - dst->num_lines += src->num_lines; dst->num_missed += src->num_missed; for (l = src->missed_lines; l; l = l->next) { @@ -640,7 +637,6 @@ static int report_coverage(PyObject *py_cov, GSList *pdlist) printf("coverage: scope=all coverage=%.0f%% lines=%d missed=%d\n", total_coverage, cvg_all->num_lines, cvg_all->num_missed); - /* Write text report to file. */ /* io.open(coverage_report, "w") */ if (!(py_mod = PyImport_ImportModule("io"))) @@ -705,7 +701,7 @@ int main(int argc, char **argv) pd = NULL; coverage = NULL; while ((c = getopt(argc, argv, "dP:p:o:i:O:f:c:S")) != -1) { - switch(c) { + switch (c) { case 'd': debug = TRUE; break; @@ -763,7 +759,7 @@ int main(int argc, char **argv) else if (!strcmp(opstr[1], "python")) op->type = SRD_OUTPUT_PYTHON; else if (!strcmp(opstr[1], "exception")) - /* Doesn't matter, we just need it to bomb out. */ + /* Doesn't matter, we just need it to bomb out. */ op->type = SRD_OUTPUT_PYTHON; else { ERR("Unknown output type '%s'", opstr[1]); -- cgit v1.2.3-70-g09d2