[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Sebastien Delaux]

The following commit has been merged in the upstream branch:
commit 0f3c24407215d330ed90d269039e8883f0cbed58
Author: Sebastien Delaux <s.delaux at niwa.co.nz>
Date:   Thu Aug 4 15:10:44 2005 +1000

    Fix for incorrect error message in FTT I/O
    
    darcs-hash:20050804051044-118cf-5dbadf13af4171838d198fb99b11f3a673adf704.gz

diff --git a/src/ftt.c b/src/ftt.c
index 6a58a39..98b234d 100644
--- a/src/ftt.c
+++ b/src/ftt.c
@@ -1658,8 +1658,10 @@ void ftt_cell_destroy (FttCell * cell,
   cell->flags |= FTT_FLAG_DESTROYED;
 
   /* destroy children */
-  if (!FTT_CELL_IS_LEAF (cell))
+  if (!FTT_CELL_IS_LEAF (cell)) {
     oct_destroy (cell->children, cleanup, data);
+    cell->children = NULL;
+  }
 
   /* update relationships for neighbors */
   for (i = 0; i < FTT_NEIGHBORS; i++)
@@ -2015,8 +2017,8 @@ static gboolean cell_read (FttCell * cell,
   }
   flags = atoi (fp->token->str);
   if (FTT_CELL_ID (cell) != (flags & FTT_FLAG_ID)) {
-    gts_file_error (fp, "flags `%d' != (flags & FTT_FLAG_ID) `%d'",
-		    flags, (flags & FTT_FLAG_ID));
+    gts_file_error (fp, "FTT_CELL_ID (cell) `%d' != (flags & FTT_FLAG_ID) `%d'",
+		    FTT_CELL_ID (cell), (flags & FTT_FLAG_ID));
     return FALSE;
   }
   cell->flags = flags;
@@ -2121,8 +2123,8 @@ static gboolean cell_read_binary (FttCell * cell,
     return FALSE;
   }
   if (FTT_CELL_ID (cell) != (flags & FTT_FLAG_ID)) {
-    gts_file_error (fp, "flags `%d' != (flags & FTT_FLAG_ID) `%d'",
-		    flags, (flags & FTT_FLAG_ID));
+    gts_file_error (fp, "FTT_CELL_ID (cell) `%d' != (flags & FTT_FLAG_ID) `%d'",
+		    FTT_CELL_ID (cell), (flags & FTT_FLAG_ID));
     return FALSE;
   }
   cell->flags = flags;

-- 
Gerris Flow Solver