[MPlayer-cvslog] r32908 - trunk/gui/skin/font.c
ib
subversion at mplayerhq.hu
Wed Feb 16 16:43:47 CET 2011
Author: ib
Date: Wed Feb 16 16:43:47 2011
New Revision: 32908
Log:
Simplify condition.
Modified:
trunk/gui/skin/font.c
Modified: trunk/gui/skin/font.c
==============================================================================
--- trunk/gui/skin/font.c Wed Feb 16 16:24:08 2011 (r32907)
+++ trunk/gui/skin/font.c Wed Feb 16 16:43:47 2011 (r32908)
@@ -87,10 +87,7 @@ int fntRead( char * path,char * fname )
tmp[strcspn(tmp, "\n\r")] = 0;
strswap( tmp,'\t',' ' );
trim( tmp );
- if ((ptmp = strchr(tmp, ';')))
- {
- if (ptmp != tmp + 1 || tmp[0] != '"' || tmp[2] != '"') *ptmp = '\0';
- }
+ if ((ptmp = strchr(tmp, ';')) && !(ptmp == tmp + 1 && tmp[0] == '"' && tmp[2] == '"')) *ptmp = '\0';
if (!*tmp) continue;
n = (strncmp(tmp, "\"=", 2) == 0 ? 1 : 0);
cutItem( tmp,command,'=',n ); cutItem( tmp,param,'=',n+1 );
More information about the MPlayer-cvslog
mailing list