From 2f8cf274094b945bc2e4d51fefb0408867b39cac Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Wed, 29 Feb 2012 19:17:36 +0100
Subject: [PATCH] sr: s/sr_dev_probe_name/sr_dev_probe_name_set/.

---
 device.c       | 6 ++----
 session_file.c | 2 +-
 sigrok-proto.h | 6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/device.c b/device.c
index 24ec602f..5f8d5ed2 100644
--- a/device.c
+++ b/device.c
@@ -238,8 +238,6 @@ SR_API struct sr_probe *sr_dev_probe_find(const struct sr_dev *dev,
  * If the probe already has a different name assigned to it, it will be
  * removed, and the new name will be saved instead.
  *
- * TODO: Rename to sr_dev_probe_name_set().
- *
  * @param dev TODO
  * @param probenum The number of the probe whose name to set.
  *                 Note that the probe numbers start at 1 (not 0!).
@@ -249,8 +247,8 @@ SR_API struct sr_probe *sr_dev_probe_find(const struct sr_dev *dev,
  *         upon other errors.
  *         If something other than SR_OK is returned, 'dev' is unchanged.
  */
-SR_API int sr_dev_probe_name(struct sr_dev *dev, int probenum,
-			     const char *name)
+SR_API int sr_dev_probe_name_set(struct sr_dev *dev, int probenum,
+				 const char *name)
 {
 	struct sr_probe *p;
 
diff --git a/session_file.c b/session_file.c
index ca639cd5..7f4e6e18 100644
--- a/session_file.c
+++ b/session_file.c
@@ -139,7 +139,7 @@ SR_API int sr_session_load(const char *filename)
 						continue;
 					enabled_probes++;
 					tmp_u64 = strtoul(keys[j]+5, NULL, 10);
-					sr_dev_probe_name(dev, tmp_u64, val);
+					sr_dev_probe_name_set(dev, tmp_u64, val);
 				} else if (!strncmp(keys[j], "trigger", 7)) {
 					probenum = strtoul(keys[j]+7, NULL, 10);
 					sr_dev_trigger_set(dev, probenum, val);
diff --git a/sigrok-proto.h b/sigrok-proto.h
index 80d15ce9..ea9f53be 100644
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -28,7 +28,7 @@ SR_API int sr_exit(void);
 /*--- log.c -----------------------------------------------------------------*/
 
 typedef int (*sr_log_handler_t)(void *data, int loglevel, const char *format,
-				 va_list args);
+				va_list args);
 
 SR_API int sr_log_loglevel_set(int loglevel);
 SR_API int sr_log_loglevel_get(void);
@@ -54,8 +54,8 @@ SR_API struct sr_dev *sr_dev_new(const struct sr_dev_driver *driver,
 SR_API int sr_dev_probe_add(struct sr_dev *dev, const char *name);
 SR_API struct sr_probe *sr_dev_probe_find(const struct sr_dev *dev,
 					  int probenum);
-SR_API int sr_dev_probe_name(struct sr_dev *dev, int probenum,
-			     const char *name);
+SR_API int sr_dev_probe_name_set(struct sr_dev *dev, int probenum,
+				 const char *name);
 SR_API int sr_dev_trigger_clear(struct sr_dev *dev);
 SR_API int sr_dev_trigger_set(struct sr_dev *dev, int probenum,
 			      const char *trigger);