analog: use SI prefix only with units that accept SI prefixes

[libsigrok.git] / src / output / output.c

diff --git a/src/output/output.c b/src/output/output.c
index d06002e3307ca687511352e657e6855cf05c4c90..efb205c68192d8d020f590c86b04841cc9e3c886 100644 (file)
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -17,8 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
@@ -37,7 +38,7 @@
  * Output module handling.
  *
  * libsigrok supports several output modules for file formats such as binary,
- * VCD, gnuplot, and so on. It provides an output API that frontends can use.
+ * VCD, csv, and so on. It provides an output API that frontends can use.
  * New output modules can be added/implemented in libsigrok without having
  * to change the frontends at all.
  *
@@ -58,7 +59,6 @@ extern SR_PRIV struct sr_output_module output_ascii;
 extern SR_PRIV struct sr_output_module output_binary;
 extern SR_PRIV struct sr_output_module output_vcd;
 extern SR_PRIV struct sr_output_module output_ols;
-extern SR_PRIV struct sr_output_module output_gnuplot;
 extern SR_PRIV struct sr_output_module output_chronovu_la8;
 extern SR_PRIV struct sr_output_module output_csv;
 extern SR_PRIV struct sr_output_module output_analog;
@@ -71,7 +71,6 @@ static const struct sr_output_module *output_module_list[] = {
        &output_binary,
        &output_bits,
        &output_csv,
-       &output_gnuplot,
        &output_hex,
        &output_ols,
        &output_vcd,
@@ -283,7 +282,8 @@ SR_API const struct sr_output *sr_output_new(const struct sr_output_module *omod
                                /* Pass option along. */
                                gvt = g_variant_get_type(mod_opts[i].def);
                                if (!g_variant_is_of_type(value, gvt)) {
-                                       sr_err("Invalid type for '%s' option.", key);
+                                       sr_err("Invalid type for '%s' option.",
+                                               (char *)key);
                                        g_free(op);
                                        return NULL;
                                }
@@ -301,7 +301,8 @@ SR_API const struct sr_output *sr_output_new(const struct sr_output_module *omod
                        g_hash_table_iter_init(&iter, options);
                        while (g_hash_table_iter_next(&iter, &key, &value)) {
                                if (!g_hash_table_lookup(new_opts, key)) {
-                                       sr_err("Output module '%s' has no option '%s'", omod->id, key);
+                                       sr_err("Output module '%s' has no option '%s'",
+                                               omod->id, (char *)key);
                                        g_hash_table_destroy(new_opts);
                                        g_free(op);
                                        return NULL;