stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into epg-rewrite

Browse source
This commit is contained in:
Adam Sutton 2012-06-15 14:34:29 +01:00
commit db04c900f8
4 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
debian/tvheadend.tvheadend.init → debian/tvheadend.init vendored
View file

2
src/dvb/dvb_support.c
View file

@ -41,7 +41,7 @@ static int convert_iso_8859[16] = {
#define convert_utf8 14
#define convert_iso6937 15
static inline int encode_utf8(uint16_t c, char *outb, int outleft)
static inline int encode_utf8(unsigned int c, char *outb, int outleft)
{
if (c <= 0x7F && outleft >= 1) {
*outb = c;

2
src/htsmsg.c
View file

@ -268,6 +268,7 @@ htsmsg_add_msg(htsmsg_t *msg, const char *name, htsmsg_t *sub)
assert(sub->hm_data == NULL);
TAILQ_MOVE(&f->hmf_msg.hm_fields, &sub->hm_fields, hmf_link);
f->hmf_msg.hm_islist = sub->hm_islist;
free(sub);
}
@ -285,6 +286,7 @@ htsmsg_add_msg_extname(htsmsg_t *msg, const char *name, htsmsg_t *sub)
assert(sub->hm_data == NULL);
TAILQ_MOVE(&f->hmf_msg.hm_fields, &sub->hm_fields, hmf_link);
f->hmf_msg.hm_islist = sub->hm_islist;
free(sub);
}

5
src/htsmsg_json.c
View file

@ -233,7 +233,10 @@ htsmsg_json_parse_object(const char *s, const char **endp)
r = htsmsg_create_map();
while(1) {
while(*s > 0 && *s < 33)
s++;
if(*s != '}') while(1) {
if((name = htsmsg_json_parse_string(s, &s2)) == NULL) {
htsmsg_destroy(r);