[cig-commits] r6890 - in cs/cigma/trunk: include/cigma src

[luis at geodynamics.org]

Author: luis
Date: 2007-05-16 10:10:29 -0700 (Wed, 16 May 2007)
New Revision: 6890

Modified:
   cs/cigma/trunk/include/cigma/field.h
   cs/cigma/trunk/src/field.c
Log:
Added an extra return to field.c, and also changed one string argument to (const char *)


Modified: cs/cigma/trunk/include/cigma/field.h
===================================================================
--- cs/cigma/trunk/include/cigma/field.h	2007-05-16 17:08:23 UTC (rev 6889)
+++ cs/cigma/trunk/include/cigma/field.h	2007-05-16 17:10:29 UTC (rev 6890)
@@ -22,7 +22,7 @@
 } field_t;
 
 
-int field_init(field_t *field, char *filename, char *path);
+int field_init(field_t *field, const char *filename, const char *path);
 int field_init_h5(field_t *field, hid_t loc_id, const char *name);
 int field_free(field_t *field);
 

Modified: cs/cigma/trunk/src/field.c
===================================================================
--- cs/cigma/trunk/src/field.c	2007-05-16 17:08:23 UTC (rev 6889)
+++ cs/cigma/trunk/src/field.c	2007-05-16 17:10:29 UTC (rev 6890)
@@ -5,7 +5,7 @@
 #include <cigma/tet4.h>
 
 
-int field_init(field_t *field, char *filename, char *path)
+int field_init(field_t *field, const char *filename, const char *path)
 {
     hid_t file_id;
     herr_t status;
@@ -22,6 +22,7 @@
     if (ierr < 0)
     {
         H5Fclose(file_id);
+        return -2;
     }
 
     status = H5Fclose(file_id);