From 08cc8179518e3d84561a1bfedfe5be4ed6672ff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96man?= Date: Sat, 18 Aug 2007 10:34:55 +0000 Subject: [PATCH] Move strtab stuff to a file of its own --- dvb_muxconfig.c | 24 +----------------------- strtab.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 23 deletions(-) create mode 100644 strtab.h diff --git a/dvb_muxconfig.c b/dvb_muxconfig.c index 75fd7659..a7dd958e 100644 --- a/dvb_muxconfig.c +++ b/dvb_muxconfig.c @@ -27,6 +27,7 @@ #include "tvhead.h" #include "dvb.h" #include "dvb_muxconfig.h" +#include "strtab.h" static void @@ -80,14 +81,6 @@ dvb_add_mux(struct dvb_frontend_parameters *fe_param, const char *name) } } - - -struct strtab { - const char *str; - int val; -}; - - static struct strtab fectab[] = { { "NONE", FEC_NONE }, { "1/2", FEC_1_2 }, @@ -145,21 +138,6 @@ static struct strtab hiertab[] = { -static int -str2val0(const char *str, struct strtab tab[], int l) -{ - int i; - for(i = 0; i < l; i++) - if(!strcasecmp(str, tab[i].str)) - return tab[i].val; - - return -1; -} - -#define str2val(str, tab) str2val0(str, tab, sizeof(tab) / sizeof(tab[0])) - - - static void dvb_t_config(const char *l) { diff --git a/strtab.h b/strtab.h new file mode 100644 index 00000000..ed0c8445 --- /dev/null +++ b/strtab.h @@ -0,0 +1,42 @@ +/* + * tvheadend + * Copyright (C) 2007 Andreas Öman + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef STRTAB_H_ +#define STRTAB_H_ + +#include + +struct strtab { + const char *str; + int val; +}; + +static int +str2val0(const char *str, struct strtab tab[], int l) +{ + int i; + for(i = 0; i < l; i++) + if(!strcasecmp(str, tab[i].str)) + return tab[i].val; + + return -1; +} + +#define str2val(str, tab) str2val0(str, tab, sizeof(tab) / sizeof(tab[0])) + +#endif /* STRTAB_H_ */