mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 00:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- use proper pointer format specifier (int does not work on 64 bit systems)

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@913 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2010-11-28 22:01:01 +00:00
parent 435807a491
commit a0a3ca7067
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/driver/netfile.cpp
View File

@@ -899,7 +899,7 @@ FILE *f_open(const char *filename, const char *acctype)
return NULL; 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].fd = fd;
cache[i].csize = CACHESIZE; cache[i].csize = CACHESIZE;
@@ -1153,7 +1153,7 @@ int f_close(FILE *stream)
if(cache[i].fd == 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 */ 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 the stream could not be found, look for a free slot ... */
if(i == CACHEENTMAX) 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 ; (i<CACHEENTMAX) && (stream_type[i].stream != NULL); i++){}; for(i=0 ; (i<CACHEENTMAX) && (stream_type[i].stream != NULL); i++){};
@@ -1297,7 +1297,7 @@ char *f_type(FILE *stream, char *type)
{ {
stream_type[i].stream = stream; stream_type[i].stream = stream;
strncpy(stream_type[i].type, type, 64); strncpy(stream_type[i].type, type, 64);
dprintf(stderr, "added entry (%s) for %x\n", type, (int) stream); dprintf(stderr, "added entry (%s) for %p\n", type, stream);
} }
return type; return type;
} }
@@ -1309,7 +1309,7 @@ char *f_type(FILE *stream, char *type)
/* the stream is already in the table */ /* the stream is already in the table */
else else
{ {
dprintf(stderr, "stream %x lookup in type table succeded\n", (int) stream); dprintf(stderr, "stream %p lookup in type table succeded\n", stream);
if(!type) if(!type)
return stream_type[i].type; return stream_type[i].type;
@@ -1373,7 +1373,7 @@ int push(FILE *fd, char *buf, long len)
// dprintf(stderr, "push: %d bytes to store [filled: %d of %d], stream: %x\n", len, cache[i].filled, CACHESIZE, fd); // dprintf(stderr, "push: %d bytes to store [filled: %d of %d], stream: %x\n", len, cache[i].filled, CACHESIZE, fd);
if(cache[i].fd != fd) { if(cache[i].fd != fd) {
dprintf(stderr, "push: no cache present for stream %0x\n", (int) fd); dprintf(stderr, "push: no cache present for stream %p\n", fd);
return -1; return -1;
} }
do do
@@ -1452,7 +1452,7 @@ int push(FILE *fd, char *buf, long len)
} while(rval < len); } while(rval < len);
dprintf(stderr, "push: exitstate: [filled: %3.1f %%], stream: %x\r", 100.0 * (float)cache[i].filled / (float)cache[i].csize, (int) fd); dprintf(stderr, "push: exitstate: [filled: %3.1f %%], stream: %p\r", 100.0 * (float)cache[i].filled / (float)cache[i].csize, fd);
return rval; return rval;
} }
@@ -1467,8 +1467,8 @@ int pop(FILE *fd, char *buf, long len)
if(i < 0) if(i < 0)
return -1; return -1;
dprintf(stderr, "pop: %d bytes requested [filled: %d of %d], stream: %x buf 0x%x\n", dprintf(stderr, "pop: %d bytes requested [filled: %d of %d], stream: %p buf %p\n",
(int) len, (int) cache[i].filled, (int) CACHESIZE, (int)fd, (int) buf); (int) len, (int) cache[i].filled, (int) CACHESIZE, fd, buf);
if(cache[i].fd == fd) if(cache[i].fd == fd)
{ {
@@ -1522,8 +1522,8 @@ int pop(FILE *fd, char *buf, long len)
if(amt[j]) if(amt[j])
{ {
dprintf(stderr, "pop(): rptr: 0x%08x, buf: 0x%08x, amt[%d]=%d, blen=%d, len=%d, rval=%d\n", dprintf(stderr, "pop(): rptr: %p, buf: %p, amt[%d]=%d, blen=%d, len=%d, rval=%d\n",
(int) cache[i].rptr, (int) buf, j, amt[j], blen, (int) len, rval); cache[i].rptr, buf, j, amt[j], blen, (int) len, rval);
memmove(buf, cache[i].rptr, amt[j]); memmove(buf, cache[i].rptr, amt[j]);
@@ -1537,7 +1537,7 @@ int pop(FILE *fd, char *buf, long len)
} }
} }
dprintf(stderr, "pop: %d/%d/%d bytes read [filled: %d of %d], stream: %x\n", amt[0] + amt[1], rval, (int) len, (int) cache[i].filled, (int) CACHESIZE, (int) fd); dprintf(stderr, "pop: %d/%d/%d bytes read [filled: %d of %d], stream: %p\n", amt[0] + amt[1], rval, (int) len, (int) cache[i].filled, (int) CACHESIZE, fd);
/* if the cache is closed and empty, then */ /* if the cache is closed and empty, then */
/* force the end condition to be met */ /* force the end condition to be met */
@@ -1566,7 +1566,7 @@ int pop(FILE *fd, char *buf, long len)
} }
else else
{ {
dprintf(stderr, "pop: no cache present for stream %0x\n", (int) fd); dprintf(stderr, "pop: no cache present for stream %p\n", fd);
rval = -1; rval = -1;
} }
@@ -1590,7 +1590,7 @@ void CacheFillThread(void *c)
if(scache->closed) if(scache->closed)
return; 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); buf = (char*)malloc(CACHEBTRANS);
@@ -1648,7 +1648,7 @@ void CacheFillThread(void *c)
pthread_mutex_unlock( &scache->readable ); pthread_mutex_unlock( &scache->readable );
/* ... and exit this thread. */ /* ... 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); free(buf);
pthread_exit(0); pthread_exit(0);
@@ -1700,7 +1700,7 @@ void ShoutCAST_ParseMetaData(char *md, CSTATE *state)
if((!md) || (!state)) if((!md) || (!state))
return; 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="); ptr = strstr(md, "StreamTitle=");

6
src/gui/channellist.cpp
View File

@@ -928,7 +928,7 @@ bool CChannelList::adjustToChannelID(const t_channel_id channel_id, bool bToo)
unsigned int i; unsigned int i;
selected_chid = channel_id; 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++) { for (i = 0; i < chanlist.size(); i++) {
if(chanlist[i] == NULL) { if(chanlist[i] == NULL) {
printf("CChannelList::adjustToChannelID REPORT BUG !! ******************************** %d is NULL !!\n", i); 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]; 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 ) { if ( pos!=(int)tuned ) {
tuned = pos; tuned = pos;
g_RemoteControl->zapTo_ChannelID(chan->channel_id, chan->name, !chan->bAlwaysLocked); // UTF-8 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; return;
CZapitChannel* chan = &it->second; 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) { if(selected_chid != chan->channel_id) {
selected_chid = chan->channel_id; selected_chid = chan->channel_id;

4
src/neutrino.cpp
View File

@@ -2797,7 +2797,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
int old_b = bouquetList->getActiveBouquetNumber(); int old_b = bouquetList->getActiveBouquetNumber();
//int old_mode = g_settings.channel_mode; //int old_mode = g_settings.channel_mode;
int old_mode = GetChannelMode(); 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()) { if(bouquetList->Bouquets.size()) {
old_num = bouquetList->Bouquets[old_b]->channelList->getActiveChannelNumber(); old_num = bouquetList->Bouquets[old_b]->channelList->getActiveChannelNumber();
@@ -2827,7 +2827,7 @@ _repeat:
StartSubtitles(); StartSubtitles();
} }
else if(nNewChannel == -3) { // list mode changed 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); nNewChannel = bouquetList->exec(true);
goto _repeat; goto _repeat;
} }