[MPlayer-cvslog] r32480 - in trunk: codec-cfg.c libmpdemux/demux_viv.c loader/dshow/DS_VideoDecoder.c loader/ext.c loader/pe_image.c loader/vfl.c loader/win32.c stream/stream_radio.c vidix/s3_vid.c
diego
subversion at mplayerhq.hu
Mon Oct 11 14:33:57 CEST 2010
Author: diego
Date: Mon Oct 11 14:33:57 2010
New Revision: 32480
Log:
Remove #warning preprocessor directives or replace them by suitable comments.
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.
Modified:
trunk/codec-cfg.c
trunk/libmpdemux/demux_viv.c
trunk/loader/dshow/DS_VideoDecoder.c
trunk/loader/ext.c
trunk/loader/pe_image.c
trunk/loader/vfl.c
trunk/loader/win32.c
trunk/stream/stream_radio.c
trunk/vidix/s3_vid.c
Modified: trunk/codec-cfg.c
==============================================================================
--- trunk/codec-cfg.c Sun Oct 10 13:20:57 2010 (r32479)
+++ trunk/codec-cfg.c Mon Oct 11 14:33:57 2010 (r32480)
@@ -391,14 +391,14 @@ static int validate_codec(codecs_t *c, i
}
#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_msg(MSGT_CODECCFG,MSGL_ERR,MSGTR_CodecNeedsDLL, 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)
Modified: trunk/libmpdemux/demux_viv.c
==============================================================================
--- trunk/libmpdemux/demux_viv.c Sun Oct 10 13:20:57 2010 (r32479)
+++ trunk/libmpdemux/demux_viv.c Mon Oct 11 14:33:57 2010 (r32480)
@@ -324,7 +324,7 @@ static int demux_vivo_fill_buffer(demuxe
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",
Modified: trunk/loader/dshow/DS_VideoDecoder.c
==============================================================================
--- trunk/loader/dshow/DS_VideoDecoder.c Sun Oct 10 13:20:57 2010 (r32479)
+++ trunk/loader/dshow/DS_VideoDecoder.c Mon Oct 11 14:33:57 2010 (r32480)
@@ -687,7 +687,7 @@ int DS_VideoDecoder_GetValue(DS_VideoDec
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_VideoDec
Debug printf("No such interface\n");
return -1;
}
-#warning FIXME
+ // FIXME
int recordpar[30];
recordpar[0]=0x7c;
recordpar[1]=fccIV50;
Modified: trunk/loader/ext.c
==============================================================================
--- trunk/loader/ext.c Sun Oct 10 13:20:57 2010 (r32479)
+++ trunk/loader/ext.c Mon Oct 11 14:33:57 2010 (r32480)
@@ -473,7 +473,7 @@ LPVOID WINAPI VirtualAlloc(LPVOID addres
}
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))
Modified: trunk/loader/pe_image.c
==============================================================================
--- trunk/loader/pe_image.c Sun Oct 10 13:20:57 2010 (r32479)
+++ trunk/loader/pe_image.c Mon Oct 11 14:33:57 2010 (r32480)
@@ -292,7 +292,7 @@ static DWORD fixup_imports( WINE_MODREF
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
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)
Modified: trunk/loader/vfl.c
==============================================================================
--- trunk/loader/vfl.c Sun Oct 10 13:20:57 2010 (r32479)
+++ trunk/loader/vfl.c Mon Oct 11 14:33:57 2010 (r32480)
@@ -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;
}
Modified: trunk/loader/win32.c
==============================================================================
--- trunk/loader/win32.c Sun Oct 10 13:20:57 2010 (r32479)
+++ trunk/loader/win32.c Mon Oct 11 14:33:57 2010 (r32480)
@@ -1735,7 +1735,7 @@ static int WINAPI expLoadStringA(long in
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(i
}
static int WINAPI expGetCurrentThread(void)
{
-#warning FIXME!
+ /* FIXME! */
dbgprintf("GetCurrentThread() => %x\n", 0xcfcf9898);
return 0xcfcf9898;
}
Modified: trunk/stream/stream_radio.c
==============================================================================
--- trunk/stream/stream_radio.c Sun Oct 10 13:20:57 2010 (r32479)
+++ trunk/stream/stream_radio.c Mon Oct 11 14:33:57 2010 (r32480)
@@ -51,7 +51,6 @@
#ifdef CONFIG_RADIO_V4L
#include <linux/videodev.h>
-#warning "V4L is deprecated and will be removed in future"
#endif
#endif // !IOCTL_BT848_H_NAME
Modified: trunk/vidix/s3_vid.c
==============================================================================
--- trunk/vidix/s3_vid.c Sun Oct 10 13:20:57 2010 (r32479)
+++ trunk/vidix/s3_vid.c Mon Oct 11 14:33:57 2010 (r32480)
@@ -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));
More information about the MPlayer-cvslog
mailing list