Some minor bugfixes and remove debug code.

This commit is contained in:
Adam Sutton 2012-06-06 16:07:15 +01:00
parent acd76dcf16
commit 705c7c53ca
2 changed files with 4 additions and 8 deletions

View file

@ -142,7 +142,6 @@ htsmsg_t *epggrab_module_list ( void )
e = htsmsg_create_map();
htsmsg_add_str(e, "id", m->id);
if(m->name) htsmsg_add_str(e, "name", m->name);
else printf("no name: %s\n", m->id);
if(m->path) htsmsg_add_str(e, "path", m->path);
htsmsg_add_u32(e, "flags", m->flags);
htsmsg_add_msg(a, NULL, e);
@ -231,11 +230,12 @@ static int _epggrab_schedule_deserialize ( htsmsg_t *a )
if (es) es = TAILQ_NEXT(es, link);
}
if (es)
while ( (es = TAILQ_NEXT(es, link)) ) {
if (es) {
do {
TAILQ_REMOVE(&epggrab_schedule, es, link);
save = 1;
}
} while ( (es = TAILQ_NEXT(es, link)) );
}
return save;
}
@ -292,7 +292,6 @@ void epggrab_save ( void )
if ( epggrab_module )
htsmsg_add_str(m, "module", epggrab_module->id);
htsmsg_add_msg(m, "schedule", _epggrab_schedule_serialize());
htsmsg_print(m);
hts_settings_save(m, "epggrab/config");
htsmsg_destroy(m);
}

View file

@ -475,8 +475,6 @@ extjs_epggrab(http_connection_t *hc, const char *remain, void *opaque)
if(op == NULL)
return 400;
printf("extjs_epggrab: %s\n", op);
pthread_mutex_lock(&global_lock);
if(http_access_verify(hc, ACCESS_ADMIN)) {
@ -534,7 +532,6 @@ extjs_epggrab(http_connection_t *hc, const char *remain, void *opaque)
save |= epggrab_set_module_by_id(str);
if ( (str = http_arg_get(&hc->hc_req_args, "schedule")) ) {
if ( (array = htsmsg_json_deserialize(str)) ) {
htsmsg_print(array);
save |= epggrab_set_schedule(array);
htsmsg_destroy(array);
}