mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-16 15:41:16 +01:00
New Ubuntu has a stricter compiler...
This commit is contained in:
parent
0ba1e3b122
commit
e26a01dd62
7 changed files with 10 additions and 10 deletions
|
@ -248,7 +248,7 @@ mpool_stats( MemPoolCtx* mpool, XWStreamCtxt* stream )
|
||||||
if ( !!stream ) {
|
if ( !!stream ) {
|
||||||
stream_putString( stream, buf );
|
stream_putString( stream, buf );
|
||||||
} else {
|
} else {
|
||||||
XP_LOGF( buf );
|
XP_LOGF( "%s", buf );
|
||||||
}
|
}
|
||||||
|
|
||||||
for ( entry = mpool->usedList; !!entry; entry = entry->next ) {
|
for ( entry = mpool->usedList; !!entry; entry = entry->next ) {
|
||||||
|
@ -258,7 +258,7 @@ mpool_stats( MemPoolCtx* mpool, XWStreamCtxt* stream )
|
||||||
if ( !!stream ) {
|
if ( !!stream ) {
|
||||||
stream_putString( stream, buf );
|
stream_putString( stream, buf );
|
||||||
} else {
|
} else {
|
||||||
XP_LOGF( buf );
|
XP_LOGF( "%s", buf );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} /* mpool_stats */
|
} /* mpool_stats */
|
||||||
|
|
|
@ -1513,7 +1513,7 @@ printMovePre( ModelCtxt* model, XP_U16 XP_UNUSED(moveN), StackEntry* entry,
|
||||||
|
|
||||||
if ( isPass ) {
|
if ( isPass ) {
|
||||||
format = util_getUserString( model->vol.util, STR_PASS );
|
format = util_getUserString( model->vol.util, STR_PASS );
|
||||||
XP_SNPRINTF( buf, sizeof(buf), format );
|
XP_SNPRINTF( buf, sizeof(buf), "%s", format );
|
||||||
} else {
|
} else {
|
||||||
if ( isHorizontal ) {
|
if ( isHorizontal ) {
|
||||||
format = util_getUserString( model->vol.util, STRS_MOVE_ACROSS );
|
format = util_getUserString( model->vol.util, STRS_MOVE_ACROSS );
|
||||||
|
|
|
@ -273,7 +273,7 @@ log_hex( const XP_U8* memp, XP_U16 len, const char* tag )
|
||||||
}
|
}
|
||||||
XP_SNPRINTF( buf, sizeof(buf), "%s[%d]: %s %s", tag, oldOffset,
|
XP_SNPRINTF( buf, sizeof(buf), "%s[%d]: %s %s", tag, oldOffset,
|
||||||
vals, chars );
|
vals, chars );
|
||||||
XP_LOGF( buf );
|
XP_LOGF( "%s", buf );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -29,7 +29,7 @@ gtkask( const gchar *message, GtkButtonsType buttons )
|
||||||
GtkWidget* dlg = gtk_message_dialog_new( NULL, /* parent */
|
GtkWidget* dlg = gtk_message_dialog_new( NULL, /* parent */
|
||||||
GTK_MESSAGE_QUESTION,
|
GTK_MESSAGE_QUESTION,
|
||||||
GTK_DIALOG_MODAL,
|
GTK_DIALOG_MODAL,
|
||||||
buttons, message );
|
buttons, "%s", message );
|
||||||
gint response = gtk_dialog_run( GTK_DIALOG(dlg) );
|
gint response = gtk_dialog_run( GTK_DIALOG(dlg) );
|
||||||
gtk_widget_destroy( dlg );
|
gtk_widget_destroy( dlg );
|
||||||
return response == GTK_RESPONSE_OK || response == GTK_RESPONSE_YES;
|
return response == GTK_RESPONSE_OK || response == GTK_RESPONSE_YES;
|
||||||
|
|
|
@ -1385,7 +1385,7 @@ gtk_util_userError( XW_UtilCtxt* uc, UtilErrID id )
|
||||||
XP_LOGF( "%s(%d)", __func__, id );
|
XP_LOGF( "%s(%d)", __func__, id );
|
||||||
|
|
||||||
if ( silent ) {
|
if ( silent ) {
|
||||||
XP_LOGF( message );
|
XP_LOGF( "%s", message );
|
||||||
} else {
|
} else {
|
||||||
gtkUserError( globals, message );
|
gtkUserError( globals, message );
|
||||||
}
|
}
|
||||||
|
|
|
@ -128,7 +128,7 @@ catOnClose( XWStreamCtxt* stream, void* XP_UNUSED(closure) )
|
||||||
stream_getBytes( stream, buffer, nBytes );
|
stream_getBytes( stream, buffer, nBytes );
|
||||||
buffer[nBytes] = '\0';
|
buffer[nBytes] = '\0';
|
||||||
|
|
||||||
fprintf( stderr, buffer );
|
fprintf( stderr, "%s", buffer );
|
||||||
|
|
||||||
free( buffer );
|
free( buffer );
|
||||||
} /* catOnClose */
|
} /* catOnClose */
|
||||||
|
@ -645,7 +645,7 @@ main( int argc, char** argv )
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
for ( i = 0; i < argc; ++i ) {
|
for ( i = 0; i < argc; ++i ) {
|
||||||
XP_LOGF( argv[i] );
|
XP_LOGF( "%s", argv[i] );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -995,6 +995,7 @@ main( int argc, char** argv )
|
||||||
|
|
||||||
dict_destroy( mainParams.dict );
|
dict_destroy( mainParams.dict );
|
||||||
linux_util_vt_destroy( mainParams.util );
|
linux_util_vt_destroy( mainParams.util );
|
||||||
|
XP_LOGF( "exiting main" );
|
||||||
return 0;
|
return 0;
|
||||||
} /* main */
|
} /* main */
|
||||||
|
|
||||||
|
|
|
@ -51,8 +51,7 @@ linux_debugf( const char* format, ... )
|
||||||
|
|
||||||
va_end(ap);
|
va_end(ap);
|
||||||
|
|
||||||
fprintf( stderr, buf );
|
fprintf( stderr, "%s\n", buf );
|
||||||
fprintf( stderr, "\n" );
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue