From 20f3d7c26c703473d2f2c00741524b9a59cb4adb Mon Sep 17 00:00:00 2001 From: Cary R Date: Tue, 4 Jan 2011 17:41:19 -0800 Subject: [PATCH] Remove some more cppcheck warnings. This patch removes some more simple cppcheck warnings and updates two of the cppcheck suppression files. --- cppcheck.sup | 4 ++-- design_dump.cc | 4 ++-- emit.cc | 4 ++-- functor.cc | 4 ++-- net_design.cc | 4 ++-- vpi/cppcheck.sup | 14 +++++++------- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cppcheck.sup b/cppcheck.sup index 76827e0c2..840e30aa4 100644 --- a/cppcheck.sup +++ b/cppcheck.sup @@ -1,3 +1,3 @@ // These are correct and are used to find the base (zero) pin. -thisSubtraction:netlist.h:4119 -thisSubtraction:netlist.h:4128 +thisSubtraction:netlist.h:4165 +thisSubtraction:netlist.h:4174 diff --git a/design_dump.cc b/design_dump.cc index 6f1adb05f..8d02de40d 100644 --- a/design_dump.cc +++ b/design_dump.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2010 Stephen Williams (steve@icarus.com) + * Copyright (c) 1998-2011 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -1217,7 +1217,7 @@ void NetScope::dump(ostream&o) const // Dump the signals, for (signals_map_iter_t cur = signals_map_.begin() - ; cur != signals_map_.end() ; cur ++) { + ; cur != signals_map_.end() ; ++ cur) { cur->second->dump_net(o, 4); } diff --git a/emit.cc b/emit.cc index 0f8c9d374..8148dc1dd 100644 --- a/emit.cc +++ b/emit.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2010 Stephen Williams (steve@icarus.com) + * Copyright (c) 1998-2011 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -404,7 +404,7 @@ void NetScope::emit_scope(struct target_t*tgt) const // in the list. We can do it here because delay paths are // always connected within the scope. for (signals_map_iter_t cur = signals_map_.begin() - ; cur != signals_map_.end() ; cur ++) { + ; cur != signals_map_.end() ; ++ cur) { tgt->signal_paths(cur->second); } diff --git a/functor.cc b/functor.cc index b9351c4ac..6d5bcebb0 100644 --- a/functor.cc +++ b/functor.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2010 Stephen Williams (steve@icarus.com) + * Copyright (c) 1999-2011 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -115,7 +115,7 @@ void NetScope::run_functor(Design*des, functor_t*fun) signals_map_iter_t cur = signals_map_.begin(); while (cur != signals_map_.end()) { signals_map_iter_t tmp = cur; - cur ++; + ++ cur; fun->signal(des, tmp->second); } } diff --git a/net_design.cc b/net_design.cc index 912a5c2fe..7dab97b6f 100644 --- a/net_design.cc +++ b/net_design.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2010 Stephen Williams (steve@icarus.com) + * Copyright (c) 2000-2011 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -678,7 +678,7 @@ void NetScope::evaluate_parameters(Design*des) is_param_expr = true; for (param_ref_t cur = parameters.begin() - ; cur != parameters.end() ; cur ++) { + ; cur != parameters.end() ; ++ cur) { evaluate_parameter_(des, cur); } diff --git a/vpi/cppcheck.sup b/vpi/cppcheck.sup index 429de910c..82744ef7d 100644 --- a/vpi/cppcheck.sup +++ b/vpi/cppcheck.sup @@ -3,14 +3,14 @@ // problems will not be fixed. // fstapi.c from GTKWave -variableScope:fstapi.c:1497 variableScope:fstapi.c:1614 -variableScope:fstapi.c:1663 -variableScope:fstapi.c:1664 -variableScope:fstapi.c:2355 -variableScope:fstapi.c:2670 -variableScope:fstapi.c:2674 -variableScope:fstapi.c:2675 +variableScope:fstapi.c:1731 +variableScope:fstapi.c:1780 +variableScope:fstapi.c:1781 +variableScope:fstapi.c:2472 +variableScope:fstapi.c:2787 +variableScope:fstapi.c:2791 +variableScope:fstapi.c:2792 // lxt2_write.c from GTKWave variableScope:lxt2_write.c:63