sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Refactor: The macros are no longer needed

This commit is contained in:
Denis Kenzior 2010-05-26 15:13:04 -05:00
parent d3b9f42ed4
commit 53dc160362
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/modem.c
View File

@ -268,14 +268,6 @@ gboolean __ofono_modem_remove_atom_watch(struct ofono_modem *modem,
return __ofono_watchlist_remove_item(modem->atom_watches, id);
}
#define FIND_ATOM_IN_LIST(list) \
for (l = list; l; l = l->next) { \
atom = l->data; \
\
if (atom->type == type) \
return atom; \
} \
struct ofono_atom *__ofono_modem_find_atom(struct ofono_modem *modem,
enum ofono_atom_type type)
{
@ -285,21 +277,16 @@ struct ofono_atom *__ofono_modem_find_atom(struct ofono_modem *modem,
if (modem == NULL)
return NULL;
FIND_ATOM_IN_LIST(modem->atoms)
for (l = modem->atoms; l; l = l->next) {
atom = l->data;
if (atom->type == type)
return atom;
}
return NULL;
}
#define FOREACH_ATOM_IN_LIST(list) \
for (l = list; l; l = l->next) { \
atom = l->data; \
\
if (atom->type != type) \
continue; \
\
callback(atom, data); \
} \
void __ofono_modem_foreach_atom(struct ofono_modem *modem,
enum ofono_atom_type type,
ofono_atom_func callback, void *data)
@ -310,7 +297,14 @@ void __ofono_modem_foreach_atom(struct ofono_modem *modem,
if (modem == NULL)
return;
FOREACH_ATOM_IN_LIST(modem->atoms)
for (l = modem->atoms; l; l = l->next) {
atom = l->data;
if (atom->type != type)
continue;
callback(atom, data);
}
}
void __ofono_atom_free(struct ofono_atom *atom)