From 7ec342c9a9fe6d4ca3a4cc8e3202ac083cba2521 Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Sat, 14 Jun 2008 19:31:04 +0000 Subject: [PATCH] Some warning improvements. Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3171 --- src/ints/int10_char.cpp | 4 ++-- src/ints/int10_put_pixel.cpp | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/ints/int10_char.cpp b/src/ints/int10_char.cpp index 728fd04d..64d7b8be 100644 --- a/src/ints/int10_char.cpp +++ b/src/ints/int10_char.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: int10_char.cpp,v 1.53 2008-03-13 19:53:23 c2woody Exp $ */ +/* $Id: int10_char.cpp,v 1.54 2008-06-14 19:31:04 qbix79 Exp $ */ /* Character displaying moving functions */ @@ -475,7 +475,7 @@ void WriteChar(Bit16u col,Bit16u row,Bit8u page,Bit8u chr,Bit8u attr,bool useatt if(GCC_UNLIKELY(!useattr)) { //Set attribute(color) to a sensible value static bool warned_use = false; if(GCC_UNLIKELY(!warned_use)){ - LOG(LOG_INT10,LOG_ERROR)("writechar used without attribute in non-textmode"); + LOG(LOG_INT10,LOG_ERROR)("writechar used without attribute in non-textmode %c %X",chr,chr); warned_use = true; } switch(CurMode->type) { diff --git a/src/ints/int10_put_pixel.cpp b/src/ints/int10_put_pixel.cpp index d0c87c0e..9770c4c7 100644 --- a/src/ints/int10_put_pixel.cpp +++ b/src/ints/int10_put_pixel.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: int10_put_pixel.cpp,v 1.20 2008-03-13 19:53:23 c2woody Exp $ */ +/* $Id: int10_put_pixel.cpp,v 1.21 2008-06-14 19:31:04 qbix79 Exp $ */ #include "dosbox.h" #include "mem.h" @@ -25,7 +25,9 @@ static Bit8u cga_masks[4]={0x3f,0xcf,0xf3,0xfc}; static Bit8u cga_masks2[8]={0x7f,0xbf,0xdf,0xef,0xf7,0xfb,0xfd,0xfe}; + void INT10_PutPixel(Bit16u x,Bit16u y,Bit8u page,Bit8u color) { + static bool putpixelwarned = false; switch (CurMode->type) { case M_CGA4: @@ -132,7 +134,10 @@ void INT10_PutPixel(Bit16u x,Bit16u y,Bit8u page,Bit8u color) { break; } default: - LOG(LOG_INT10,LOG_ERROR)("PutPixel unhandled mode type %d",CurMode->type); + if(GCC_UNLIKELY(!putpixelwarned)) { + putpixelwarned = true; + LOG(LOG_INT10,LOG_ERROR)("PutPixel unhandled mode type %d",CurMode->type); + } break; } }