From: Uwe Hermann <redacted>
Date: Sun, 17 Mar 2013 15:50:51 +0000 (+0100)
Subject: s/sr_config_make/sr_config_new/.
X-Git-Tag: dsupstream~236
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=3ebce226a2672ea4f0788f5f2a222586148aabc1;p=libsigrok.git

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 634d6f17..901af0c6 100644
--- 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 b8726e8c..c2e6cda1 100644
--- 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 148c41e7..d37a189a 100644
--- 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 991bfeec..a78f3560 100644
--- 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 01dcdb10..814988f7 100644
--- 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 c5b573ca..7cd75067 100644
--- 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 aeb96ac8..640f6975 100644
--- 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);