izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid compiler warning on platforms where wchar_t is uint32_t (arm)

Browse Source
This commit is contained in:
Keith Winstein
2012-03-31 14:24:33 -04:00
parent 594acf4168
commit eea48e59d3
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/terminal/parser.cc
+8 -2
View File
@@ -20,6 +20,7 @@
#include <typeinfo> #include <typeinfo>
#include <errno.h> #include <errno.h>
#include <wchar.h> #include <wchar.h>
#include <stdint.h>
#include "parser.h" #include "parser.h"
@@ -121,11 +122,16 @@ std::list<Parser::Action *> Parser::UTF8Parser::input( char c )
throw std::string( "Unknown return value from mbrtowc" ); throw std::string( "Unknown return value from mbrtowc" );
} }
if ( (pwc < 0) || (pwc > 0x10FFFF) ) { /* outside Unicode range */ /* Cast to unsigned for checks, because some
platforms (e.g. ARM) use uint32_t as wchar_t,
causing compiler warning on "pwc > 0" check. */
uint64_t pwcheck = pwc;
if ( pwcheck > 0x10FFFF ) { /* outside Unicode range */
pwc = (wchar_t) 0xFFFD; pwc = (wchar_t) 0xFFFD;
} }
if ( (pwc >= 0xD800) && (pwc <= 0xDFFF) ) { /* surrogate code point */ if ( (pwcheck >= 0xD800) && (pwcheck <= 0xDFFF) ) { /* surrogate code point */
/* /*
OS X unfortunately allows these sequences without EILSEQ, but OS X unfortunately allows these sequences without EILSEQ, but
they are ill-formed UTF-8 and we shouldn't repeat them to the they are ill-formed UTF-8 and we shouldn't repeat them to the