Rename probe_find() to sr_device_probe_find().

diff --git a/device.c b/device.c
index dd3a4000bcc6b9f9405ba673aca5035eedb8acfe..2dee902cdae15d2f2d9af6f9104e1c2245d63d09 100644 (file)
--- a/device.c
+++ b/device.c
@@ -131,7 +131,7 @@ void sr_device_probe_clear(struct sr_device *device, int probenum)
 {
        struct sr_probe *p;
 
-       p = probe_find(device, probenum);
+       p = sr_device_probe_find(device, probenum);
        if (!p)
                return;
 
@@ -166,7 +166,7 @@ void sr_device_probe_add(struct sr_device *device, char *name)
        device->probes = g_slist_append(device->probes, p);
 }
 
-struct sr_probe *probe_find(struct sr_device *device, int probenum)
+struct sr_probe *sr_device_probe_find(struct sr_device *device, int probenum)
 {
        GSList *l;
        struct sr_probe *p, *found_probe;
@@ -188,7 +188,7 @@ void sr_device_probe_name(struct sr_device *device, int probenum, char *name)
 {
        struct sr_probe *p;
 
-       p = probe_find(device, probenum);
+       p = sr_device_probe_find(device, probenum);
        if (!p)
                return;
 
@@ -207,7 +207,7 @@ void sr_device_trigger_clear(struct sr_device *device)
                return;
 
        for (pnum = 1; pnum <= g_slist_length(device->probes); pnum++) {
-               p = probe_find(device, pnum);
+               p = sr_device_probe_find(device, pnum);
                if (p && p->trigger) {
                        g_free(p->trigger);
                        p->trigger = NULL;
@@ -220,7 +220,7 @@ void sr_device_trigger_set(struct sr_device *device, int probenum, char *trigger
 {
        struct sr_probe *p;
 
-       p = probe_find(device, probenum);
+       p = sr_device_probe_find(device, probenum);
        if (!p)
                return;
 

diff --git a/sigrok-proto.h b/sigrok-proto.h
index e41dd9f4f4e25ae3c83127682c2dc3c9065ebe95..d6904eb89f39eb10c1d3afe4390f6aded64381db 100644 (file)
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -45,7 +45,7 @@ void sr_device_destroy(struct sr_device *dev);
 
 void sr_device_probe_clear(struct sr_device *device, int probenum);
 void sr_device_probe_add(struct sr_device *device, char *name);
-struct sr_probe *probe_find(struct sr_device *device, int probenum);
+struct sr_probe *sr_device_probe_find(struct sr_device *device, int probenum);
 void sr_device_probe_name(struct sr_device *device, int probenum, char *name);
 
 void sr_device_trigger_clear(struct sr_device *device);