Avoiding some potentially confusing name space clashes

[ext/subsurface.git] / main.c

diff --git a/main.c b/main.c
index 9aaa5d1f42ca61b384fb37740a7ebbbefe9472dc..67e19b02b20eed85897426b12c7b1a0f09414f6b 100644 (file)
--- a/main.c
+++ b/main.c
@@ -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);
@@ -186,8 +186,6 @@ void update_dive(struct dive *new_dive)
        struct dive *old_dive = buffered_dive;
 
        if (old_dive) {
-               flush_dive_info_changes(old_dive);
-               flush_dive_equipment_changes(old_dive);
                flush_divelist(old_dive);
        }
        if (new_dive) {