osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33676 ) Change subject: Fix various typos ...................................................................... Fix various typos Change-Id: I2726f18156f96999159f7b5f7c6c5a2d93667131 --- M src/osmo-bsc/a_reset.c M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/bts.c M src/osmo-bsc/bts_nokia_site.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/chan_alloc.c M src/osmo-bsc/lcs_ta_req.c M src/osmo-bsc/neighbor_ident_vty.c M src/osmo-bsc/nm_bts_fsm.c M src/osmo-bsc/osmo_bsc_main.c M src/osmo-bsc/paging.c M src/utils/meas_udp2db.c 14 files changed, 31 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/76/33676/1 diff --git a/src/osmo-bsc/a_reset.c b/src/osmo-bsc/a_reset.c index d23ffa7..c2c89e3 100644 --- a/src/osmo-bsc/a_reset.c +++ b/src/osmo-bsc/a_reset.c @@ -42,7 +42,7 @@ static void a_reset_link_up(void *data) { struct bsc_msc_data *msc = data; - LOGP(DMSC, LOGL_NOTICE, "(msc%d) BSSMAP assocation is up\n", msc->nr); + LOGP(DMSC, LOGL_NOTICE, "(msc%d) BSSMAP association is up\n", msc->nr); osmo_stat_item_inc(osmo_stat_item_group_get_item(msc->msc_statg, MSC_STAT_MSC_LINKS_ACTIVE), 1); osmo_stat_item_inc(osmo_stat_item_group_get_item(msc->network->bsc_statg, BSC_STAT_NUM_MSC_CONNECTED), 1); osmo_signal_dispatch(SS_MSC, S_MSC_CONNECTED, msc); @@ -51,7 +51,7 @@ static void a_reset_link_lost(void *data) { struct bsc_msc_data *msc = data; - LOGP(DMSC, LOGL_NOTICE, "(msc%d) BSSMAP assocation is down\n", msc->nr); + LOGP(DMSC, LOGL_NOTICE, "(msc%d) BSSMAP association is down\n", msc->nr); osmo_stat_item_dec(osmo_stat_item_group_get_item(msc->msc_statg, MSC_STAT_MSC_LINKS_ACTIVE), 1); osmo_stat_item_dec(osmo_stat_item_group_get_item(msc->network->bsc_statg, BSC_STAT_NUM_MSC_CONNECTED), 1); osmo_signal_dispatch(SS_MSC, S_MSC_LOST, msc); diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 54357de..0c3be1a 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1996,12 +1996,12 @@ return false; } - /* No free TCH/F or TCH/H was found, we now select one of the busy lchans and initate a release on that lchan. - * This will take a short amount of time. We need to come back and check regulary to see if we managed to + /* No free TCH/F or TCH/H was found, we now select one of the busy lchans and initiate a release on that lchan. + * This will take a short amount of time. We need to come back and check regularly to see if we managed to * free up another lchan. */ if (!rqd->release_lchan) { struct gsm_lchan *release_lchan; - /* Pick any busy TCH/F or TCH/H lchan and inititate a channel + /* Pick any busy TCH/F or TCH/H lchan and initiate a channel * release to make room for the incoming emergency call */ rqd->release_lchan = release_lchan = get_any_lchan(rqd->bts); if (!release_lchan) { diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 02ca29c..d58bca2 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -222,7 +222,7 @@ } } - /* Only AoIP networks include a speech codec (choosen) in the + /* Only AoIP networks include a speech codec (chosen) in the * assignment complete message. */ if (gscon_is_aoip(conn)) { /* Extrapolate speech codec from speech mode */ diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 6300ca6..c84e6c9 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -80,7 +80,7 @@ {GSCON_EV_MO_COMPL_L3, "MO_COMPL_L3"}, {GSCON_EV_A_CONN_CFM, "MO-CONNECT.cfm"}, {GSCON_EV_A_CLEAR_CMD, "CLEAR_CMD"}, - {GSCON_EV_A_DISC_IND, "DISCONNET.ind"}, + {GSCON_EV_A_DISC_IND, "DISCONNECT.ind"}, {GSCON_EV_A_COMMON_ID_IND, "COMMON_ID.ind"}, {GSCON_EV_ASSIGNMENT_START, "ASSIGNMENT_START"}, {GSCON_EV_ASSIGNMENT_END, "ASSIGNMENT_END"}, diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 0292386..bd61501 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -1014,7 +1014,7 @@ switch (ts->pchan_is) { /* Not allowed on CCCH/BCCH */ case GSM_PCHAN_CCCH: - /* Preceeding timeslot shall not exceed 2 dB */ + /* Preceding timeslot shall not exceed 2 dB */ if (prev->c0_max_power_red_db > 0) prev->c0_max_power_red_db = 2; /* fall-through */ diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c index 2028009..dc8ff14 100644 --- a/src/osmo-bsc/bts_nokia_site.c +++ b/src/osmo-bsc/bts_nokia_site.c @@ -1338,7 +1338,7 @@ GET_NEXT_BYTE; - /* encoding bit, construced means that other elements are contained */ + /* encoding bit, constructed means that other elements are contained */ constructed = ((ub & 0x20) ? 1 : 0); if ((ub & 0x1F) == 0x1F) { @@ -1397,7 +1397,7 @@ GET_NEXT_BYTE; - /* encoding bit, construced means that other elements are contained */ + /* encoding bit, constructed means that other elements are contained */ constructed = ((ub & 0x20) ? 1 : 0); if ((ub & 0x1F) == 0x1F) { diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 657d03e..5110659 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -4242,7 +4242,7 @@ vty_out(vty, "auto%s", VTY_NEWLINE); } -/* TODO: generalize and move indention handling to libosmocore */ +/* TODO: generalize and move indentation handling to libosmocore */ #define cfg_out(fmt, args...) \ vty_out(vty, "%*s" fmt, indent, "", ##args); diff --git a/src/osmo-bsc/chan_alloc.c b/src/osmo-bsc/chan_alloc.c index 4fbf8be..cc8da3d 100644 --- a/src/osmo-bsc/chan_alloc.c +++ b/src/osmo-bsc/chan_alloc.c @@ -63,7 +63,7 @@ if (!nm_is_running(&ts->mo.nm_state)) continue; - /* A dynamic timeslot currently in PDCH mode are available as TCH or SDCCH8, beause they can be switched + /* A dynamic timeslot currently in PDCH mode are available as TCH or SDCCH8, because they can be switched * to TCH or SDCCH mode at any moment. Count TCH/F_TCH/H_SDCCH8_PDCH as one total timeslot, even though it may * be switched to TCH/H and would then count as two -- hence opt for pessimistic load. */ if ((ts->pchan_on_init == GSM_PCHAN_OSMO_DYN || diff --git a/src/osmo-bsc/lcs_ta_req.c b/src/osmo-bsc/lcs_ta_req.c index f0bb02e..a1fa873 100644 --- a/src/osmo-bsc/lcs_ta_req.c +++ b/src/osmo-bsc/lcs_ta_req.c @@ -89,7 +89,7 @@ struct lcs_ta_req *lcs_ta_req; if (lcs_loc_req->ta_req) { LOG_LCS_TA_REQ(lcs_loc_req->ta_req, LOGL_ERROR, - "Cannot start anoter TA Request FSM, this TA Request is still active\n"); + "Cannot start another TA Request FSM, this TA Request is still active\n"); return -ENOTSUP; } lcs_ta_req = lcs_ta_req_alloc(lcs_loc_req->fi, LCS_LOC_REQ_EV_TA_REQ_END); diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c index 7e58e37..44b9057 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -494,7 +494,7 @@ { vty_out(vty, "%% Warning: The CTRL interface for Neighbor Address Resolution is now deprecated." "Upgrade osmo-pcu and drop the 'neighbor-resolution bind " VTY_IPV46_CMD " [<0-65535>]' VTY " - "option in order to let osmo-pcu use the new resoluton method using the PCUIF over IPA " + "option in order to let osmo-pcu use the new resolution method using the PCUIF over IPA " "multiplex, which will work out of the box without required configuration.%s", VTY_NEWLINE); osmo_talloc_replace_string(bsc_gsmnet, &bsc_gsmnet->neigh_ctrl.addr, argv[0]); if (argc > 1) diff --git a/src/osmo-bsc/nm_bts_fsm.c b/src/osmo-bsc/nm_bts_fsm.c index dd05f9a..e601e18 100644 --- a/src/osmo-bsc/nm_bts_fsm.c +++ b/src/osmo-bsc/nm_bts_fsm.c @@ -122,7 +122,7 @@ bts->bts_nr, 0xff, 0xff, NM_STATE_UNLOCKED); /* Message containing BTS attributes, including the interference band bounds, was ACKed by the BTS. - * Store the sent bounds as the ones being used for logging and comparing intereference levels. */ + * Store the sent bounds as the ones being used for logging and comparing interference levels. */ bts->interf_meas_params_used = bts->interf_meas_params_cfg; } diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 0757da0..ff73ebc 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -870,7 +870,7 @@ struct mgcp_client *mgcp_client_single; unsigned int pool_members_initalized; - /* Initialize MGW pool. This initalizes and connects all MGCP clients that are currently configured in + /* Initialize MGW pool. This initializes and connects all MGCP clients that are currently configured in * the pool. Adding additional MGCP clients to the pool is possible but the user has to configure and * (re)connect them manually from the VTY. */ if (!mgcp_client_pool_empty(bsc_gsmnet->mgw.mgw_pool)) { @@ -890,7 +890,7 @@ LOGP(DNM, LOGL_NOTICE, "No MGW pool configured, using MGW configuration in VTY node 'msc'\n"); mgcp_client_single = mgcp_client_init(bsc_gsmnet, bsc_gsmnet->mgw.conf); if (!mgcp_client_single) { - LOGP(DNM, LOGL_ERROR, "MGW (single) client initalization failed\n"); + LOGP(DNM, LOGL_ERROR, "MGW (single) client initialization failed\n"); return -EINVAL; } if (mgcp_client_connect(mgcp_client_single)) { diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index 1cee164..b7842dd 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -73,8 +73,8 @@ .tv_nsec = 500 * 1000 * 1000, }; -/* If no CCCH Lod Ind is received before this time period, the BTS is considered - * to have stopped sending CCCH Load Indication, probaby due to being under Load +/* If no CCCH Load Ind is received before this time period, the BTS is considered + * to have stopped sending CCCH Load Indication, probably due to being under Load * Threshold: */ #define bts_no_ccch_load_ind_timeout_sec(bts) ((bts)->ccch_load_ind_period * 2) @@ -361,7 +361,7 @@ * coming from abis_rsl.c * * We attempt to iterate once over the list of items but - * only upto available_slots. + * only up to available_slots. */ static void paging_handle_pending_requests(struct gsm_bts_paging_state *paging_bts) { @@ -562,7 +562,7 @@ } else if (bts_entry->initial_req_list_len == 1) { /* Worker timer is armed -> there was already one req before * bts_entry->initial_req_list_len == 1 -> There were no initial requests - * in the list, aka the timer is waiting for retransmition, + * in the list, aka the timer is waiting for retransmission, * which is a longer period. * Let's recaculate the time to adapt it to initial_period: */ struct timespec now, elapsed, tdiff; diff --git a/src/utils/meas_udp2db.c b/src/utils/meas_udp2db.c index f40f137..0c97d8b 100644 --- a/src/utils/meas_udp2db.c +++ b/src/utils/meas_udp2db.c @@ -1,4 +1,4 @@ -/* liesten to meas_feed on UDP and write it to sqlite3 database */ +/* listen to meas_feed on UDP and write it to sqlite3 database */ /* (C) 2012 by Harald Welte &lt;laforge(a)gnumonks.org&gt; * -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2726f18156f96999159f7b5f7c6c5a2d93667131 Gerrit-Change-Number: 33676 Gerrit-PatchSet: 1 Gerrit-Owner: osmith &lt;osmith(a)sysmocom.de&gt; Gerrit-MessageType: newchange