diff options
| author | Harald Welte <laforge@gnumonks.org> | 2017-05-29 13:54:27 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-06-09 08:49:36 +0000 |
| commit | 4a824ca8fcf13427d1560b2c866da2a2d82e3692 (patch) | |
| tree | 9b85a739ddca384e56959a9bdfe0586d8e987148 /openbsc/src/osmo-bsc | |
| parent | aef68387ae6d78df948a6b2b3a61050c4f192c5e (diff) | |
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
Diffstat (limited to 'openbsc/src/osmo-bsc')
| -rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_main.c | 2 | ||||
| -rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_vty.c | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_main.c b/openbsc/src/osmo-bsc/osmo_bsc_main.c index 2f0b96de2..ee094d670 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_main.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_main.c @@ -253,7 +253,7 @@ int main(int argc, char **argv) data = bsc_gsmnet->bsc_data; if (rf_ctrl) - bsc_replace_string(data, &data->rf_ctrl_name, rf_ctrl); + osmo_talloc_replace_string(data, &data->rf_ctrl_name, rf_ctrl); data->rf_ctrl = osmo_bsc_rf_create(data->rf_ctrl_name, bsc_gsmnet); if (!data->rf_ctrl) { diff --git a/openbsc/src/osmo-bsc/osmo_bsc_vty.c b/openbsc/src/osmo-bsc/osmo_bsc_vty.c index 2336669e2..2e2e99bfd 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_vty.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_vty.c @@ -230,7 +230,7 @@ DEFUN(cfg_net_bsc_token, { struct bsc_msc_data *data = bsc_msc_data(vty); - bsc_replace_string(osmo_bsc_data(vty), &data->bsc_token, argv[0]); + osmo_talloc_replace_string(osmo_bsc_data(vty), &data->bsc_token, argv[0]); return CMD_SUCCESS; } @@ -490,7 +490,7 @@ DEFUN(cfg_net_msc_welcome_ussd, if (!str) return CMD_WARNING; - bsc_replace_string(osmo_bsc_data(vty), &data->ussd_welcome_txt, str); + osmo_talloc_replace_string(osmo_bsc_data(vty), &data->ussd_welcome_txt, str); talloc_free(str); return CMD_SUCCESS; } @@ -518,7 +518,7 @@ DEFUN(cfg_net_msc_lost_ussd, if (!str) return CMD_WARNING; - bsc_replace_string(osmo_bsc_data(vty), &data->ussd_msc_lost_txt, str); + osmo_talloc_replace_string(osmo_bsc_data(vty), &data->ussd_msc_lost_txt, str); talloc_free(str); return CMD_SUCCESS; } @@ -546,7 +546,7 @@ DEFUN(cfg_net_msc_grace_ussd, if (!str) return CMD_WARNING; - bsc_replace_string(osmo_bsc_data(vty), &data->ussd_grace_txt, str); + osmo_talloc_replace_string(osmo_bsc_data(vty), &data->ussd_grace_txt, str); talloc_free(str); return CMD_SUCCESS; } @@ -574,7 +574,7 @@ DEFUN(cfg_net_bsc_missing_msc_ussd, if (!txt) return CMD_WARNING; - bsc_replace_string(data, &data->ussd_no_msc_txt, txt); + osmo_talloc_replace_string(data, &data->ussd_no_msc_txt, txt); talloc_free(txt); return CMD_SUCCESS; } @@ -666,7 +666,7 @@ DEFUN(cfg_msc_acc_lst_name, { struct bsc_msc_data *msc = bsc_msc_data(vty); - bsc_replace_string(msc, &msc->acc_lst_name, argv[0]); + osmo_talloc_replace_string(msc, &msc->acc_lst_name, argv[0]); return CMD_SUCCESS; } @@ -695,7 +695,7 @@ DEFUN(cfg_net_bsc_mid_call_text, if (!txt) return CMD_WARNING; - bsc_replace_string(data, &data->mid_call_txt, txt); + osmo_talloc_replace_string(data, &data->mid_call_txt, txt); talloc_free(txt); return CMD_SUCCESS; } @@ -717,7 +717,7 @@ DEFUN(cfg_net_rf_socket, { struct osmo_bsc_data *data = osmo_bsc_data(vty); - bsc_replace_string(data, &data->rf_ctrl_name, argv[0]); + osmo_talloc_replace_string(data, &data->rf_ctrl_name, argv[0]); return CMD_SUCCESS; } @@ -749,7 +749,7 @@ DEFUN(cfg_bsc_acc_lst_name, { struct osmo_bsc_data *bsc = osmo_bsc_data(vty); - bsc_replace_string(bsc, &bsc->acc_lst_name, argv[0]); + osmo_talloc_replace_string(bsc, &bsc->acc_lst_name, argv[0]); return CMD_SUCCESS; } |