work around some gcc 4.3.3 compiler warnings (ce4d22f0) · Commits · Elphel / kicad-source-mirror

3d-viewer/3d_draw.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -658,7 +658,7 @@ void EDGE_MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas )

	default:		default:
	s.Printf( wxT( "Error: Shape nr %d not implemented!\n" ), m_Shape );		s.Printf( wxT( "Error: Shape nr %d not implemented!\n" ), m_Shape );
	printf( CONV_TO_UTF8( s ) );		D(printf( "%s", CONV_TO_UTF8( s ) );)
	break;		break;
	}		}
	}		}

common/edaappl.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -417,7 +417,7 @@ bool WinEDA_App::SetBinDir()

	if( ( ftmp = fopen( TMP_FILE, "rt" ) ) != NULL )		if( ( ftmp = fopen( TMP_FILE, "rt" ) ) != NULL )
	{		{
	fgets( Line, 1000, ftmp );		(void) fgets( Line, 1000, ftmp );
	fclose( ftmp );		fclose( ftmp );
	remove( TMP_FILE );		remove( TMP_FILE );
	}		}

common/hotkeys_basic.cpp

+8 −10

Original line number	Original line	Diff line number	Diff line
	@@ -412,12 +412,12 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile( const wxString&
	wxString keyname, infokey;		wxString keyname, infokey;

	msg = wxT( "$hotkey list\n" );		msg = wxT( "$hotkey list\n" );
	fprintf( cfgfile, CONV_TO_UTF8( msg ) );		fprintf( cfgfile, "%s", CONV_TO_UTF8( msg ) );

	/* print the allowed keys, for info		/* print the allowed keys, for info
	*/		*/
	msg = wxT( "# " ); msg += _( "Allowed keys:\n" );		msg = wxT( "# " ); msg += _( "Allowed keys:\n" );
	fprintf( cfgfile, CONV_TO_UTF8( msg ) );		fprintf( cfgfile, "%s", CONV_TO_UTF8( msg ) );
	msg.Empty();		msg.Empty();
	for( int ii = 0; ; ii++ )		for( int ii = 0; ; ii++ )
	{		{
	@@ -431,7 +431,7 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile( const wxString&
	if( msg.Len() > 60 )		if( msg.Len() > 60 )
	{		{
	msg += wxT( "\n" );		msg += wxT( "\n" );
	fprintf( cfgfile, CONV_TO_UTF8( msg ) );		fprintf( cfgfile, "%s", CONV_TO_UTF8( msg ) );
	msg.Empty();		msg.Empty();
	}		}
	}		}
	@@ -440,7 +440,7 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile( const wxString&
	if( !msg.IsEmpty() )		if( !msg.IsEmpty() )
	msg += wxT( "\n" );		msg += wxT( "\n" );
	msg += wxT( "#\n#\n" );		msg += wxT( "#\n#\n" );
	fprintf( cfgfile, CONV_TO_UTF8( msg ) );		fprintf( cfgfile, "%s", CONV_TO_UTF8( msg ) );

	/* Print the current hotkey list */		/* Print the current hotkey list */
	Ki_HotkeyInfo** List;		Ki_HotkeyInfo** List;
	@@ -449,12 +449,10 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile( const wxString&
	if( DescList->m_Comment )		if( DescList->m_Comment )
	{		{
	fprintf( cfgfile, "# " );		fprintf( cfgfile, "# " );
	fprintf( cfgfile, DescList->m_Comment );		fprintf( cfgfile, "%s\n", DescList->m_Comment );
	fprintf( cfgfile, "\n" );
	}		}
	msg = *DescList->m_SectionTag;		msg = *DescList->m_SectionTag;
	fprintf( cfgfile, CONV_TO_UTF8( msg ) );		fprintf( cfgfile, "%s\n", CONV_TO_UTF8( msg ) );
	fprintf( cfgfile, "\n" );
	List = DescList->m_HK_InfoList;		List = DescList->m_HK_InfoList;
	for( ; *List != NULL; List++ )		for( ; *List != NULL; List++ )
	{		{
	@@ -465,12 +463,12 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile( const wxString&
	infokey = hk_decr->m_InfoMsg;		infokey = hk_decr->m_InfoMsg;
	AddDelimiterString( infokey );		AddDelimiterString( infokey );
	msg += keyname + wxT( ": " ) + infokey + wxT( "\n" );		msg += keyname + wxT( ": " ) + infokey + wxT( "\n" );
	fprintf( cfgfile, CONV_TO_UTF8( msg ) );		fprintf( cfgfile, "%s", CONV_TO_UTF8( msg ) );
	}		}
	}		}

	msg = wxT( "$Endlist\n" );		msg = wxT( "$Endlist\n" );
	fprintf( cfgfile, CONV_TO_UTF8( msg ) );		fprintf( cfgfile, "%s\n", CONV_TO_UTF8( msg ) );
	fclose( cfgfile );		fclose( cfgfile );
	return 1;		return 1;
	}		}

cvpcb/listlib.cpp

+91 −91

Original line number	Original line	Diff line number	Diff line
	@@ -90,7 +90,7 @@ bool LoadFootprintFiles( const wxArrayString& libNames,
	}		}

	/* Check if library type is valid */		/* Check if library type is valid */
	fgets( buffer, 32, file );		(void) fgets( buffer, 32, file );
	if( strncmp( buffer, ENTETE_LIBRAIRIE, L_ENTETE_LIB ) != 0 )		if( strncmp( buffer, ENTETE_LIBRAIRIE, L_ENTETE_LIB ) != 0 )
	{		{
	s_files_invalid << tmp << _(" (Not a Kicad file)") << wxT("\n");		s_files_invalid << tmp << _(" (Not a Kicad file)") << wxT("\n");

cvpcb/readschematicnetlist.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -118,7 +118,7 @@ int WinEDA_CvpcbFrame::ReadSchematicNetlist()
	/* Read the file header (must be "( { OrCAD PCB" or "({ OrCAD PCB" )		/* Read the file header (must be "( { OrCAD PCB" or "({ OrCAD PCB" )
	* or "# EESchema Netliste"		* or "# EESchema Netliste"
	*/		*/
	fgets( Line, BUFFER_CHAR_SIZE, source );		(void) fgets( Line, BUFFER_CHAR_SIZE, source );
	/* test for netlist type PCB2 */		/* test for netlist type PCB2 */
	i = strnicmp( Line, "( {", 3 );		i = strnicmp( Line, "( {", 3 );
	if( i != 0 )		if( i != 0 )

Admin message