Remove unnecessary extern option variable declarations.

diff --git a/decode.c b/decode.c
index 707aefb634f79a6f981a6c91e0c031ee56147c45..7712ea10a2a2580df9e6297446581381f3f9c520 100644 (file)
--- a/decode.c
+++ b/decode.c
@@ -30,8 +30,6 @@ static GHashTable *pd_binary_visible = NULL;
 static GHashTable *pd_channel_maps = NULL;
 
 extern struct srd_session *srd_sess;
 static GHashTable *pd_channel_maps = NULL;
 
 extern struct srd_session *srd_sess;

-extern gint opt_loglevel;
-

 
 static int opts_to_gvar(struct srd_decoder *dec, GHashTable *hash,
                GHashTable **options)
 
 static int opts_to_gvar(struct srd_decoder *dec, GHashTable *hash,
                GHashTable **options)

diff --git a/device.c b/device.c
index b8709dc2bf0a7a4cca8eb559fdb21f34cc7ecf70..90c9fc349449d0e0e183cddf1e333adecd1b687c 100644 (file)
--- a/device.c
+++ b/device.c
@@ -23,8 +23,6 @@
 #include <string.h>
 
 extern struct sr_context *sr_ctx;
 #include <string.h>
 
 extern struct sr_context *sr_ctx;

-extern gchar *opt_drv;
-extern gchar *opt_channel_group;

 
 /* Convert driver options hash to GSList of struct sr_config. */
 static GSList *hash_to_hwopt(GHashTable *hash)
 
 /* Convert driver options hash to GSList of struct sr_config. */
 static GSList *hash_to_hwopt(GHashTable *hash)

diff --git a/input.c b/input.c
index 566fd1d55dcf6b2f838f3de8b2f19b3db0245d46..d2adde6998b7d4d396e314bf42dd0b5f67bc87f7 100644 (file)
--- a/input.c
+++ b/input.c
@@ -25,11 +25,6 @@
 #include <string.h>
 #include <glib.h>
 
 #include <string.h>
 #include <glib.h>
 

-extern gchar *opt_input_file;
-extern gchar *opt_input_format;
-extern gchar *opt_channels;
-
-

 /**
  * Return the input file format which the CLI tool should use.
  *
 /**
  * Return the input file format which the CLI tool should use.
  *

diff --git a/session.c b/session.c
index 27fa262135d757dec7235c89e546bc1d975ae3d0..07144aa4ee70fb02eeefe68de64d140095382c38 100644 (file)
--- a/session.c
+++ b/session.c
@@ -28,16 +28,6 @@ static int default_output_format = FALSE;
 static uint64_t limit_samples = 0;
 static uint64_t limit_frames = 0;
 
 static uint64_t limit_samples = 0;
 static uint64_t limit_frames = 0;
 

-extern gchar *opt_output_file;
-extern gchar *opt_output_format;
-extern gchar *opt_pds;
-extern gboolean opt_wait_trigger;
-extern gchar *opt_time;
-extern gchar *opt_samples;
-extern gchar *opt_frames;
-extern gchar *opt_continuous;
-extern gchar *opt_config;
-extern gchar *opt_triggers;

 #ifdef HAVE_SRD
 extern struct srd_session *srd_sess;
 #endif
 #ifdef HAVE_SRD
 extern struct srd_session *srd_sess;
 #endif

diff --git a/show.c b/show.c
index 4cdf7049da05e51809ba1f4277560fac5b33b55d..08abf6c184a00f516cd5d5a07b8c8f4d55145a12 100644 (file)
--- a/show.c
+++ b/show.c
@@ -21,9 +21,6 @@
 #include <glib.h>
 #include <string.h>
 
 #include <glib.h>
 #include <string.h>
 

-extern gint opt_loglevel;
-extern gchar *opt_pds;
-

 static gint sort_inputs(gconstpointer a, gconstpointer b)
 {
        const struct sr_input_format *ia = a, *ib = b;
 static gint sort_inputs(gconstpointer a, gconstpointer b)
 {
        const struct sr_input_format *ia = a, *ib = b;