haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quiet a few coverity warnings

This commit is contained in:
Seth Hillbrand 2021-01-24 14:53:18 -08:00
parent 02f91c52a0
commit 5a9c0a9b5a
2 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
pcbnew/plugins/fabmaster/import_fabmaster.cpp
View File

@ -581,17 +581,20 @@ size_t FABMASTER::processSimpleLayers( size_t aRow )
size_t rownum = aRow + 2;
if( rows.size() < rownum )
return 0;
return -1;
auto header = rows[aRow];
double scale_factor = processScaleFactor( aRow + 1 );
if( scale_factor <= 0.0 )
return 0;
return -1;
int layer_class_col = getColFromName( aRow, "CLASS" );
int layer_subclass_col = getColFromName( aRow, "SUBCLASS" );
if( layer_class_col < 0 || layer_subclass_col < 0 )
return -1;
for( ; rownum < rows.size() && rows[rownum].size() > 0 && rows[rownum][0] == "S"; ++rownum )
{
auto row = rows[rownum];
@ -720,13 +723,13 @@ size_t FABMASTER::processLayers( size_t aRow )
size_t rownum = aRow + 2;
if( rows.size() < rownum )
return 0;
return -1;
auto header = rows[aRow];
double scale_factor = processScaleFactor( aRow + 1 );
if( scale_factor <= 0.0 )
return 0;
return -1;
int layer_sort_col = getColFromName( aRow, "LAYERSORT" );
int layer_subclass_col = getColFromName( aRow, "LAYERSUBCLASS" );
@ -737,6 +740,10 @@ size_t FABMASTER::processLayers( size_t aRow )
int layer_rho_col = getColFromName( aRow, "LAYERELECTRICALCONDUCTIVITY" );
int layer_mat_col = getColFromName( aRow, "LAYERMATERIAL" );
if( layer_sort_col < 0 || layer_subclass_col < 0 || layer_art_col < 0 || layer_use_col < 0
|| layer_cond_col < 0 || layer_er_col < 0 || layer_rho_col < 0 || layer_mat_col < 0 )
return -1;
for( ; rownum < rows.size() && rows[rownum].size() > 0 && rows[rownum][0] == "S"; ++rownum )
{
auto row = rows[rownum];
@ -790,13 +797,13 @@ size_t FABMASTER::processCustomPads( size_t aRow )
size_t offset = 2;
if( rows.size() < aRow + offset)
return 0;
return -1;
auto header = rows[aRow];
double scale_factor = processScaleFactor( aRow + 1 );
if( scale_factor <= 0.0 )
return 0;
return -1;
int pad_subclass_col = getColFromName( aRow, "SUBCLASS" );
int pad_shape_name_col = getColFromName( aRow, "PADSHAPENAME" );
@ -816,6 +823,13 @@ size_t FABMASTER::processCustomPads( size_t aRow )
int pad_refdes_col = getColFromName( aRow, "REFDES" );
int pad_pin_num_col = getColFromName( aRow, "PINNUMBER" );
if( pad_subclass_col < 0 || pad_shape_name_col < 0 || pad_grdata1_col < 0 || pad_grdata2_col < 0
|| pad_grdata3_col < 0 || pad_grdata4_col < 0 || pad_grdata5_col < 0
|| pad_grdata6_col < 0 || pad_grdata7_col < 0 || pad_grdata8_col < 0
|| pad_grdata9_col < 0 || pad_stack_name_col < 0 || pad_refdes_col < 0
|| pad_pin_num_col < 0 )
return -1;
for( ; rownum < rows.size() && rows[rownum].size() > 0 && rows[rownum][0] == "S"; ++rownum )
{
size_t rownum = aRow + offset;
@ -1102,6 +1116,13 @@ size_t FABMASTER::processGeometry( size_t aRow )
int geo_sym_name_col = getColFromName( aRow, "SYMNAME" );
int geo_refdes_col = getColFromName( aRow, "REFDES" );
if( geo_name_col < 0 || geo_num_col < 0 || geo_grdata1_col < 0 || geo_grdata2_col < 0
|| geo_grdata3_col < 0 || geo_grdata4_col < 0 || geo_grdata5_col < 0
|| geo_grdata6_col < 0 || geo_grdata7_col < 0 || geo_grdata8_col < 0
|| geo_grdata9_col < 0 || geo_subclass_col < 0 || geo_sym_name_col < 0
|| geo_refdes_col < 0 )
return -1;
for( ; rownum < rows.size() && rows[rownum].size() > 0 && rows[rownum][0] == "S"; ++rownum )
{
auto row = rows[rownum];
@ -1220,6 +1241,10 @@ size_t FABMASTER::processVias( size_t aRow )
int net_name_col = getColFromName( aRow, "NETNAME" );
int test_point_col = getColFromName( aRow, "TESTPOINT" );
if( viax_col < 0 || viay_col < 0 || padstack_name_col < 0 || net_name_col < 0
|| test_point_col < 0 )
return -1;
for( ; rownum < rows.size() && rows[rownum].size() > 0 && rows[rownum][0] == "S"; ++rownum )
{
auto row = rows[rownum];
@ -1279,6 +1304,12 @@ size_t FABMASTER::processTraces( size_t aRow )
int grdata9_col = getColFromName( aRow, "GRAPHICDATA9" );
int netname_col = getColFromName( aRow, "NETNAME" );
if( class_col < 0 || layer_col < 0 || grdata_name_col < 0 || grdata_num_col < 0
|| tag_col < 0 || grdata1_col < 0 || grdata2_col < 0 || grdata3_col < 0
|| grdata4_col < 0 || grdata5_col < 0 || grdata6_col < 0 || grdata7_col < 0
|| grdata8_col < 0 || grdata9_col < 0 || netname_col < 0 )
return -1;
for( ; rownum < rows.size() && rows[rownum].size() > 0 && rows[rownum][0] == "S"; ++rownum )
{
auto row = rows[rownum];
@ -1429,6 +1460,12 @@ size_t FABMASTER::processFootprints( size_t aRow )
int comptol_col = getColFromName( aRow, "COMPTOL" );
int compvolt_col = getColFromName( aRow, "COMPVOLTAGE" );
if( refdes_col < 0 || compclass_col < 0 || comppartnum_col < 0 || compheight_col < 0
|| compdevlabelcol < 0 || compinscode_col < 0 || symtype_col < 0 || symname_col < 0
|| symmirror_col < 0 || symrotate_col < 0 || symx_col < 0 || symy_col < 0
|| compvalue_col < 0 || comptol_col < 0 || compvolt_col < 0 )
return -1;
for( ; rownum < rows.size() && rows[rownum].size() > 0 && rows[rownum][0] == "S"; ++rownum )
{
auto row = rows[rownum];
@ -1501,6 +1538,11 @@ size_t FABMASTER::processPins( size_t aRow )
int pinrot_col = getColFromName( aRow, "PINROTATION" );
int testpoint_col = getColFromName( aRow, "TESTPOINT" );
if( symname_col < 0 ||symmirror_col < 0 || pinname_col < 0 || pinnum_col < 0 || pinx_col < 0
|| piny_col < 0 || padstack_col < 0 || refdes_col < 0 || pinrot_col < 0
|| testpoint_col < 0 )
return -1;
for( ; rownum < rows.size() && rows[rownum].size() > 0 && rows[rownum][0] == "S"; ++rownum )
{
auto row = rows[rownum];
@ -1562,6 +1604,10 @@ size_t FABMASTER::processNets( size_t aRow )
int pingnd_col = getColFromName( aRow, "PINGROUND" );
int pinpwr_col = getColFromName( aRow, "PINPOWER" );
if( netname_col < 0 || refdes_col < 0 || pinnum_col < 0 || pinname_col < 0 || pingnd_col < 0
|| pinpwr_col < 0 )
return -1;
for( ; rownum < rows.size() && rows[rownum].size() > 0 && rows[rownum][0] == "S"; ++rownum )
{
auto row = rows[rownum];

2
pcbnew/plugins/fabmaster/import_fabmaster.h
View File

@ -498,7 +498,7 @@ private:
* Processes data from text vectors into internal database
* for further ordering
* @param aRow vector offset being processed
* @return Count of the number of rows processed
* @return Count of the number of rows processed, return -1 on error
*/
double processScaleFactor( size_t aRow );
size_t processPadStacks( size_t aRow );