From: Uwe Hermann <redacted>
Date: Thu, 31 Dec 2015 17:47:55 +0000 (+0100)
Subject: Rename sr_driver_scan_options() to sr_driver_scan_options_list().
X-Git-Tag: libsigrok-0.4.0~46
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=8141a0325c2d31a37ecaeef6532d932112700f01

Rename sr_driver_scan_options() to sr_driver_scan_options_list().
---

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index eabe36a3..3be1d994 100644
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -408,7 +408,7 @@ string Driver::long_name() const
 
 set<const ConfigKey *> Driver::scan_options() const
 {
-	GArray *opts = sr_driver_scan_options(_structure);
+	GArray *opts = sr_driver_scan_options_list(_structure);
 	set<const ConfigKey *> result;
 	for (guint i = 0; i < opts->len; i++)
 		result.insert(ConfigKey::get(g_array_index(opts, uint32_t, i)));
diff --git a/include/libsigrok/proto.h b/include/libsigrok/proto.h
index 3a8e346f..c10f7c10 100644
--- a/include/libsigrok/proto.h
+++ b/include/libsigrok/proto.h
@@ -83,7 +83,7 @@ SR_API int sr_dev_inst_channel_add(struct sr_dev_inst *sdi, int index, int type,
 SR_API struct sr_dev_driver **sr_driver_list(const struct sr_context *ctx);
 SR_API int sr_driver_init(struct sr_context *ctx,
 		struct sr_dev_driver *driver);
-SR_API GArray *sr_driver_scan_options(const struct sr_dev_driver *driver);
+SR_API GArray *sr_driver_scan_options_list(const struct sr_dev_driver *driver);
 SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options);
 SR_API int sr_config_get(const struct sr_dev_driver *driver,
 		const struct sr_dev_inst *sdi,
diff --git a/src/hwdriver.c b/src/hwdriver.c
index 0aa7eb8c..5790e320 100644
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -391,7 +391,7 @@ SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver)
 /**
  * Enumerate scan options supported by this driver.
  *
- * Before calling sr_driver_scan_options(), the user must have previously
+ * Before calling sr_driver_scan_options_list(), the user must have previously
  * initialized the driver by calling sr_driver_init().
  *
  * @param driver The driver to enumerate options for. This must be a pointer
@@ -404,7 +404,7 @@ SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver)
  *
  * @since 0.4.0
  */
-SR_API GArray *sr_driver_scan_options(const struct sr_dev_driver *driver)
+SR_API GArray *sr_driver_scan_options_list(const struct sr_dev_driver *driver)
 {
 	GVariant *gvar;
 	const uint32_t *opts;