From ed8e92afccc1123340c31cffed3dd403408ef032 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 11 Oct 2010 12:33:57 +0000 Subject: Remove #warning preprocessor directives The #warning preprocessor directive is non-standard and not available with all compilers. Furthermore, the warnings it causes are noisy and have not led to getting any of the underlying issues fixed in the space of a decade. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32480 b3059339-0415-0410-9bf9-f77b7e298cf2 --- codec-cfg.c | 6 +++--- libmpdemux/demux_viv.c | 2 +- loader/dshow/DS_VideoDecoder.c | 4 ++-- loader/ext.c | 2 +- loader/pe_image.c | 4 ++-- loader/vfl.c | 2 +- loader/win32.c | 4 ++-- stream/stream_radio.c | 1 - vidix/s3_vid.c | 2 +- 9 files changed, 13 insertions(+), 14 deletions(-) diff --git a/codec-cfg.c b/codec-cfg.c index effc775d4c..ced013386a 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -393,14 +393,14 @@ static int validate_codec(codecs_t *c, int type) } #if 0 -#warning codec->driver == 4;... <- this should not be put in here... -#warning Where are they defined ???????????? +//FIXME: codec->driver == 4;... <- this should not be put in here... +//FIXME: Where are they defined ???????????? if (!c->dll && (c->driver == 4 || (c->driver == 2 && type == TYPE_VIDEO))) { mp_tmsg(MSGT_CODECCFG,MSGL_ERR,"\ncodec(%s) needs a 'dll'!\n", c->name); return 0; } -#warning Can guid.f1 be 0? How does one know that it was not given? +// FIXME: Can guid.f1 be 0? How does one know that it was not given? // if (!(codec->flags & CODECS_FLAG_AUDIO) && codec->driver == 4) if (type == TYPE_VIDEO) diff --git a/libmpdemux/demux_viv.c b/libmpdemux/demux_viv.c index 1d9999940f..c416aa1535 100644 --- a/libmpdemux/demux_viv.c +++ b/libmpdemux/demux_viv.c @@ -322,7 +322,7 @@ static int demux_vivo_fill_buffer(demuxer_t *demux, demux_stream_t *dsds){ if (c == 0x82) { /* ok, this works, but pts calculating from header is required! */ -#warning "Calculate PTS from picture header!" + /* FIXME: "Calculate PTS from picture header!" */ prefix = 1; c = stream_read_char(demux->stream); mp_msg(MSGT_DEMUX, MSGL_V, "packet 0x82(pos=%u) chunk=%x\n", diff --git a/loader/dshow/DS_VideoDecoder.c b/loader/dshow/DS_VideoDecoder.c index f4e72917f0..8af025b475 100644 --- a/loader/dshow/DS_VideoDecoder.c +++ b/loader/dshow/DS_VideoDecoder.c @@ -687,7 +687,7 @@ int DS_VideoDecoder_GetValue(DS_VideoDecoder *this, const char* name, int* value IHidden* hidden=(IHidden*)((int)m_pDS_Filter->m_pFilter+0xb8); if (strcmp(name, "Quality") == 0) { -#warning NOT SURE + // NOT SURE int r = hidden->vt->GetSmth2(hidden, &value); if (value >= 10) value -= 10; @@ -715,7 +715,7 @@ int DS_VideoDecoder_GetValue(DS_VideoDecoder *this, const char* name, int* value Debug printf("No such interface\n"); return -1; } -#warning FIXME + // FIXME int recordpar[30]; recordpar[0]=0x7c; recordpar[1]=fccIV50; diff --git a/loader/ext.c b/loader/ext.c index 9c00d1988b..26b6a5a3c3 100644 --- a/loader/ext.c +++ b/loader/ext.c @@ -473,7 +473,7 @@ LPVOID WINAPI VirtualAlloc(LPVOID address, DWORD size, DWORD type, DWORD protec } if(str->state==0) { -#warning FIXME + // FIXME if( ((unsigned)address >= (unsigned)str->address) && ((unsigned)address+size<=(unsigned)str->address+str->mapping_size) && (type & MEM_COMMIT)) diff --git a/loader/pe_image.c b/loader/pe_image.c index b4bdba90c8..b13dfd0130 100644 --- a/loader/pe_image.c +++ b/loader/pe_image.c @@ -292,7 +292,7 @@ static DWORD fixup_imports( WINE_MODREF *wm ) if (characteristics_detection && !pe_imp->u.Characteristics) break; -//#warning FIXME: here we should fill imports + /* FIXME: here we should fill imports */ TRACE("Loading imports for %s.dll\n", name); if (pe_imp->u.OriginalFirstThunk != 0) { @@ -452,7 +452,7 @@ HMODULE PE_LoadImage( int handle, LPCSTR filename, WORD *version ) file_size=lseek(handle, 0, SEEK_END); lseek(handle, 0, SEEK_SET); -//#warning fix CreateFileMappingA + // fix CreateFileMappingA mapping = CreateFileMappingA( handle, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL ); if (!mapping) diff --git a/loader/vfl.c b/loader/vfl.c index e5d0445b92..7a3f4cdbcd 100644 --- a/loader/vfl.c +++ b/loader/vfl.c @@ -218,7 +218,7 @@ LRESULT VFWAPI ICClose(HIC hic) { /* FIXME: correct? */ // CloseDriver(whic->hdrv,0,0); DrvClose(whic->hdrv); -//#warning FIXME: DrvClose + /* FIXME: DrvClose */ free(whic); return 0; } diff --git a/loader/win32.c b/loader/win32.c index 1f717c9020..50ca797e8d 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -1735,7 +1735,7 @@ static int WINAPI expLoadStringA(long instance, long id, void* buf, long size) static long WINAPI expMultiByteToWideChar(long v1, long v2, char* s1, long siz1, short* s2, int siz2) { -#warning FIXME + /* FIXME */ int i; int result; if(s2==0) @@ -3190,7 +3190,7 @@ static int WINAPI expGetProcessVersion(int pid) } static int WINAPI expGetCurrentThread(void) { -#warning FIXME! + /* FIXME! */ dbgprintf("GetCurrentThread() => %x\n", 0xcfcf9898); return 0xcfcf9898; } diff --git a/stream/stream_radio.c b/stream/stream_radio.c index 7e53ccf38a..bfa0f18d0b 100644 --- a/stream/stream_radio.c +++ b/stream/stream_radio.c @@ -51,7 +51,6 @@ #ifdef CONFIG_RADIO_V4L #include -#warning "V4L is deprecated and will be removed in future" #endif #endif // !IOCTL_BT848_H_NAME diff --git a/vidix/s3_vid.c b/vidix/s3_vid.c index d6972e5855..70a225b872 100644 --- a/vidix/s3_vid.c +++ b/vidix/s3_vid.c @@ -385,7 +385,7 @@ static void S3InitStreamsOld (void) format = 7 << 24; break; } -//#warning enable this again + // FIXME: enable this again OUTREG (PSTREAM_FBSIZE_REG, info->screen_y * info->screen_x * (info->bpp >> 3)); OUTREG (PSTREAM_WINDOW_START_REG, OS_XY (0, 0)); OUTREG (PSTREAM_WINDOW_SIZE_REG, OS_WH (info->screen_x, info->screen_y)); -- cgit v1.2.3