Fix some possible compile problems. Found with more strict gcc variants. Fixes #1086.
This commit is contained in:
parent
7f02f0f620
commit
5175b2e2fb
2 changed files with 14 additions and 10 deletions
16
src/muxes.h
16
src/muxes.h
|
@ -23,14 +23,14 @@ typedef struct mux {
|
|||
LIST_ENTRY(mux) link;
|
||||
unsigned int freq;
|
||||
unsigned int symrate;
|
||||
char fec;
|
||||
char constellation;
|
||||
char bw;
|
||||
char fechp;
|
||||
char feclp;
|
||||
char tmode;
|
||||
char guard;
|
||||
char hierarchy;
|
||||
short fec;
|
||||
short constellation;
|
||||
short bw;
|
||||
short fechp;
|
||||
short feclp;
|
||||
short tmode;
|
||||
short guard;
|
||||
short hierarchy;
|
||||
char polarisation;
|
||||
} mux_t;
|
||||
|
||||
|
|
|
@ -343,8 +343,9 @@ extjs_channels_update(htsmsg_t *in)
|
|||
channel_set_number(ch, atoi(s));
|
||||
|
||||
if((s = htsmsg_get_str(c, "epggrabsrc")) != NULL) {
|
||||
char *sptr;
|
||||
char *modecid = strtok_r((char*)s, ",", &sptr);
|
||||
char *tmp = strdup(s);
|
||||
char *sptr = NULL;
|
||||
char *modecid = strtok_r(tmp, ",", &sptr);
|
||||
char *modid, *ecid;
|
||||
epggrab_module_t *mod;
|
||||
epggrab_channel_t *ec;
|
||||
|
@ -376,6 +377,9 @@ extjs_channels_update(htsmsg_t *in)
|
|||
|
||||
epggrab_channel_link(ec, ch);
|
||||
}
|
||||
|
||||
/* Cleanup */
|
||||
free(tmp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue