X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Finput%2Finput.c;h=9ace7f5eb3d1b4792c48bc2a5a75f9f876386043;hb=e00b3f5897d9b5b85b552f9f8da7684229b9bdfc;hp=4b0804a58b3efe77418f0f51b37a108b2cacd86c;hpb=60107497fed4b307a7d64d23e3d8d6137f64c4e4;p=libsigrok.git

diff --git a/src/input/input.c b/src/input/input.c
index 4b0804a5..9ace7f5e 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -26,7 +26,9 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
+/** @cond PRIVATE */
 #define LOG_PREFIX "input"
+/** @endcond */
 
 /**
  * @file
@@ -89,14 +91,14 @@ SR_API const struct sr_input_module **sr_input_list(void)
  *
  * @since 0.4.0
  */
-SR_API const char *sr_input_id_get(const struct sr_input_module *o)
+SR_API const char *sr_input_id_get(const struct sr_input_module *imod)
 {
-	if (!o) {
+	if (!imod) {
 		sr_err("Invalid input module NULL!");
 		return NULL;
 	}
 
-	return o->id;
+	return imod->id;
 }
 
 /**
@@ -104,14 +106,14 @@ SR_API const char *sr_input_id_get(const struct sr_input_module *o)
  *
  * @since 0.4.0
  */
-SR_API const char *sr_input_name_get(const struct sr_input_module *o)
+SR_API const char *sr_input_name_get(const struct sr_input_module *imod)
 {
-	if (!o) {
+	if (!imod) {
 		sr_err("Invalid input module NULL!");
 		return NULL;
 	}
 
-	return o->name;
+	return imod->name;
 }
 
 /**
@@ -119,14 +121,33 @@ SR_API const char *sr_input_name_get(const struct sr_input_module *o)
  *
  * @since 0.4.0
  */
-SR_API const char *sr_input_description_get(const struct sr_input_module *o)
+SR_API const char *sr_input_description_get(const struct sr_input_module *imod)
 {
-	if (!o) {
+	if (!imod) {
 		sr_err("Invalid input module NULL!");
 		return NULL;
 	}
 
-	return o->desc;
+	return imod->desc;
+}
+
+/**
+ * Returns the specified input module's file extensions typical for the file
+ * format, as a NULL terminated array, or returns a NULL pointer if there is
+ * no preferred extension.
+ * @note these are a suggestions only.
+ *
+ * @since 0.4.0
+ */
+SR_API const char *const *sr_input_extensions_get(
+		const struct sr_input_module *imod)
+{
+	if (!imod) {
+		sr_err("Invalid input module NULL!");
+		return NULL;
+	}
+
+	return imod->exts;
 }
 
 /**
@@ -210,6 +231,7 @@ SR_API void sr_input_options_free(const struct sr_option **options)
  * This function is used when a client wants to use a specific input
  * module to parse a stream. No effort is made to identify the format.
  *
+ * @param imod The input module to use. Must not be NULL.
  * @param options GHashTable consisting of keys corresponding with
  * the module options \c id field. The values should be GVariant
  * pointers with sunk references, of the same GVariantType as the option's
@@ -271,15 +293,17 @@ SR_API struct sr_input *sr_input_new(const struct sr_input_module *imod,
 	if (in->module->init && in->module->init(in, new_opts) != SR_OK) {
 		g_free(in);
 		in = NULL;
+	} else {
+		in->buf = g_string_sized_new(128);
 	}
+
 	if (new_opts)
 		g_hash_table_destroy(new_opts);
-	in->buf = g_string_sized_new(128);
 
 	return in;
 }
 
-/* Returns TRUE is all required meta items are available. */
+/* Returns TRUE if all required meta items are available. */
 static gboolean check_required_metadata(const uint8_t *metadata, uint8_t *avail)
 {
 	int m, a;