valgrind: Clear more unfreed memory issues

[sigrok-cli.git] / sigrok-cli.h

diff --git a/sigrok-cli.h b/sigrok-cli.h
index ac866696eeed35660469060c777c4269cb4555c4..d0b5872ae88984f4b4ced8faa99b0a55ccd985b6 100644 (file)
--- a/sigrok-cli.h
+++ b/sigrok-cli.h
@@ -20,18 +20,18 @@
 #ifndef SIGROK_CLI_SIGROK_CLI_H
 #define SIGROK_CLI_SIGROK_CLI_H
 
-#include "config.h"
 #ifdef HAVE_SRD
 /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include <libsigrokdecode/libsigrokdecode.h>
 #endif
 #include <libsigrok/libsigrok.h>
 
-#define DEFAULT_OUTPUT_FORMAT "bits:width=64"
+#define DEFAULT_OUTPUT_FORMAT_FILE "srzip"
+#define DEFAULT_OUTPUT_FORMAT_NOFILE "bits:width=64"
 #define SAVE_CHUNK_SIZE (512 * 1024)
 
 /* main.c */
-struct sr_context *sr_ctx;
+extern struct sr_context *sr_ctx;
 int select_channels(struct sr_dev_inst *sdi);
 gboolean config_key_has_cap(struct sr_dev_driver *driver,
                const struct sr_dev_inst *sdi, struct sr_channel_group *cg,
@@ -73,8 +73,7 @@ void load_input_file(void);
 
 /* decode.c */
 #ifdef HAVE_SRD
-int register_pds(const char *opt_pds, char *opt_pd_annotations);
-int setup_pd_stack(char *opt_pds, char *opt_pd_stack, char *opt_pd_annotations);
+int register_pds(gchar **all_pds, char *opt_pd_annotations);
 int setup_pd_annotations(char *opt_pd_annotations);
 int setup_pd_meta(char *opt_pd_meta);
 int setup_pd_binary(char *opt_pd_binary);
@@ -110,9 +109,8 @@ extern gchar *opt_config;
 extern gchar *opt_channels;
 extern gchar *opt_channel_group;
 extern gchar *opt_triggers;
-extern gchar *opt_pds;
+extern gchar **opt_pds;
 #ifdef HAVE_SRD
-extern gchar *opt_pd_stack;
 extern gchar *opt_pd_annotations;
 extern gchar *opt_pd_meta;
 extern gchar *opt_pd_binary;
@@ -120,13 +118,13 @@ extern gchar *opt_pd_binary;
 extern gchar *opt_input_format;
 extern gchar *opt_output_format;
 extern gchar *opt_transform_module;
-extern gchar *opt_show;
+extern gboolean opt_show;
 extern gchar *opt_time;
 extern gchar *opt_samples;
 extern gchar *opt_frames;
-extern gchar *opt_continuous;
+extern gboolean opt_continuous;
 extern gchar *opt_get;
-extern gchar *opt_set;
+extern gboolean opt_set;
 int parse_options(int argc, char **argv);
 void show_help(void);