Index: libs/libmyth/util.cpp =================================================================== RCS file: /var/lib/mythcvs/mythtv/libs/libmyth/util.cpp,v retrieving revision 1.34 diff -u -r1.34 util.cpp --- libs/libmyth/util.cpp 25 Jun 2004 23:31:57 -0000 1.34 +++ libs/libmyth/util.cpp 8 Jul 2004 20:41:07 -0000 @@ -648,3 +648,20 @@ return text; } +long long stringToLongLong(const QString &str) +{ + long long retval = 0; + if (str != QString::null) + { + retval = strtoll(str.ascii(), NULL, 0); + } + return retval; +} + +QString longLongToString(long long ll) +{ + char str[21]; + snprintf(str, 20, "%lld", ll); + str[20] = '\0'; + return str; +} Index: libs/libmyth/util.h =================================================================== RCS file: /var/lib/mythcvs/mythtv/libs/libmyth/util.h,v retrieving revision 1.14 diff -u -r1.14 util.h --- libs/libmyth/util.h 21 Jun 2004 20:30:58 -0000 1.14 +++ libs/libmyth/util.h 8 Jul 2004 20:41:07 -0000 @@ -43,4 +43,6 @@ QString cutDownString(QString text, QFont *testFont, int maxwidth); +long long stringToLongLong(const QString &str); +QString longLongToString(long long ll); #endif Index: libs/libmythtv/programinfo.cpp =================================================================== RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/programinfo.cpp,v retrieving revision 1.146 diff -u -r1.146 programinfo.cpp --- libs/libmythtv/programinfo.cpp 6 Jul 2004 04:44:36 -0000 1.146 +++ libs/libmythtv/programinfo.cpp 8 Jul 2004 20:41:07 -0000 @@ -352,8 +352,7 @@ tmpSize += QObject::tr("GB", "GigaBytes"); progMap["filesize_str"] = tmpSize; - tmpSize.sprintf("%lld", filesize); - progMap["filesize"] = tmpSize; + progMap["filesize"] = longLongToString(filesize); seconds = recstartts.secsTo(recendts); minutes = seconds / 60; @@ -491,7 +490,7 @@ proginfo->chanOutputFilters = query.value(10).toString(); proginfo->seriesid = query.value(11).toString(); proginfo->programid = query.value(12).toString(); - proginfo->filesize = query.value(13).toInt(); + proginfo->filesize = stringToLongLong(query.value(13).toString()); proginfo->lastmodified = QDateTime::fromString(query.value(14).toString(), Qt::ISODate); @@ -892,10 +891,8 @@ { MythContext::KickDatabase(db); - char size[21]; - filesize = fsize; - sprintf(size, "%lld", filesize); + QString size(longLongToString(filesize)); QString starts = recstartts.toString("yyyyMMddhhmm"); starts += "00"; @@ -931,11 +928,7 @@ { query.next(); - QString result = query.value(0).toString(); - if (result != QString::null) - { - sscanf(result.ascii(), "%lld", &size); - } + size = stringToLongLong(query.value(0).toString()); } filesize = size; Index: programs/mythbackend/mainserver.cpp =================================================================== RCS file: /var/lib/mythcvs/mythtv/programs/mythbackend/mainserver.cpp,v retrieving revision 1.150 diff -u -r1.150 mainserver.cpp --- programs/mythbackend/mainserver.cpp 6 Jul 2004 04:44:36 -0000 1.150 +++ programs/mythbackend/mainserver.cpp 8 Jul 2004 20:41:11 -0000 @@ -722,7 +722,7 @@ proginfo->chanOutputFilters = query.value(20).toString(); proginfo->seriesid = query.value(21).toString(); proginfo->programid = query.value(22).toString(); - proginfo->filesize = query.value(23).toInt(); + proginfo->filesize = stringToLongLong(query.value(23).toString()); proginfo->lastmodified = QDateTime::fromString(query.value(24).toString(), Qt::ISODate);