From 1ca3263b1febbef86071eaaa4e8eda0bbac578fa Mon Sep 17 00:00:00 2001 From: Christian Wieninger Date: Wed, 20 Feb 2008 17:47:50 +0100 Subject: replaced asprintf with cString::sprintf and a wrapper function --- menu_switchtimers.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'menu_switchtimers.c') diff --git a/menu_switchtimers.c b/menu_switchtimers.c index e3c7e3e..25164d3 100644 --- a/menu_switchtimers.c +++ b/menu_switchtimers.c @@ -54,10 +54,9 @@ void cMenuEditSwitchTimer::Set() Clear(); Add(new cMenuEditIntItem(tr("Switch ... minutes before start"), &data.switchMinsBefore, 0, 99)); - char* info = NULL; - asprintf(&info, "%s:\t%s", tr("action at"), TIMESTRING(data.event->StartTime() - 60 * data.switchMinsBefore)); + cString info = cString::sprintf("%s:\t%s", tr("action at"), + TIMESTRING(data.event->StartTime() - 60 * data.switchMinsBefore)); cOsdItem* pInfoItem = new cOsdItem(info); - free(info); pInfoItem->SetSelectable(false); Add(pInfoItem); Add(new cMenuEditBoolItem(tr("Announce only"), &data.announceOnly, trVDR("no"), trVDR("yes"))); @@ -123,7 +122,7 @@ void cMenuSwitchTimerItem::Set(void) cChannel* channel = Channels.GetByChannelID(event->ChannelID(),true,true); - asprintf(&buffer, "%s\t%d\t%s\t%s\t%d\'\t%s~%s", switchTimer->announceOnly?"":">", channel?channel->Number():-1, datebuf, TIMESTRING(startTime), switchTimer->switchMinsBefore, event->Title()?event->Title():"", event->ShortText()?event->ShortText():""); + msprintf(&buffer, "%s\t%d\t%s\t%s\t%d\'\t%s~%s", switchTimer->announceOnly?"":">", channel?channel->Number():-1, datebuf, TIMESTRING(startTime), switchTimer->switchMinsBefore, event->Title()?event->Title():"", event->ShortText()?event->ShortText():""); SetText(buffer, false); } -- cgit v1.2.3