From ce4d22f024234cf1ba6f8bca37dfa0b8b8eca2c9 Mon Sep 17 00:00:00 2001 From: dickelbeck Date: Mon, 5 Oct 2009 04:22:27 +0000 Subject: [PATCH] work around some gcc 4.3.3 compiler warnings --- 3d-viewer/3d_draw.cpp | 2 +- common/edaappl.cpp | 2 +- common/hotkeys_basic.cpp | 18 +- cvpcb/listlib.cpp | 162 ++++----- cvpcb/readschematicnetlist.cpp | 2 +- cvpcb/writenetlistpcbnew.cpp | 2 +- gerbview/export_to_pcbnew.cpp | 2 +- include/class_drc_item.h | 10 +- kicad/minizip/minizip.c | 583 +++++++++++++++++--------------- pcbnew/build_BOM_from_board.cpp | 4 +- pcbnew/class_module.cpp | 6 +- pcbnew/dialog_drc.cpp | 4 +- pcbnew/ioascii.cpp | 2 +- pcbnew/onrightclick.cpp | 4 +- pcbnew/xchgmod.cpp | 4 +- 15 files changed, 413 insertions(+), 394 deletions(-) diff --git a/3d-viewer/3d_draw.cpp b/3d-viewer/3d_draw.cpp index ee4a62c92f..8167926f6d 100644 --- a/3d-viewer/3d_draw.cpp +++ b/3d-viewer/3d_draw.cpp @@ -658,7 +658,7 @@ void EDGE_MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas ) default: 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; } } diff --git a/common/edaappl.cpp b/common/edaappl.cpp index 59d79ea761..40e48c5367 100644 --- a/common/edaappl.cpp +++ b/common/edaappl.cpp @@ -417,7 +417,7 @@ bool WinEDA_App::SetBinDir() if( ( ftmp = fopen( TMP_FILE, "rt" ) ) != NULL ) { - fgets( Line, 1000, ftmp ); + (void) fgets( Line, 1000, ftmp ); fclose( ftmp ); remove( TMP_FILE ); } diff --git a/common/hotkeys_basic.cpp b/common/hotkeys_basic.cpp index cbc1ecd7ce..c640f58135 100644 --- a/common/hotkeys_basic.cpp +++ b/common/hotkeys_basic.cpp @@ -412,12 +412,12 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile( const wxString& wxString keyname, infokey; msg = wxT( "$hotkey list\n" ); - fprintf( cfgfile, CONV_TO_UTF8( msg ) ); + fprintf( cfgfile, "%s", CONV_TO_UTF8( msg ) ); /* print the allowed keys, for info */ msg = wxT( "# " ); msg += _( "Allowed keys:\n" ); - fprintf( cfgfile, CONV_TO_UTF8( msg ) ); + fprintf( cfgfile, "%s", CONV_TO_UTF8( msg ) ); msg.Empty(); for( int ii = 0; ; ii++ ) { @@ -431,7 +431,7 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile( const wxString& if( msg.Len() > 60 ) { msg += wxT( "\n" ); - fprintf( cfgfile, CONV_TO_UTF8( msg ) ); + fprintf( cfgfile, "%s", CONV_TO_UTF8( msg ) ); msg.Empty(); } } @@ -440,7 +440,7 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile( const wxString& if( !msg.IsEmpty() ) msg += wxT( "\n" ); msg += wxT( "#\n#\n" ); - fprintf( cfgfile, CONV_TO_UTF8( msg ) ); + fprintf( cfgfile, "%s", CONV_TO_UTF8( msg ) ); /* Print the current hotkey list */ Ki_HotkeyInfo** List; @@ -449,12 +449,10 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile( const wxString& if( DescList->m_Comment ) { fprintf( cfgfile, "# " ); - fprintf( cfgfile, DescList->m_Comment ); - fprintf( cfgfile, "\n" ); + fprintf( cfgfile, "%s\n", DescList->m_Comment ); } msg = *DescList->m_SectionTag; - fprintf( cfgfile, CONV_TO_UTF8( msg ) ); - fprintf( cfgfile, "\n" ); + fprintf( cfgfile, "%s\n", CONV_TO_UTF8( msg ) ); List = DescList->m_HK_InfoList; for( ; *List != NULL; List++ ) { @@ -465,12 +463,12 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile( const wxString& infokey = hk_decr->m_InfoMsg; AddDelimiterString( infokey ); msg += keyname + wxT( ": " ) + infokey + wxT( "\n" ); - fprintf( cfgfile, CONV_TO_UTF8( msg ) ); + fprintf( cfgfile, "%s", CONV_TO_UTF8( msg ) ); } } msg = wxT( "$Endlist\n" ); - fprintf( cfgfile, CONV_TO_UTF8( msg ) ); + fprintf( cfgfile, "%s\n", CONV_TO_UTF8( msg ) ); fclose( cfgfile ); return 1; } diff --git a/cvpcb/listlib.cpp b/cvpcb/listlib.cpp index 9a6efbdfdd..549b4ac785 100644 --- a/cvpcb/listlib.cpp +++ b/cvpcb/listlib.cpp @@ -44,19 +44,19 @@ static void ReadDocLib( const wxString& ModLibName, FOOTPRINT_LIST& list ); bool LoadFootprintFiles( const wxArrayString& libNames, FOOTPRINT_LIST& list ) { - FILE* file; /* pour lecture librairie */ - char buffer[1024]; - wxFileName filename; - int end; - FOOTPRINT* ItemLib; - unsigned i; - wxString tmp, msg; + FILE* file; /* pour lecture librairie */ + char buffer[1024]; + wxFileName filename; + int end; + FOOTPRINT* ItemLib; + unsigned i; + wxString tmp, msg; - /* Check if footprint list is not empty */ - if( !list.empty() ) - list.clear(); + /* Check if footprint list is not empty */ + if( !list.empty() ) + list.clear(); - /* Check if there are footprint libraries in project file */ + /* Check if there are footprint libraries in project file */ if( libNames.GetCount() == 0 ) { wxMessageBox( _( "No PCB foot print libraries are listed in the current project file." ), @@ -90,7 +90,7 @@ bool LoadFootprintFiles( const wxArrayString& libNames, } /* Check if library type is valid */ - fgets( buffer, 32, file ); + (void) fgets( buffer, 32, file ); if( strncmp( buffer, ENTETE_LIBRAIRIE, L_ENTETE_LIB ) != 0 ) { s_files_invalid << tmp << _(" (Not a Kicad file)") << wxT("\n"); @@ -132,8 +132,8 @@ bool LoadFootprintFiles( const wxArrayString& libNames, ReadDocLib( tmp, list ); } - /* Display if there are mdc files not found */ - if( !s_files_not_found.IsEmpty() || !s_files_invalid.IsEmpty() ) + /* Display if there are mdc files not found */ + if( !s_files_not_found.IsEmpty() || !s_files_invalid.IsEmpty() ) { DIALOG_LOAD_ERROR dialog(NULL); if( !s_files_not_found.IsEmpty() ) @@ -154,9 +154,9 @@ bool LoadFootprintFiles( const wxArrayString& libNames, dialog.ShowModal(); } - list.sort(); + list.sort(); - return true; + return true; } @@ -169,77 +169,77 @@ static void ReadDocLib( const wxString& ModLibName, FOOTPRINT_LIST& list ) { - FOOTPRINT* NewMod; - char Line[1024]; - wxString ModuleName; - FILE* mdc_file; - wxFileName mdc_filename = ModLibName; + FOOTPRINT* NewMod; + char Line[1024]; + wxString ModuleName; + FILE* mdc_file; + wxFileName mdc_filename = ModLibName; - /* Set mdc filename extension */ - mdc_filename.SetExt( wxT( "mdc" ) ); + /* Set mdc filename extension */ + mdc_filename.SetExt( wxT( "mdc" ) ); - /* Check if mdc file exists and can be opened */ - if( ( mdc_file = wxFopen( mdc_filename.GetFullPath(), wxT( "rt" ) ) ) == NULL ) - { - s_files_not_found += mdc_filename.GetFullPath() + wxT("\n"); - return; - } + /* Check if mdc file exists and can be opened */ + if( ( mdc_file = wxFopen( mdc_filename.GetFullPath(), wxT( "rt" ) ) ) == NULL ) + { + s_files_not_found += mdc_filename.GetFullPath() + wxT("\n"); + return; + } - /* Check if mdc file is valid */ - GetLine( mdc_file, Line, NULL, sizeof(Line) - 1 ); - if( strnicmp( Line, ENTETE_LIBDOC, L_ENTETE_LIB ) != 0 ) - { - s_files_invalid += mdc_filename.GetFullPath() + wxT("\n"); - return; - } + /* Check if mdc file is valid */ + GetLine( mdc_file, Line, NULL, sizeof(Line) - 1 ); + if( strnicmp( Line, ENTETE_LIBDOC, L_ENTETE_LIB ) != 0 ) + { + s_files_invalid += mdc_filename.GetFullPath() + wxT("\n"); + return; + } - /* Read the mdc file */ - while( GetLine( mdc_file, Line, NULL, sizeof(Line) - 1 ) ) - { - NewMod = NULL; - if( Line[0] != '$' ) - continue; - if( Line[1] == 'E' ) - break; - if( Line[1] == 'M' ) /* 1 module description */ - { - /* Parse file line by line */ - while( GetLine( mdc_file, Line, NULL, sizeof(Line) - 1 ) ) - { - /* $EndMODULE */ - if( Line[0] == '$' ) - break; + /* Read the mdc file */ + while( GetLine( mdc_file, Line, NULL, sizeof(Line) - 1 ) ) + { + NewMod = NULL; + if( Line[0] != '$' ) + continue; + if( Line[1] == 'E' ) + break; + if( Line[1] == 'M' ) /* 1 module description */ + { + /* Parse file line by line */ + while( GetLine( mdc_file, Line, NULL, sizeof(Line) - 1 ) ) + { + /* $EndMODULE */ + if( Line[0] == '$' ) + break; - switch( Line[0] ) - { - /* LibName */ - case 'L': /* LibName */ - ModuleName = CONV_FROM_UTF8( StrPurge( Line + 3 ) ); - BOOST_FOREACH( FOOTPRINT& footprint, list ) - { - if( ModuleName == footprint.m_Module ) - { - NewMod = &footprint; - break; - } - } - break; + switch( Line[0] ) + { + /* LibName */ + case 'L': /* LibName */ + ModuleName = CONV_FROM_UTF8( StrPurge( Line + 3 ) ); + BOOST_FOREACH( FOOTPRINT& footprint, list ) + { + if( ModuleName == footprint.m_Module ) + { + NewMod = &footprint; + break; + } + } + break; - /* KeyWords */ - case 'K': - if( NewMod && (!NewMod->m_KeyWord) ) - NewMod->m_KeyWord = CONV_FROM_UTF8( StrPurge( Line + 3 ) ); - break; + /* KeyWords */ + case 'K': + if( NewMod && (!NewMod->m_KeyWord) ) + NewMod->m_KeyWord = CONV_FROM_UTF8( StrPurge( Line + 3 ) ); + break; - /* Doc */ - case 'C': - if( NewMod && ( !NewMod->m_Doc ) ) - NewMod->m_Doc = CONV_FROM_UTF8( StrPurge( Line + 3 ) ); - break; - } - } - } /* Parsed one module documentation */ - } /* Parsed complete library documentation */ + /* Doc */ + case 'C': + if( NewMod && ( !NewMod->m_Doc ) ) + NewMod->m_Doc = CONV_FROM_UTF8( StrPurge( Line + 3 ) ); + break; + } + } + } /* Parsed one module documentation */ + } /* Parsed complete library documentation */ - fclose( mdc_file ); + fclose( mdc_file ); } diff --git a/cvpcb/readschematicnetlist.cpp b/cvpcb/readschematicnetlist.cpp index 4df704ef00..0e46123d63 100644 --- a/cvpcb/readschematicnetlist.cpp +++ b/cvpcb/readschematicnetlist.cpp @@ -118,7 +118,7 @@ int WinEDA_CvpcbFrame::ReadSchematicNetlist() /* Read the file header (must be "( { OrCAD PCB" or "({ OrCAD PCB" ) * or "# EESchema Netliste" */ - fgets( Line, BUFFER_CHAR_SIZE, source ); + (void) fgets( Line, BUFFER_CHAR_SIZE, source ); /* test for netlist type PCB2 */ i = strnicmp( Line, "( {", 3 ); if( i != 0 ) diff --git a/cvpcb/writenetlistpcbnew.cpp b/cvpcb/writenetlistpcbnew.cpp index c038e7ad5c..73ea3ea865 100644 --- a/cvpcb/writenetlistpcbnew.cpp +++ b/cvpcb/writenetlistpcbnew.cpp @@ -93,7 +93,7 @@ int GenNetlistPcbnew( FILE* file, COMPONENT_LIST& list, bool isEESchemaNetlist, fprintf( file, " ( %s ", CONV_TO_UTF8( component.m_TimeStamp ) ); if( !component.m_Module.IsEmpty() ) - fprintf( file, CONV_TO_UTF8( component.m_Module ) ); + fprintf( file, "%s", CONV_TO_UTF8( component.m_Module ) ); else fprintf( file, "$noname$" ); diff --git a/gerbview/export_to_pcbnew.cpp b/gerbview/export_to_pcbnew.cpp index 0ead2fb28c..ea53d339c3 100644 --- a/gerbview/export_to_pcbnew.cpp +++ b/gerbview/export_to_pcbnew.cpp @@ -94,7 +94,7 @@ static int WriteSetup( FILE* File, BOARD* Pcb ) fprintf( File, "$SETUP\n" ); sprintf( text, "InternalUnit %f INCH\n", 1.0 / PCB_INTERNAL_UNIT ); - fprintf( File, text ); + fprintf( File, "%s", text ); Pcb->m_BoardSettings->m_CopperLayerCount = g_DesignSettings.m_CopperLayerCount; fprintf( File, "Layers %d\n", g_DesignSettings.m_CopperLayerCount ); diff --git a/include/class_drc_item.h b/include/class_drc_item.h index 3a325e1279..441f70c670 100644 --- a/include/class_drc_item.h +++ b/include/class_drc_item.h @@ -188,16 +188,16 @@ public: { ret.Printf( wxT( "ErrType(%d): %s\n %s: %s\n %s: %s\n" ), m_ErrorCode, - GetErrorText().GetData(), - ShowCoord( m_MainPosition ).GetData(), m_MainText.GetData(), - ShowCoord( m_AuxiliaryPosition ).GetData(), m_AuxiliaryText.GetData() ); + GetChars( GetErrorText() ), + GetChars( ShowCoord( m_MainPosition ) ), GetChars( m_MainText ), + GetChars( ShowCoord( m_AuxiliaryPosition ) ), GetChars( m_AuxiliaryText ) ); } else { ret.Printf( wxT( "ErrType(%d): %s\n %s: %s\n" ), m_ErrorCode, - GetErrorText().GetData(), - ShowCoord( m_MainPosition ).GetData(), m_MainText.GetData() ); + GetChars( GetErrorText() ), + GetChars( ShowCoord( m_MainPosition ) ), GetChars( m_MainText ) ); } return ret; diff --git a/kicad/minizip/minizip.c b/kicad/minizip/minizip.c index 974c117bfd..73e507ab80 100644 --- a/kicad/minizip/minizip.c +++ b/kicad/minizip/minizip.c @@ -1,6 +1,6 @@ /* MiniZip 1.00, demo of zLib + Zip package written by Gilles Vollant - Modifie le 2 juin 2004 JPC -*/ + * Modifie le 2 juin 2004 JPC + */ #include #include #include @@ -21,358 +21,379 @@ #include "zip.h" #ifdef WIN32 + //#define USEWIN32IOAPI #include "iowin32.h" #endif - #define WRITEBUFFERSIZE (16384) -#define MAXFILENAME (1024) +#define MAXFILENAME (1024) int g_Verbose = 1; /*****************************/ uLong filetime( - const char *filename, /* name of file to get info on */ - tm_zip *tmzip, /* return value: access, modific. and creation times */ - uLong *dt) /* dostime */ + const char* filename, /* name of file to get info on */ + tm_zip* tmzip, /* return value: access, modific. and creation times */ + uLong* dt ) /* dostime */ /*****************************/ #ifdef WIN32 { - int ret = 0; - { - FILETIME ftLocal; - HANDLE hFind; - WIN32_FIND_DATA ff32; + int ret = 0; - hFind = FindFirstFile(filename,&ff32); - if (hFind != INVALID_HANDLE_VALUE) - { - FileTimeToLocalFileTime(&(ff32.ftLastWriteTime),&ftLocal); - FileTimeToDosDateTime(&ftLocal,((LPWORD)dt)+1,((LPWORD)dt)+0); - FindClose(hFind); - ret = 1; - } - } - return ret; + { + FILETIME ftLocal; + HANDLE hFind; + WIN32_FIND_DATA ff32; + + hFind = FindFirstFile( filename, &ff32 ); + if( hFind != INVALID_HANDLE_VALUE ) + { + FileTimeToLocalFileTime( &(ff32.ftLastWriteTime), &ftLocal ); + FileTimeToDosDateTime( &ftLocal, ( (LPWORD) dt ) + 1, ( (LPWORD) dt ) + 0 ); + FindClose( hFind ); + ret = 1; + } + } + return ret; } + + #else #ifdef unix { -int ret=0; -struct stat s; /* results of stat() */ -struct tm* filedate; -time_t tm_t=0; + int ret = 0; + struct stat s; /* results of stat() */ + struct tm* filedate; + time_t tm_t = 0; - if (strcmp(filename,"-")!=0) - { - char name[MAXFILENAME+10]; - int len = strlen(filename); + if( strcmp( filename, "-" )!=0 ) + { + char name[MAXFILENAME + 10]; + int len = strlen( filename ); - strncpy(name, filename,MAXFILENAME); - /* strncpy doesnt append the trailing NULL, of the string is too long. */ - name[ MAXFILENAME ] = '\0'; + strncpy( name, filename, MAXFILENAME ); + /* strncpy doesnt append the trailing NULL, of the string is too long. */ + name[ MAXFILENAME ] = '\0'; - if (name[len - 1] == '/') - name[len - 1] = '\0'; - /* not all systems allow stat'ing a file with / appended */ - if (stat(name,&s)==0) - { - tm_t = s.st_mtime; - ret = 1; - } - } - filedate = localtime(&tm_t); + if( name[len - 1] == '/' ) + name[len - 1] = '\0'; + /* not all systems allow stat'ing a file with / appended */ + if( stat( name, &s )==0 ) + { + tm_t = s.st_mtime; + ret = 1; + } + } + filedate = localtime( &tm_t ); - tmzip->tm_sec = filedate->tm_sec; - tmzip->tm_min = filedate->tm_min; - tmzip->tm_hour = filedate->tm_hour; - tmzip->tm_mday = filedate->tm_mday; - tmzip->tm_mon = filedate->tm_mon ; - tmzip->tm_year = filedate->tm_year; + tmzip->tm_sec = filedate->tm_sec; + tmzip->tm_min = filedate->tm_min; + tmzip->tm_hour = filedate->tm_hour; + tmzip->tm_mday = filedate->tm_mday; + tmzip->tm_mon = filedate->tm_mon; + tmzip->tm_year = filedate->tm_year; - return ret; + return ret; } #else { - return 0; + return 0; } #endif #endif - -/*******************************************/ -int check_exist_file( const char* filename) /*******************************************/ +int check_exist_file( const char* filename ) { - FILE* ftestexist; - int ret = 1; - ftestexist = fopen(filename,"rb"); - if (ftestexist == NULL) ret = 0; - else fclose(ftestexist); - return ret; +/*******************************************/ + FILE* ftestexist; + int ret = 1; + + ftestexist = fopen( filename, "rb" ); + if( ftestexist == NULL ) + ret = 0; + else + fclose( ftestexist ); + return ret; } + /* calculate the CRC32 of a file, - because to encrypt a file, we need known the CRC32 of the file before */ -int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigned long* result_crc) + * because to encrypt a file, we need known the CRC32 of the file before */ +int getFileCrc( const char* filenameinzip, + void* buf, + unsigned long size_buf, + unsigned long* result_crc ) { -unsigned long calculate_crc=0; -int err=ZIP_OK; -FILE * fin = fopen(filenameinzip,"rb"); -unsigned long size_read = 0; -unsigned long total_read = 0; - - if (fin==NULL) - { - err = ZIP_ERRNO; - } + unsigned long calculate_crc = 0; + int err = ZIP_OK; + FILE* fin = fopen( filenameinzip, "rb" ); + unsigned long size_read = 0; + unsigned long total_read = 0; - if (err == ZIP_OK) - do - { - err = ZIP_OK; - size_read = (int)fread(buf,1,size_buf,fin); - if (size_read < size_buf) - if (feof(fin)==0) - { - printf("error in reading %s\n",filenameinzip); - err = ZIP_ERRNO; - } + if( fin==NULL ) + { + err = ZIP_ERRNO; + } - if (size_read>0) - calculate_crc = crc32(calculate_crc,buf,size_read); - total_read += size_read; + if( err == ZIP_OK ) + do + { + err = ZIP_OK; + size_read = (int) fread( buf, 1, size_buf, fin ); + if( size_read < size_buf ) + if( feof( fin )==0 ) + { + printf( "error in reading %s\n", filenameinzip ); + err = ZIP_ERRNO; + } - } while ((err == ZIP_OK) && (size_read>0)); + if( size_read>0 ) + calculate_crc = crc32( calculate_crc, buf, size_read ); + total_read += size_read; + } while( (err == ZIP_OK) && (size_read>0) ); - if (fin) - fclose(fin); + if( fin ) + fclose( fin ); - *result_crc=calculate_crc; - if ( g_Verbose ) printf("file %s crc %lx\n",filenameinzip,calculate_crc); - return err; + *result_crc = calculate_crc; + if( g_Verbose ) + printf( "file %s crc %lx\n", filenameinzip, calculate_crc ); + return err; } + /********************************/ -int main( int argc, char *argv[]) -/********************************/ +int main( int argc, char* argv[] ) { -int i; -int opt_overwrite=0; -int opt_compress_level=Z_DEFAULT_COMPRESSION; -int zipfilenamearg = 0; -char filename_try[MAXFILENAME+16]; -int zipok; -int err=0; -int size_buf=0; -void* buf=NULL; -const char* password=NULL; +/********************************/ + int i; + int opt_overwrite = 0; + int opt_compress_level = Z_DEFAULT_COMPRESSION; + int zipfilenamearg = 0; + char filename_try[MAXFILENAME + 16]; + int zipok; + int err = 0; + int size_buf = 0; + void* buf = NULL; + const char* password = NULL; - if (argc <= 1) - { - printf("Usage : minizip [-o] [-a] [-0 to -9] [-p password] file.zip [files_to_add]\n\n" \ - " -o Overwrite existing file.zip\n" \ - " -a Append to existing file.zip\n" \ - " -0 Store only, -1 Compress faster, -9 Compress better [5]\n\n"); - return 0; - } + if( argc <= 1 ) + { + printf( "Usage : minizip [-o] [-a] [-0 to -9] [-p password] file.zip [files_to_add]\n\n" \ + " -o Overwrite existing file.zip\n" \ + " -a Append to existing file.zip\n" \ + " -0 Store only, -1 Compress faster, -9 Compress better [5]\n\n" ); + return 0; + } - for (i = 1; i < argc; i++) - { - if ((*argv[i])=='-') /* Find options */ - { - const char *p=argv[i]+1; + for( i = 1; i < argc; i++ ) + { + if( (*argv[i])=='-' ) /* Find options */ + { + const char* p = argv[i] + 1; - while ((*p)!='\0') - { - char c=*(p++); - if ((c=='o') || (c=='O')) - opt_overwrite = 1; - else if ((c=='a') || (c=='A')) - opt_overwrite = 2; - else if ((c>='0') && (c<='9')) - opt_compress_level = c-'0'; + while( (*p)!='\0' ) + { + char c = *(p++); + if( (c=='o') || (c=='O') ) + opt_overwrite = 1; + else if( (c=='a') || (c=='A') ) + opt_overwrite = 2; + else if( (c>='0') && (c<='9') ) + opt_compress_level = c - '0'; - else if (((c=='p') || (c=='P')) && (i+1='a') && (rep<='z')) - rep -= 0x20; - } - while ((rep!='Y') && (rep!='N') && (rep!='A')); - if (rep=='N') zipok = 0; - if (rep=='A') opt_overwrite = 2; - } - } + if( dot_found==0 ) + strcat( filename_try, ".zip" ); - if (zipok==1) - { - zipFile zf; - int errclose; + if( opt_overwrite==2 ) + { + /* if the file don't exist, we not append file */ + if( check_exist_file( filename_try )==0 ) + opt_overwrite = 1; + } + else + if( opt_overwrite==0 ) + if( check_exist_file( filename_try )!=0 ) + { + char rep = 0; + do + { + char answer[128]; + printf( "The file %s exist. Overwrite ? [y]es, [n]o, [a]ppend : ", + filename_try ); + (void) scanf( "%1s", answer ); + rep = answer[0]; + if( (rep>='a') && (rep<='z') ) + rep -= 0x20; + } while( (rep!='Y') && (rep!='N') && (rep!='A') ); + + if( rep=='N' ) + zipok = 0; + if( rep=='A' ) + opt_overwrite = 2; + } + } + + if( zipok==1 ) + { + zipFile zf; + int errclose; #ifdef USEWIN32IOAPI - zlib_filefunc_def ffunc; - fill_win32_filefunc(&ffunc); - zf = zipOpen2(filename_try,(opt_overwrite==2) ? 2 : 0,NULL,&ffunc); + zlib_filefunc_def ffunc; + fill_win32_filefunc( &ffunc ); + zf = zipOpen2( filename_try, (opt_overwrite==2) ? 2 : 0, NULL, &ffunc ); #else - zf = zipOpen(filename_try,(opt_overwrite==2) ? 2 : 0); + zf = zipOpen( filename_try, (opt_overwrite==2) ? 2 : 0 ); #endif - if (zf == NULL) - { - printf("error opening %s\n",filename_try); - err= ZIP_ERRNO; - } - else - if ( g_Verbose ) printf("creating %s\n",filename_try); + if( zf == NULL ) + { + printf( "error opening %s\n", filename_try ); + err = ZIP_ERRNO; + } + else + if( g_Verbose ) + printf( "creating %s\n", filename_try ); - for (i=zipfilenamearg+1; (i0) - { - err = zipWriteInFileInZip (zf,buf,size_read); - if (err<0) - { - printf("error in writing %s in the zipfile\n", - filenameinzip); - } + if( size_read>0 ) + { + err = zipWriteInFileInZip( zf, buf, size_read ); + if( err<0 ) + { + printf( "error in writing %s in the zipfile\n", + filenameinzip ); + } + } + } while( (err == ZIP_OK) && (size_read>0) ); - } - } while ((err == ZIP_OK) && (size_read>0)); + if( fin ) + fclose( fin ); - if (fin) fclose(fin); + if( err<0 ) + err = ZIP_ERRNO; + else + { + err = zipCloseFileInZip( zf ); + if( err!=ZIP_OK ) + printf( "error in closing %s in the zipfile\n", + filenameinzip ); + } + } + } - if (err<0) err=ZIP_ERRNO; - else - { - err = zipCloseFileInZip(zf); - if (err!=ZIP_OK) - printf("error in closing %s in the zipfile\n", - filenameinzip); - } - } - } - errclose = zipClose(zf,NULL); - if (errclose != ZIP_OK) - printf("error in closing %s\n",filename_try); - } + errclose = zipClose( zf, NULL ); + if( errclose != ZIP_OK ) + printf( "error in closing %s\n", filename_try ); + } - free(buf); - return 0; + free( buf ); + return 0; } diff --git a/pcbnew/build_BOM_from_board.cpp b/pcbnew/build_BOM_from_board.cpp index 887a8ac1cc..6188dccb90 100644 --- a/pcbnew/build_BOM_from_board.cpp +++ b/pcbnew/build_BOM_from_board.cpp @@ -90,7 +90,7 @@ void WinEDA_PcbFrame::RecreateBOMFileFromBoard( wxCommandEvent& aEvent ) msg << _("Number") << wxT("\";\""); msg << _("Designation") << wxT("\";\""); msg << _("Supplier and ref") << wxT("\";\n" ); - fprintf( FichBom, CONV_TO_UTF8( msg ) ); + fprintf( FichBom, "%s", CONV_TO_UTF8( msg ) ); // Build list CmpList list; @@ -142,7 +142,7 @@ void WinEDA_PcbFrame::RecreateBOMFileFromBoard( wxCommandEvent& aEvent ) msg << current->m_Pkg << wxT( "\";" ); msg << current->m_CmpCount << wxT( ";\"" ); msg << current->m_Val << wxT( "\";;;\n" ); - fprintf( FichBom, CONV_TO_UTF8( msg ) ); + fprintf( FichBom, "%s", CONV_TO_UTF8( msg ) ); list.DeleteObject( current ); delete (current); diff --git a/pcbnew/class_module.cpp b/pcbnew/class_module.cpp index dd382026f1..c357ebc4d8 100644 --- a/pcbnew/class_module.cpp +++ b/pcbnew/class_module.cpp @@ -365,19 +365,19 @@ int MODULE::Write_3D_Descr( FILE* File ) const t3D->m_MatScale.x, t3D->m_MatScale.y, t3D->m_MatScale.z ); - fprintf( File, to_point( buf ) ); + fprintf( File, "%s", to_point( buf ) ); sprintf( buf, "Of %lf %lf %lf\n", t3D->m_MatPosition.x, t3D->m_MatPosition.y, t3D->m_MatPosition.z ); - fprintf( File, to_point( buf ) ); + fprintf( File, "%s", to_point( buf ) ); sprintf( buf, "Ro %lf %lf %lf\n", t3D->m_MatRotation.x, t3D->m_MatRotation.y, t3D->m_MatRotation.z ); - fprintf( File, to_point( buf ) ); + fprintf( File, "%s", to_point( buf ) ); fprintf( File, "$EndSHAPE3D\n" ); } diff --git a/pcbnew/dialog_drc.cpp b/pcbnew/dialog_drc.cpp index bb480784c7..db740aa4b8 100644 --- a/pcbnew/dialog_drc.cpp +++ b/pcbnew/dialog_drc.cpp @@ -523,14 +523,14 @@ void DIALOG_DRC_CONTROL::writeReport( FILE* fp ) fprintf( fp, "\n** Found %d DRC errors **\n", count ); for( int i = 0; iGetItem( i )->ShowReport().mb_str() ); + fprintf( fp, "%s", CONV_TO_UTF8( m_ClearanceListBox->GetItem( i )->ShowReport()) ); count = m_UnconnectedListBox->GetItemCount(); fprintf( fp, "\n** Found %d unconnected pads **\n", count ); for( int i = 0; iGetItem( i )->ShowReport().mb_str() ); + fprintf( fp, "%s", CONV_TO_UTF8( m_UnconnectedListBox->GetItem( i )->ShowReport() ) ); fprintf( fp, "\n** End of Report **\n" ); } diff --git a/pcbnew/ioascii.cpp b/pcbnew/ioascii.cpp index 1a38cc99b3..7ae268f954 100644 --- a/pcbnew/ioascii.cpp +++ b/pcbnew/ioascii.cpp @@ -524,7 +524,7 @@ static int WriteSetup( FILE* aFile, WinEDA_BasePcbFrame* aFrame, BOARD* aBoard ) fprintf( aFile, "$SETUP\n" ); sprintf( text, "InternalUnit %f INCH\n", 1.0 / PCB_INTERNAL_UNIT ); - fprintf( aFile, text ); + fprintf( aFile, "%s", text ); fprintf( aFile, "ZoneGridSize %d\n", g_GridRoutingSize ); diff --git a/pcbnew/onrightclick.cpp b/pcbnew/onrightclick.cpp index 2e82cf6e28..46b3400bc6 100644 --- a/pcbnew/onrightclick.cpp +++ b/pcbnew/onrightclick.cpp @@ -881,7 +881,7 @@ static wxMenu* Append_Track_Width_List( BOARD * aBoard ) trackwidth_menu->Check( ID_POPUP_PCB_SELECT_AUTO_WIDTH, true ); else { - if( aBoard->m_TrackWidthSelector < (int)aBoard->m_TrackWidthHistory.size() ) + if( aBoard->m_TrackWidthSelector < aBoard->m_TrackWidthHistory.size() ) trackwidth_menu->Check( ID_POPUP_PCB_SELECT_WIDTH1 + aBoard->m_TrackWidthSelector, true ); } @@ -899,7 +899,7 @@ static wxMenu* Append_Track_Width_List( BOARD * aBoard ) msg << _(" (from NetClass)" ); trackwidth_menu->Append( ID_POPUP_PCB_SELECT_VIASIZE1 + ii, msg, wxEmptyString, true ); } - if( aBoard->m_ViaSizeSelector < (int)aBoard->m_ViaSizeHistory.size() ) + if( aBoard->m_ViaSizeSelector < aBoard->m_ViaSizeHistory.size() ) trackwidth_menu->Check( ID_POPUP_PCB_SELECT_VIASIZE1 + aBoard->m_ViaSizeSelector, true ); return trackwidth_menu; diff --git a/pcbnew/xchgmod.cpp b/pcbnew/xchgmod.cpp index 1aa2fa6acf..7d2533be86 100644 --- a/pcbnew/xchgmod.cpp +++ b/pcbnew/xchgmod.cpp @@ -192,7 +192,7 @@ int DIALOG_EXCHANGE_MODULE::Maj_ListeCmp( const wxString& reference, return 1; } - fgets( Line, sizeof(Line), FichCmp ); + (void) fgets( Line, sizeof(Line), FichCmp ); fprintf( NewFile, "Cmp-Mod V01 Genere par PcbNew le %s\n", DateAndTime( Line ) ); @@ -601,7 +601,7 @@ void WinEDA_PcbFrame::RecreateCmpFileFromBoard( wxCommandEvent& aEvent ) return; } - fgets( Line, sizeof(Line), FichCmp ); + (void) fgets( Line, sizeof(Line), FichCmp ); fprintf( FichCmp, "Cmp-Mod V01 Genere par PcbNew le %s\n", DateAndTime( Line ) );