# HG changeset patch # User rosfran # Date 1163794058 0 # Node ID 28041df0da6e152d0e2efb4fc0fa5c1b00733596 # Parent 51d01302867466c1209c9d1a77a10242abf43cb1 [svn r97] Fixed problems on converting string to double and int values. diff -r 51d013028674 -r 28041df0da6e gmyth/src/gmyth_file_transfer.c --- a/gmyth/src/gmyth_file_transfer.c Fri Nov 17 18:39:47 2006 +0000 +++ b/gmyth/src/gmyth_file_transfer.c Fri Nov 17 20:07:38 2006 +0000 @@ -870,7 +870,7 @@ g_io_channel_flush( io_channel_control, NULL ); - g_static_mutex_lock( &mutex ); + //g_static_mutex_lock( &mutex ); io_cond = g_io_channel_get_buffer_condition( io_channel ); @@ -920,6 +920,7 @@ { g_print( "[%s]\t\tsent %d, which is NOT equals to requested size = %d\n\n", __FUNCTION__, sent, remaining ); + remaining = sent; break; } @@ -1013,7 +1014,7 @@ } cleanup: - g_static_mutex_unlock (&mutex); + //g_static_mutex_unlock (&mutex); //g_io_channel_flush( io_channel_control, NULL ); if ( trash != NULL ) diff -r 51d013028674 -r 28041df0da6e gmyth/src/gmyth_scheduler.c --- a/gmyth/src/gmyth_scheduler.c Fri Nov 17 18:39:47 2006 +0000 +++ b/gmyth/src/gmyth_scheduler.c Fri Nov 17 20:07:38 2006 +0000 @@ -198,9 +198,9 @@ while((row = mysql_fetch_row (msql_res)) != NULL) { schedule = g_new0(ScheduleInfo, 1); - schedule->record_id = atoi (row[0]); - schedule->program_id = atoi (row[1]); - schedule->channel_id = atoi (row[2]); + schedule->record_id = g_ascii_strtoull (row[0], NULL, 10); + schedule->program_id = g_ascii_strtoull (row[1], NULL, 10); + schedule->channel_id = g_ascii_strtoull (row[2], NULL, 10); /* generate a time_t from a time and a date db field */ g_string_printf (date_time, "%s %s", row[4], row[3]); @@ -265,9 +265,9 @@ while((row = mysql_fetch_row (msql_res))!=NULL){ record = g_new0(RecordedInfo, 1); - record->record_id = atoi (row[0]); - record->program_id = atoi (row[1]); - record->channel_id = atoi (row[2]); + record->record_id = g_ascii_strtoull (row[0], NULL, 10); + record->program_id = g_ascii_strtoull (row[1], NULL, 10); + record->channel_id = g_ascii_strtoull (row[2], NULL, 10); /* the db field time already contains the date. therefore * we are not using the date field */ @@ -525,16 +525,16 @@ proginfo->chanstr = g_string_new (msql_row[6]); proginfo->chansign = g_string_new (msql_row[7]); proginfo->channame = g_string_new (msql_row[0]); - proginfo->chancommfree = atoi (msql_row[9]); + proginfo->chancommfree = g_ascii_strtoull (msql_row[9], NULL, 10); proginfo->chanOutputFilters = g_string_new (msql_row[10]); proginfo->seriesid = g_string_new (msql_row[11]); proginfo->programid = g_string_new (msql_row[12]); - proginfo->filesize = atoll (msql_row[13]); + proginfo->filesize = g_ascii_strtoull (msql_row[13], NULL, 10); proginfo->lastmodified = gmyth_util_string_to_time (g_string_new (msql_row[14])); - proginfo->stars = atof (msql_row[15]); - proginfo->repeat = atoi (msql_row[16]); + proginfo->stars = g_ascii_strtod (msql_row[15], NULL); + proginfo->repeat = g_ascii_strtoull (msql_row[16], NULL, 10); if (msql_row[17] == NULL) { proginfo->originalAirDate = 0; @@ -545,15 +545,15 @@ } proginfo->hostname = g_string_new (msql_row[18]); - proginfo->recordid = atoi (msql_row[19]); - proginfo->transcoder = atoi (msql_row[20]); + proginfo->recordid = g_ascii_strtoull (msql_row[19], NULL, 10); + proginfo->transcoder = g_ascii_strtoull (msql_row[20], NULL, 10); //proginfo->spread = -1; //proginfo->programflags = proginfo->getProgramFlags(); proginfo->recgroup = g_string_new (msql_row[26]); proginfo->playgroup = g_string_new (msql_row[21]); - proginfo->recpriority = atoi (msql_row[22]); + proginfo->recpriority = g_ascii_strtoull (msql_row[22], NULL, 10); proginfo->pathname = g_string_new (msql_row[25]);