s/sr_config_make/sr_config_new/.

This matches the naming of other/similar functions better.

diff --git a/hardware/lascar-el-usb/api.c b/hardware/lascar-el-usb/api.c
index 634d6f1745b6ae570bbaeb9aba2322230e71cbdd..901af0c6c105a3ebaf23473b5abf43047f1aabec 100644 (file)
--- a/hardware/lascar-el-usb/api.c
+++ b/hardware/lascar-el-usb/api.c
@@ -381,7 +381,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        interval = (devc->config[0x1c] | (devc->config[0x1d] << 8)) * 1000;
        packet.type = SR_DF_META;
        packet.payload = &meta;
-       src = sr_config_make(SR_CONF_SAMPLE_INTERVAL, (const void *)&interval);
+       src = sr_config_new(SR_CONF_SAMPLE_INTERVAL, (const void *)&interval);
        meta.config = g_slist_append(NULL, src);
        sr_session_send(devc->cb_data, &packet);
        g_free(src);

diff --git a/hwdriver.c b/hwdriver.c
index b8726e8c887e98568db01e4b893e27e620848f62..c2e6cda1dd9c8f569e2510ea518ecfa871b44096 100644 (file)
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -355,7 +355,7 @@ SR_PRIV void sr_hw_cleanup_all(void)
        }
 }
 
-SR_PRIV struct sr_config *sr_config_make(int key, const void *value)
+SR_PRIV struct sr_config *sr_config_new(int key, const void *value)
 {
        struct sr_config *src;
 

diff --git a/input/binary.c b/input/binary.c
index 148c41e782433cf4e852dde0b81a393ac110524e..d37a189a60a3ff57df10cf7f18890e097a22bec1 100644 (file)
--- a/input/binary.c
+++ b/input/binary.c
@@ -121,7 +121,7 @@ static int loadfile(struct sr_input *in, const char *filename)
        if (ctx->samplerate) {
                packet.type = SR_DF_META;
                packet.payload = &meta;
-               src = sr_config_make(SR_CONF_SAMPLERATE, (const void *)&ctx->samplerate);
+               src = sr_config_new(SR_CONF_SAMPLERATE, (const void *)&ctx->samplerate);
                meta.config = g_slist_append(NULL, src);
                sr_session_send(in->sdi, &packet);
        }

diff --git a/input/chronovu_la8.c b/input/chronovu_la8.c
index 991bfeecc485425fa8ea6f634576d15f58fc12ae..a78f356034968d2d5037b06255bbe1ba3df89aa6 100644 (file)
--- a/input/chronovu_la8.c
+++ b/input/chronovu_la8.c
@@ -172,7 +172,7 @@ static int loadfile(struct sr_input *in, const char *filename)
        /* Send metadata about the SR_DF_LOGIC packets to come. */
        packet.type = SR_DF_META;
        packet.payload = &meta;
-       src = sr_config_make(SR_CONF_SAMPLERATE, (const void *)&samplerate);
+       src = sr_config_new(SR_CONF_SAMPLERATE, (const void *)&samplerate);
        meta.config = g_slist_append(NULL, src);
        sr_session_send(in->sdi, &packet);
 

diff --git a/input/vcd.c b/input/vcd.c
index 01dcdb10744447ba123bcd7cc0d1d645afd5ef24..814988f7ae2c4aa7388d297a63b4d104a11c1c3b 100644 (file)
--- a/input/vcd.c
+++ b/input/vcd.c
@@ -571,7 +571,7 @@ static int loadfile(struct sr_input *in, const char *filename)
        packet.type = SR_DF_META;
        packet.payload = &meta;
        samplerate = ctx->samplerate / ctx->downsample;
-       src = sr_config_make(SR_CONF_SAMPLERATE, (const void *)&samplerate);
+       src = sr_config_new(SR_CONF_SAMPLERATE, (const void *)&samplerate);
        meta.config = g_slist_append(NULL, src);
        sr_session_send(in->sdi, &packet);
 

diff --git a/input/wav.c b/input/wav.c
index c5b573caeb99af93b650356ec3da12a77f92e72c..7cd75067797746e2ad97119f34266cf39795fda7 100644 (file)
--- a/input/wav.c
+++ b/input/wav.c
@@ -148,7 +148,7 @@ static int loadfile(struct sr_input *in, const char *filename)
 
        packet.type = SR_DF_META;
        packet.payload = &meta;
-       src = sr_config_make(SR_CONF_SAMPLERATE, (const void *)&ctx->samplerate);
+       src = sr_config_new(SR_CONF_SAMPLERATE, (const void *)&ctx->samplerate);
        meta.config = g_slist_append(NULL, src);
        sr_session_send(in->sdi, &packet);
 

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index aeb96ac854915380c6f0d346bc46a5fb52dc67a4..640f6975ddf69d4b4c90937d08c89e42d2570dae 100644 (file)
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -113,7 +113,7 @@ SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial);
 /*--- hwdriver.c ------------------------------------------------------------*/
 
 SR_PRIV void sr_hw_cleanup_all(void);
-SR_PRIV struct sr_config *sr_config_make(int key, const void *value);
+SR_PRIV struct sr_config *sr_config_new(int key, const void *value);
 SR_PRIV int sr_source_remove(int fd);
 SR_PRIV int sr_source_add(int fd, int events, int timeout,
                          sr_receive_data_callback_t cb, void *cb_data);