From 96b4a04519f82d3605d38e88d7bdcb653841025e Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sun, 26 Jan 2014 12:24:53 -0200 Subject: [PATCH] libdvbv5: move store/retrieve functions upper We'll need to use those functions earlier. So, move them to the beginning of the file. No functional changes. Signed-off-by: Mauro Carvalho Chehab --- lib/libdvbv5/dvb-file.c | 78 ++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/lib/libdvbv5/dvb-file.c b/lib/libdvbv5/dvb-file.c index cf3cef3..1c33a90 100644 --- a/lib/libdvbv5/dvb-file.c +++ b/lib/libdvbv5/dvb-file.c @@ -49,6 +49,45 @@ #include "descriptors/desc_atsc_service_location.h" #include "descriptors/desc_hierarchy.h" +int store_entry_prop(struct dvb_entry *entry, + uint32_t cmd, uint32_t value) +{ + int i; + + for (i = 0; i < entry->n_props; i++) { + if (cmd == entry->props[i].cmd) + break; + } + if (i == entry->n_props) { + if (i == DTV_MAX_COMMAND) { + fprintf(stderr, "Can't add property %s\n", + dvb_v5_name[cmd]); + return -1; + } + entry->n_props++; + entry->props[i].cmd = cmd; + } + + entry->props[i].u.data = value; + + return 0; +} + +int retrieve_entry_prop(struct dvb_entry *entry, + uint32_t cmd, uint32_t *value) +{ + int i; + + for (i = 0; i < entry->n_props; i++) { + if (cmd == entry->props[i].cmd) { + *value = entry->props[i].u.data; + return 0; + } + } + + return -1; +} + /* * Generic parse function for all formats each channel is contained into * just one line. @@ -382,45 +421,6 @@ error: return -1; } -int store_entry_prop(struct dvb_entry *entry, - uint32_t cmd, uint32_t value) -{ - int i; - - for (i = 0; i < entry->n_props; i++) { - if (cmd == entry->props[i].cmd) - break; - } - if (i == entry->n_props) { - if (i == DTV_MAX_COMMAND) { - fprintf(stderr, "Can't add property %s\n", - dvb_v5_name[cmd]); - return -1; - } - entry->n_props++; - entry->props[i].cmd = cmd; - } - - entry->props[i].u.data = value; - - return 0; -} - -int retrieve_entry_prop(struct dvb_entry *entry, - uint32_t cmd, uint32_t *value) -{ - int i; - - for (i = 0; i < entry->n_props; i++) { - if (cmd == entry->props[i].cmd) { - *value = entry->props[i].u.data; - return 0; - } - } - - return -1; -} - #define CHANNEL "CHANNEL" static int fill_entry(struct dvb_entry *entry, char *key, char *value) -- 2.7.4