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

Fix wchar_t format string types

Browse Source 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg
2012-02-17 20:17:58 -05:00
parent af649a035c
commit 32ff4af359
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/examples/parse.cc
+2 -2
View File
@@ -187,9 +187,9 @@ int vt_parser( int fd, Parser::UTF8Parser *parser )
if ( act->char_present ) { if ( act->char_present ) {
if ( iswprint( act->ch ) ) { if ( iswprint( act->ch ) ) {
printf( "%s(0x%02x=%lc) ", act->name().c_str(), act->ch, act->ch ); printf( "%s(0x%02x=%lc) ", act->name().c_str(), (unsigned int)act->ch, act->ch );
} else { } else {
printf( "%s(0x%02x) ", act->name().c_str(), act->ch ); printf( "%s(0x%02x) ", act->name().c_str(), (unsigned int)act->ch );
} }
} else { } else {
printf( "[%s] ", act->name().c_str() ); printf( "[%s] ", act->name().c_str() );
src/terminal/parseraction.cc
+4 -1
View File
@@ -28,7 +28,10 @@ std::string Action::str( void )
{ {
char thechar[ 10 ] = { 0 }; char thechar[ 10 ] = { 0 };
if ( char_present ) { if ( char_present ) {
snprintf( thechar, 10, iswprint( ch ) ? "(%lc)" : "(0x%x)", ch ); if ( iswprint( ch ) )
snprintf( thechar, 10, "(%lc)", ch );
else
snprintf( thechar, 10, "(0x%x)", (unsigned int)ch );
} }
return name() + std::string( thechar ); return name() + std::string( thechar );
src/terminal/terminaldisplay.cc
+1 -1
View File
@@ -246,7 +246,7 @@ void Display::put_cell( bool initialized, FrameState &frame, const Framebuffer &
/* cells that begin with combining character get combiner attached to no-break space */ /* cells that begin with combining character get combiner attached to no-break space */
if ( cell->fallback ) { if ( cell->fallback ) {
snprintf( tmp, 64, "%lc", 0xA0 ); snprintf( tmp, 64, "%lc", L'\xA0' );
frame.append( tmp ); frame.append( tmp );
} }