Avoiding some potentially confusing name space clashes

We have local variables or function arguments with the same names as
function static variables (or in one case, function arguments).

While all the current code was correct, it could potentially cause
confusion when chasing bugs or reviewing patches. This should make things
clearer.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2012-01-05 08:16:08 -08:00
parent 3d75c73f36
commit c544226334
5 changed files with 94 additions and 92 deletions

4
main.c
View file

@ -101,7 +101,7 @@ static gboolean imported = FALSE;
* This doesn't really report anything at all. We just sort the
* dives, the GUI does the reporting
*/
void report_dives(gboolean imported)
void report_dives(gboolean is_imported)
{
int i;
int preexisting = dive_table.preexisting;
@ -135,7 +135,7 @@ void report_dives(gboolean imported)
i--;
}
if (imported) {
if (is_imported) {
/* Was the previous dive table state numbered? */
if (last && last->number)
try_to_renumber(last, preexisting);