From: Bert Vermeulen Date: Wed, 11 Sep 2013 10:35:17 +0000 (+0200) Subject: Code cleanup X-Git-Tag: libsigrokdecode-0.3.0~266 X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff_plain;h=1f2e00d140ac41a3a61888f67fc6f96c4369bea3 Code cleanup --- diff --git a/controller.c b/controller.c index 9267ded..276dc2d 100644 --- a/controller.c +++ b/controller.c @@ -98,7 +98,6 @@ static GSList *callbacks = NULL; extern SRD_PRIV GSList *pd_list; /* module_sigrokdecode.c */ -/* FIXME: SRD_PRIV causes issues on MinGW. Investigate. */ extern PyMODINIT_FUNC PyInit_sigrokdecode(void); /* type_logic.c */ @@ -254,21 +253,6 @@ SRD_PRIV int srd_decoder_searchpath_add(const char *path) g_string_free(new_path, TRUE); g_free(wc_new_path); -//#ifdef _WIN32 -// gchar **splitted; -// -// /* -// * On Windows/MinGW, Python's sys.path needs entries of the form -// * 'C:\\foo\\bar' instead of '/foo/bar'. -// */ -// -// splitted = g_strsplit(DECODERS_DIR, "/", 0); -// path = g_build_pathv("\\\\", splitted); -// g_strfreev(splitted); -//#else -// path = g_strdup(DECODERS_DIR); -//#endif - return SRD_OK; } diff --git a/log.c b/log.c index 36dcd95..46fa9e5 100644 --- a/log.c +++ b/log.c @@ -127,7 +127,6 @@ SRD_API int srd_log_logdomain_set(const char *logdomain) return SRD_ERR_ARG; } - /* TODO: Error handling. */ snprintf((char *)&srd_log_domain, LOGDOMAIN_MAXLEN, "%s", logdomain); srd_dbg("Log domain set to '%s'.", (const char *)&srd_log_domain); @@ -211,7 +210,7 @@ static int srd_logv(void *cb_data, int loglevel, const char *format, /* Only output messages of at least the selected loglevel(s). */ if (loglevel > srd_loglevel) - return SRD_OK; /* TODO? */ + return SRD_OK; if (srd_log_domain[0] != '\0') fprintf(stderr, "%s", srd_log_domain); diff --git a/module_sigrokdecode.c b/module_sigrokdecode.c index f88a6e9..655c1f5 100644 --- a/module_sigrokdecode.c +++ b/module_sigrokdecode.c @@ -45,7 +45,6 @@ static struct PyModuleDef sigrokdecode_module = { }; /** @cond PRIVATE */ -/* FIXME: SRD_PRIV causes issues on MinGW. Investigate. */ PyMODINIT_FUNC PyInit_sigrokdecode(void) { PyObject *mod;