From 5ffb50371eb4795917ea0ce68b3748b0adc74ec9 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 11 Mar 2016 09:40:56 +0700 Subject: rename osim_file_find_* to osim_file_desc_find_* they return an osim_file_desc, and not an osim_file, so fix the naming --- src/sim/core.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/sim/core.c b/src/sim/core.c index ddddc7dc..2f129c9e 100644 --- a/src/sim/core.c +++ b/src/sim/core.c @@ -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; } -- cgit v1.2.3