osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

rename osim_file_find_* to osim_file_desc_find_* 

they return an osim_file_desc, and not an osim_file, so fix the naming
This commit is contained in:
Harald Welte 2016-03-11 09:40:56 +07:00
parent c28f4cdd6d
commit 5ffb50371e
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/osmocom/sim/sim.h
View File

@ -240,13 +240,13 @@ struct osim_file {
struct osim_file_desc *
osim_file_find_name(struct osim_file_desc *parent, const char *name);
osim_file_desc_find_name(struct osim_file_desc *parent, const char *name);
struct osim_file_desc *
osim_file_find_fid(struct osim_file_desc *parent, uint16_t fid);
osim_file_desc_find_fid(struct osim_file_desc *parent, uint16_t fid);
struct osim_file_desc *
osim_file_find_sfid(struct osim_file_desc *parent, uint8_t sfid);
osim_file_desc_find_sfid(struct osim_file_desc *parent, uint8_t sfid);
/* STATUS WORDS */

8
src/sim/core.c
View File

@ -172,7 +172,7 @@ add_adf_with_ef(struct osim_file_desc *parent,
}
struct osim_file_desc *
osim_file_find_name(struct osim_file_desc *parent, const char *name)
osim_file_desc_find_name(struct osim_file_desc *parent, const char *name)
{
struct osim_file_desc *ofd;
llist_for_each_entry(ofd, &parent->child_list, list) {
@ -184,7 +184,7 @@ osim_file_find_name(struct osim_file_desc *parent, const char *name)
}
struct osim_file_desc *
osim_file_find_fid(struct osim_file_desc *parent, uint16_t fid)
osim_file_desc_find_fid(struct osim_file_desc *parent, uint16_t fid)
{
struct osim_file_desc *ofd;
llist_for_each_entry(ofd, &parent->child_list, list) {
@ -196,10 +196,12 @@ osim_file_find_fid(struct osim_file_desc *parent, uint16_t fid)
}
struct osim_file_desc *
osim_file_find_sfid(struct osim_file_desc *parent, uint8_t sfid)
osim_file_desc_find_sfid(struct osim_file_desc *parent, uint8_t sfid)
{
struct osim_file_desc *ofd;
llist_for_each_entry(ofd, &parent->child_list, list) {
if (ofd->sfid == SFI_NONE)
continue;
if (ofd->sfid == sfid) {
return ofd;
}

2
utils/osmo-sim-test.c
View File

@ -276,7 +276,7 @@ static struct msgb *try_select_adf_usim(struct osim_chan_hdl *st)
/* attach the USIM profile, FIXME: do this based on AID match */
st->card->prof = osim_cprof_usim(st->card);
st->cwd = osim_file_find_name(st->card->prof->mf, "ADF.USIM");
st->cwd = osim_file_desc_find_name(st->card->prof->mf, "ADF.USIM");
msgb_free(msg);