# HG changeset patch # User melunko # Date 1170192336 0 # Node ID 15f6102ef37dc4ed7cbe612ebeb7775645a1ad48 # Parent f8d246310650eabd2b8cc1c36b8555d67f603004 [svn r315] Removed unused comments diff -r f8d246310650 -r 15f6102ef37d gmyth/src/gmyth_epg.c --- a/gmyth/src/gmyth_epg.c Tue Jan 30 20:52:35 2007 +0000 +++ b/gmyth/src/gmyth_epg.c Tue Jan 30 21:25:36 2007 +0000 @@ -189,19 +189,14 @@ gmyth_epg_get_program_list (GMythEPG *gmyth_epg, GList **proglist, const gint chan_num, GTimeVal *starttime, GTimeVal *endtime) { -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); gchar *startts = gmyth_util_time_to_string_from_time_val(starttime); -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); gchar *endts = gmyth_util_time_to_string_from_time_val(endtime); -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); MYSQL_ROW row; GString *querystr; -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); assert(gmyth_epg); -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); querystr = g_string_new( "SELECT DISTINCT program.chanid, program.starttime, program.endtime, " " program.title, program.subtitle, program.description, " @@ -220,7 +215,6 @@ " program.starttime = oldrecstatus.starttime " ); -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); g_string_append_printf (querystr, "WHERE program.chanid = %d " " AND program.endtime >= '%s' " @@ -228,38 +222,30 @@ " AND program.manualid = 0 ", chan_num, startts, endts); -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); if (!g_strrstr(querystr->str, " GROUP BY ")) querystr = g_string_append(querystr, " GROUP BY program.starttime, channel.channum, " " channel.callsign, program.title "); -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); if (!g_strrstr(querystr->str, " LIMIT ")) querystr = g_string_append(querystr, " LIMIT 1000 "); -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); MYSQL_RES *res_set = gmyth_query_process_statement(gmyth_epg->sqlquery, querystr->str); -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); if (res_set == NULL) { g_warning ("[%s] msql query returned NULL MYSQL_RES", __FUNCTION__); return -1; } -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); (*proglist) = NULL; while ((row = mysql_fetch_row (res_set)) != NULL) { -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); GMythProgramInfo *p = gmyth_program_info_new (); p->chanid = g_string_new (row[0]); -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); p->startts = gmyth_util_string_to_time_val (row[1]); p->endts = gmyth_util_string_to_time_val (row[2]); -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); p->recstartts = g_new0 (GTimeVal, 1); p->recstartts->tv_sec = p->startts->tv_sec; @@ -272,7 +258,6 @@ p->lastmodified = g_new0 (GTimeVal, 1); p->lastmodified->tv_sec = p->startts->tv_sec; p->lastmodified->tv_usec = p->startts->tv_usec; -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); p->title = g_string_new (row[3]); p->subtitle = g_string_new (row[4]); @@ -289,7 +274,6 @@ p->year = g_string_new (row[15]); p->stars = g_ascii_strtod(row[16], NULL); -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); if (!row[17] || !strcmp(row[17], "")) { p->originalAirDate = 0; p->hasAirDate = FALSE; @@ -298,7 +282,6 @@ p->hasAirDate = TRUE; } -printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); p->catType = g_string_new (row[18]); *proglist = g_list_append((*proglist), p); diff -r f8d246310650 -r 15f6102ef37d gmyth/src/gmyth_programinfo.c --- a/gmyth/src/gmyth_programinfo.c Tue Jan 30 20:52:35 2007 +0000 +++ b/gmyth/src/gmyth_programinfo.c Tue Jan 30 21:25:36 2007 +0000 @@ -106,21 +106,18 @@ { GMythProgramInfo *gmyth_program_info = GMYTH_PROGRAM_INFO(object); - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); if ( gmyth_program_info->chanid != NULL ) { g_string_free( gmyth_program_info->chanid, TRUE ); gmyth_program_info->chanid = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); /** The program start time. */ if ( gmyth_program_info->startts != NULL ) { g_free( gmyth_program_info->startts); gmyth_program_info->startts = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); /** The program end time. */ if ( gmyth_program_info->endts != NULL ) @@ -128,7 +125,6 @@ g_free( gmyth_program_info->endts ); gmyth_program_info->endts = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); /** The recording schedule start time. */ if ( gmyth_program_info->recstartts != NULL ) @@ -137,14 +133,12 @@ gmyth_program_info->recstartts = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); /** The recording schedule end time */ if ( gmyth_program_info->recendts != NULL ) { g_free(gmyth_program_info->recendts); gmyth_program_info->recendts = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); /** The program title. */ if (gmyth_program_info->title != NULL ) @@ -152,7 +146,6 @@ g_string_free(gmyth_program_info->title, TRUE); gmyth_program_info->title = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); /** The program subtitle. */ if (gmyth_program_info->subtitle != NULL ) @@ -160,14 +153,12 @@ g_string_free(gmyth_program_info->subtitle, TRUE ); gmyth_program_info->subtitle = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); /** The program description. */ if ( gmyth_program_info->description != NULL ) { g_string_free( gmyth_program_info->description, TRUE ); gmyth_program_info->description = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); /** The program category. */ if ( gmyth_program_info->category != NULL ) @@ -175,33 +166,28 @@ g_string_free( gmyth_program_info->category, TRUE ); gmyth_program_info->category = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); if ( gmyth_program_info->chanstr != NULL ) { g_string_free( gmyth_program_info->chanstr, TRUE ); gmyth_program_info->chanstr = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); if ( gmyth_program_info->chansign != NULL ) { g_string_free( gmyth_program_info->chansign, TRUE ); gmyth_program_info->chansign = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); /** The associated channel name. */ if ( gmyth_program_info->channame != NULL ) { g_string_free( gmyth_program_info->channame, TRUE ); gmyth_program_info->channame = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); if ( gmyth_program_info->chanOutputFilters != NULL ) { g_string_free( gmyth_program_info->chanOutputFilters, TRUE ); gmyth_program_info->chanOutputFilters = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); if ( gmyth_program_info->seriesid != NULL ) { @@ -209,7 +195,6 @@ gmyth_program_info->chanOutputFilters = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); /** The program unique id. */ if ( gmyth_program_info->programid != NULL ) { @@ -217,14 +202,12 @@ gmyth_program_info->programid = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); if ( gmyth_program_info->catType != NULL ) { g_string_free( gmyth_program_info->catType, TRUE ); gmyth_program_info->catType = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); if ( gmyth_program_info->sortTitle != NULL ) { @@ -232,7 +215,6 @@ gmyth_program_info->sortTitle = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); if ( gmyth_program_info->year != NULL ) { @@ -240,35 +222,29 @@ gmyth_program_info->year = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); if ( gmyth_program_info->originalAirDate != NULL ) { g_free( gmyth_program_info->originalAirDate); gmyth_program_info->originalAirDate = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); if ( gmyth_program_info->lastmodified != NULL ) { g_free( gmyth_program_info->lastmodified ); gmyth_program_info->lastmodified = NULL; - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); if (gmyth_program_info->lastInUseTime != NULL) { g_free( gmyth_program_info->lastInUseTime ); gmyth_program_info->lastInUseTime = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); if ( gmyth_program_info->schedulerid != NULL ) { g_string_free( gmyth_program_info->schedulerid, TRUE ); gmyth_program_info->schedulerid = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); if ( gmyth_program_info->recgroup != NULL ) { @@ -280,7 +256,6 @@ g_string_free( gmyth_program_info->playgroup, TRUE ); gmyth_program_info->playgroup = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); /** The file name of the recorded program.*/ if ( gmyth_program_info->pathname != NULL) @@ -288,13 +263,12 @@ g_string_free( gmyth_program_info->pathname, TRUE ); gmyth_program_info->pathname = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); + if ( gmyth_program_info->hostname != NULL ) { g_string_free( gmyth_program_info->hostname, TRUE ); gmyth_program_info->hostname = NULL; } - printf ("XXXX %s %d\n", __FUNCTION__, __LINE__); G_OBJECT_CLASS (gmyth_program_info_parent_class)->dispose (object); } diff -r f8d246310650 -r 15f6102ef37d gmyth/src/gmyth_scheduler.c --- a/gmyth/src/gmyth_scheduler.c Tue Jan 30 20:52:35 2007 +0000 +++ b/gmyth/src/gmyth_scheduler.c Tue Jan 30 21:25:36 2007 +0000 @@ -519,15 +519,10 @@ proginfo = gmyth_program_info_new(); proginfo->chanid = g_string_new (msql_row[0]); - printf ("xxxxxx %s %d\n", __FUNCTION__, __LINE__); proginfo->startts = gmyth_util_string_to_time_val (msql_row[23]); - printf ("xxxxxx %s %d\n", __FUNCTION__, __LINE__); proginfo->endts = gmyth_util_string_to_time_val (msql_row[24]); - printf ("xxxxxx %s %d\n", __FUNCTION__, __LINE__); proginfo->recstartts = gmyth_util_string_to_time_val (msql_row[1]); - printf ("xxxxxx %s %d\n", __FUNCTION__, __LINE__); proginfo->recendts = gmyth_util_string_to_time_val (msql_row[2]); - printf ("xxxxxx %s %d\n", __FUNCTION__, __LINE__); proginfo->title = g_string_new (msql_row[3]); proginfo->subtitle = g_string_new (msql_row[4]); proginfo->description = g_string_new (msql_row[5]); @@ -541,7 +536,6 @@ proginfo->programid = g_string_new (msql_row[12]); proginfo->filesize = g_ascii_strtoull (msql_row[13], NULL, 10); - printf ("xxxxxx %s %d\n", __FUNCTION__, __LINE__); proginfo->lastmodified = gmyth_util_string_to_time_val (msql_row[14]); proginfo->stars = g_ascii_strtod (msql_row[15], NULL); @@ -551,7 +545,6 @@ proginfo->originalAirDate = 0; proginfo->hasAirDate = FALSE; } else { - printf ("xxxxxx %s %d\n", __FUNCTION__, __LINE__); proginfo->originalAirDate = gmyth_util_string_to_time_val (msql_row[17]); proginfo->hasAirDate = TRUE; }