Some minor bugfixes and remove debug code.

diff --git a/src/epggrab.c b/src/epggrab.c
index 8576f48c72a2a9bcd7ad9ef6a8239bf3f185e5f8..e21eba1221060622b6d091dff05ed150e1270f68 100644 (file)
--- a/src/epggrab.c
+++ b/src/epggrab.c
@@ -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);
 }

diff --git a/src/webui/extjs.c b/src/webui/extjs.c
index fdf8ccb8497f117205334fa3e4c4c556a8f9840d..49d644300cff5ffaa3a778e9fd7a42778f9aa82e 100644 (file)
--- a/src/webui/extjs.c
+++ b/src/webui/extjs.c
@@ -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);
       }