From a0a3ca70676878b391a7e6b2d9642b182e75e488 Mon Sep 17 00:00:00 2001 From: seife Date: Sun, 28 Nov 2010 22:01:01 +0000 Subject: [PATCH] - use proper pointer format specifier (int does not work on 64 bit systems) git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@913 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/driver/netfile.cpp | 32 ++++++++++++++++---------------- src/gui/channellist.cpp | 6 +++--- src/neutrino.cpp | 4 ++-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/driver/netfile.cpp b/src/driver/netfile.cpp index 81d888128..1c7e86ce9 100644 --- a/src/driver/netfile.cpp +++ b/src/driver/netfile.cpp @@ -899,7 +899,7 @@ FILE *f_open(const char *filename, const char *acctype) return NULL; } - dprintf(stderr, "f_open: adding stream %x to cache[%d]\n", (int) fd, i); + dprintf(stderr, "f_open: adding stream %p to cache[%d]\n", fd, i); cache[i].fd = fd; cache[i].csize = CACHESIZE; @@ -1153,7 +1153,7 @@ int f_close(FILE *stream) if(cache[i].fd == stream) { - dprintf(stderr, "f_close: removing stream %x from cache[%d]\n", (int)stream, i); + dprintf(stderr, "f_close: removing stream %p from cache[%d]\n", stream, i); cache[i].closed = 1; /* indicate that the cache is closed */ @@ -1286,7 +1286,7 @@ char *f_type(FILE *stream, char *type) /* if the stream could not be found, look for a free slot ... */ if(i == CACHEENTMAX) { - dprintf(stderr, "stream %x not in type table, ", (int) stream); + dprintf(stderr, "stream %p not in type table, ", stream); for(i=0 ; (iclosed) return; - dprintf(stderr, "CacheFillThread: thread started, using stream %8x\n", (int) scache->fd); + dprintf(stderr, "CacheFillThread: thread started, using stream %p\n", scache->fd); buf = (char*)malloc(CACHEBTRANS); @@ -1648,7 +1648,7 @@ void CacheFillThread(void *c) pthread_mutex_unlock( &scache->readable ); /* ... and exit this thread. */ - dprintf(stderr, "CacheFillThread: thread exited, stream %8x \n", (int) scache->fd); + dprintf(stderr, "CacheFillThread: thread exited, stream %p \n", scache->fd); free(buf); pthread_exit(0); @@ -1700,7 +1700,7 @@ void ShoutCAST_ParseMetaData(char *md, CSTATE *state) if((!md) || (!state)) return; - dprintf(stderr, "ShoutCAST_ParseMetaData(%x : %s, %x)\n", (int) md, md, (int) state); + dprintf(stderr, "ShoutCAST_ParseMetaData(%p : %s, %p)\n", md, md, state); ptr = strstr(md, "StreamTitle="); diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index fe242a4e3..63c58e3b1 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -928,7 +928,7 @@ bool CChannelList::adjustToChannelID(const t_channel_id channel_id, bool bToo) unsigned int i; selected_chid = channel_id; -printf("CChannelList::adjustToChannelID me %x [%s] list size %d channel_id %llx\n", (int) this, getName(), chanlist.size(), channel_id);fflush(stdout); +printf("CChannelList::adjustToChannelID me %p [%s] list size %d channel_id %llx\n", this, getName(), chanlist.size(), channel_id);fflush(stdout); for (i = 0; i < chanlist.size(); i++) { if(chanlist[i] == NULL) { printf("CChannelList::adjustToChannelID REPORT BUG !! ******************************** %d is NULL !!\n", i); @@ -1039,7 +1039,7 @@ void CChannelList::zapTo(int pos, bool /* forceStoreToLastChannels */) } CZapitChannel* chan = chanlist[pos]; -printf("**************************** CChannelList::zapTo me %x %s tuned %d new %d %s -> %llx\n", (int) this, name.c_str(), tuned, pos, chan->name.c_str(), chan->channel_id); +printf("**************************** CChannelList::zapTo me %p %s tuned %d new %d %s -> %llx\n", this, name.c_str(), tuned, pos, chan->name.c_str(), chan->channel_id); if ( pos!=(int)tuned ) { tuned = pos; g_RemoteControl->zapTo_ChannelID(chan->channel_id, chan->name, !chan->bAlwaysLocked); // UTF-8 @@ -1073,7 +1073,7 @@ void CChannelList::NewZap(t_channel_id channel_id) return; CZapitChannel* chan = &it->second; -printf("**************************** CChannelList::NewZap me %x %s tuned %d new %s -> %llx\n", (int) this, name.c_str(), tuned, chan->name.c_str(), chan->channel_id); +printf("**************************** CChannelList::NewZap me %p %s tuned %d new %s -> %llx\n", this, name.c_str(), tuned, chan->name.c_str(), chan->channel_id); if(selected_chid != chan->channel_id) { selected_chid = chan->channel_id; diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 24c24cc80..b9364e192 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2797,7 +2797,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) int old_b = bouquetList->getActiveBouquetNumber(); //int old_mode = g_settings.channel_mode; int old_mode = GetChannelMode(); - printf("************************* ZAP START: bouquetList %x size %d old_b %d\n", (int) bouquetList, bouquetList->Bouquets.size(), old_b);fflush(stdout); + printf("************************* ZAP START: bouquetList %p size %d old_b %d\n", bouquetList, bouquetList->Bouquets.size(), old_b);fflush(stdout); if(bouquetList->Bouquets.size()) { old_num = bouquetList->Bouquets[old_b]->channelList->getActiveChannelNumber(); @@ -2827,7 +2827,7 @@ _repeat: StartSubtitles(); } else if(nNewChannel == -3) { // list mode changed - printf("************************* ZAP NEW MODE: bouquetList %x size %d\n", (int) bouquetList, bouquetList->Bouquets.size());fflush(stdout); + printf("************************* ZAP NEW MODE: bouquetList %p size %d\n", bouquetList, bouquetList->Bouquets.size());fflush(stdout); nNewChannel = bouquetList->exec(true); goto _repeat; }