[PATCH xgi] Fix warning: control reaches end of non-void function.

Jeremy Huddleston jeremyhu at apple.com
Fri Jan 13 13:44:06 PST 2012


Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>

On Jan 13, 2012, at 13:18, Tormod Volden wrote:

> From: Johannes Obermayr <johannesobermayr at gmx.de>
> 
> [Tormod: Remove unnecessary else and fix spelling in messages]
> Signed-off-by: Tormod Volden <debian.tormod at gmail.com>
> ---
> 
> How about this then? For consistency do the same to other functions.
> 
> Fixed up some glaring spelling mistakes while I was in there, ugh.
> 
> src/vb_i2c.c |   20 +++++++++++---------
> 1 files changed, 11 insertions(+), 9 deletions(-)
> 
> diff --git a/src/vb_i2c.c b/src/vb_i2c.c
> index 96e26e3..56ad52e 100755
> --- a/src/vb_i2c.c
> +++ b/src/vb_i2c.c
> @@ -1606,8 +1606,8 @@ VOID vWriteClockLine(PXGI_HW_DEVICE_INFO pHWDE, UCHAR data)
> 		vWriteClockLineDVI(pHWDE, data);
> 	else if(pHWDE->crtno == 2)
> 		vWriteClockLineFCNT(pHWDE, data);
> -	else
> -		ErrorF("Error(XGI) : Unkonwn output device! \n");
> +
> +	ErrorF("Error(XGI) : Unknown output device!\n");
> }
> 
> VOID vWriteDataLine(PXGI_HW_DEVICE_INFO pHWDE, UCHAR data)
> @@ -1618,8 +1618,8 @@ VOID vWriteDataLine(PXGI_HW_DEVICE_INFO pHWDE, UCHAR data)
> 	   vWriteDataLineDVI(pHWDE, data);
> 	else if(pHWDE->crtno == 2)
> 		vWriteDataLineFCNT(pHWDE, data);
> -	else
> -		ErrorF("Error(XGI) : Unkonwn output device! \n");
> +
> +	ErrorF("Error(XGI) : Unknown output device! \n");
> }
> 
> BOOLEAN bReadClockLine(PXGI_HW_DEVICE_INFO pHWDE)
> @@ -1630,8 +1630,9 @@ BOOLEAN bReadClockLine(PXGI_HW_DEVICE_INFO pHWDE)
> 		return(bReadClockLineDVI(pHWDE));
> 	else if(pHWDE->crtno == 2)
> 		return(bReadClockLineFCNT(pHWDE));
> -	else
> -		ErrorF("Error(XGI) : Unkonwn output device! \n");
> +
> +	ErrorF("Error(XGI) : Unknown output device!\n");
> +	return FALSE;
> }
> 
> BOOLEAN bReadDataLine(PXGI_HW_DEVICE_INFO pHWDE)
> @@ -1642,8 +1643,9 @@ BOOLEAN bReadDataLine(PXGI_HW_DEVICE_INFO pHWDE)
> 		return(bReadDataLineDVI(pHWDE));
> 	else if(pHWDE->crtno == 2)
> 		return(bReadDataLineFCNT(pHWDE));
> -	else
> -		ErrorF("Error(XGI) : Unkonwn output device! \n");
> +
> +	ErrorF("Error(XGI) : Unknown output device!\n");
> +	return FALSE;
> }
> 
> BOOLEAN bEDIDCheckSum(PUCHAR  pjEDIDBuf,ULONG   ulBufSize)
> @@ -1890,4 +1892,4 @@ BOOLEAN bGetEDID(
> 
>    PDEBUGI2C(ErrorF("bGetEDID()-return(%d)\n", status == NO_ERROR ? 1:0));
>     return (status == NO_ERROR);
> -}
> \ No newline at end of file
> +}
> -- 
> 1.7.8.3
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
> 



More information about the xorg-devel mailing list