don't re-implement osmo_talloc_replace_string()
osmo_talloc_replace_string() was introducd into libosmocore in 2014, see
commit f3c7e85d05f7b2b7bf093162b776f71b2bc6420d
There's no reason for us to re-implement this as bsc_replace_string
here.
Change-Id: I6d2fcaabbc74730f6f491a2b2d5c784ccafc6602
diff --git a/openbsc/src/libmgcp/mgcp_vty.c b/openbsc/src/libmgcp/mgcp_vty.c
index 13f66c5..7d4b2da 100644
--- a/openbsc/src/libmgcp/mgcp_vty.c
+++ b/openbsc/src/libmgcp/mgcp_vty.c
@@ -261,7 +261,7 @@
IP_STR
"IPv4 Address to use in SDP record\n")
{
- bsc_replace_string(g_cfg, &g_cfg->local_ip, argv[0]);
+ osmo_talloc_replace_string(g_cfg, &g_cfg->local_ip, argv[0]);
return CMD_SUCCESS;
}
@@ -272,7 +272,7 @@
IP_STR
"IPv4 Address of the BTS\n")
{
- bsc_replace_string(g_cfg, &g_cfg->bts_ip, argv[0]);
+ osmo_talloc_replace_string(g_cfg, &g_cfg->bts_ip, argv[0]);
inet_aton(g_cfg->bts_ip, &g_cfg->bts_in);
return CMD_SUCCESS;
}
@@ -285,7 +285,7 @@
IP_STR
"IPv4 Address to bind to\n")
{
- bsc_replace_string(g_cfg, &g_cfg->source_addr, argv[0]);
+ osmo_talloc_replace_string(g_cfg, &g_cfg->source_addr, argv[0]);
return CMD_SUCCESS;
}
@@ -403,7 +403,7 @@
"rtp bts-bind-ip A.B.C.D",
RTP_STR "Bind endpoints facing the BTS\n" "Address to bind to\n")
{
- bsc_replace_string(g_cfg, &g_cfg->bts_ports.bind_addr, argv[0]);
+ osmo_talloc_replace_string(g_cfg, &g_cfg->bts_ports.bind_addr, argv[0]);
return CMD_SUCCESS;
}
@@ -422,7 +422,7 @@
"rtp net-bind-ip A.B.C.D",
RTP_STR "Bind endpoints facing the Network\n" "Address to bind to\n")
{
- bsc_replace_string(g_cfg, &g_cfg->net_ports.bind_addr, argv[0]);
+ osmo_talloc_replace_string(g_cfg, &g_cfg->net_ports.bind_addr, argv[0]);
return CMD_SUCCESS;
}
@@ -483,7 +483,7 @@
if (!txt)
return CMD_WARNING;
- bsc_replace_string(g_cfg, &g_cfg->trunk.audio_fmtp_extra, txt);
+ osmo_talloc_replace_string(g_cfg, &g_cfg->trunk.audio_fmtp_extra, txt);
talloc_free(txt);
return CMD_SUCCESS;
}
@@ -529,7 +529,7 @@
"sdp audio-payload name NAME",
SDP_STR AUDIO_STR "Name\n" "Payload name\n")
{
- bsc_replace_string(g_cfg, &g_cfg->trunk.audio_name, argv[0]);
+ osmo_talloc_replace_string(g_cfg, &g_cfg->trunk.audio_name, argv[0]);
return CMD_SUCCESS;
}
@@ -714,7 +714,7 @@
CALL_AGENT_STR IP_STR
"IPv4 Address of the callagent\n")
{
- bsc_replace_string(g_cfg, &g_cfg->call_agent_addr, argv[0]);
+ osmo_talloc_replace_string(g_cfg, &g_cfg->call_agent_addr, argv[0]);
return CMD_SUCCESS;
}
@@ -730,7 +730,7 @@
"Use a MGW to detranscoder RTP\n"
"The IP address of the MGW")
{
- bsc_replace_string(g_cfg, &g_cfg->transcoder_ip, argv[0]);
+ osmo_talloc_replace_string(g_cfg, &g_cfg->transcoder_ip, argv[0]);
inet_aton(g_cfg->transcoder_ip, &g_cfg->transcoder_in);
return CMD_SUCCESS;
@@ -838,7 +838,7 @@
if (!txt)
return CMD_WARNING;
- bsc_replace_string(g_cfg, &trunk->audio_fmtp_extra, txt);
+ osmo_talloc_replace_string(g_cfg, &trunk->audio_fmtp_extra, txt);
talloc_free(txt);
return CMD_SUCCESS;
}
@@ -866,7 +866,7 @@
{
struct mgcp_trunk_config *trunk = vty->index;
- bsc_replace_string(g_cfg, &trunk->audio_name, argv[0]);
+ osmo_talloc_replace_string(g_cfg, &trunk->audio_name, argv[0]);
return CMD_SUCCESS;
}
@@ -1289,7 +1289,7 @@
"osmux bind-ip A.B.C.D",
OSMUX_STR IP_STR "IPv4 Address to bind to\n")
{
- bsc_replace_string(g_cfg, &g_cfg->osmux_addr, argv[0]);
+ osmo_talloc_replace_string(g_cfg, &g_cfg->osmux_addr, argv[0]);
return CMD_SUCCESS;
}