Changeset 326 for SH_SHM/trunk/source/seed_io/seed_lib.c

Timestamp:

02/17/2011 12:16:59 PM (12 years ago)

Author:

marcus

Message:

r165 | klaus | 2011-02-17 12:03:57 +0100 (Do, 17 Feb 2011) | 1 line

handle data record identifier M; also in split_seed

File:

• SH_SHM/trunk/source/seed_io/seed_lib.c (modified) (5 diffs)

SH_SHM/trunk/source/seed_io/seed_lib.c

@@ -3 +3 @@
  *      ==========
  *
- * $Revision: 164 $, $Date: 2011-02-16 10:01:41 +0100 (Mi, 16 Feb 2011) $
+ * $Revision: 165 $, $Date: 2011-02-17 12:03:57 +0100 (Do, 17 Feb 2011) $
  *
  * SEED library
@@ -4013 +4013 @@
 
 #define IDOFFSET 6
-#define DATCHARS "DQRM"
 
 
@@ -4053 +4052 @@
         if  (id1 == EOF || isdigit1 == FALSE)  {
                 /* no SEED file, leave recsize zero */
-        } else if  (strchr(DATCHARS,id1) != NULL && strchr(DATCHARS,id2) == NULL)  {
+        } else if  (strchr(Seed_C_DATCHARS,id1) != NULL && strchr(Seed_C_DATCHARS,id2) == NULL)  {
                 /* definitely not 512 */
                 *recsize = 4096;
                 *byteoff = 0;
-        } else if  (id1 == 'V' && strchr(DATCHARS,id2) != NULL && isdigit2 == TRUE)  {
+        } else if  (id1 == 'V' && strchr(Seed_C_DATCHARS,id2) != NULL && isdigit2 == TRUE)  {
                 /* very likely 512 */
                 *recsize = 512;
@@ -4064 +4063 @@
                 *recsize = 4096;
                 *byteoff = 0;  /* this is a guess */
-        } else if  (strchr(DATCHARS,id1) != NULL && strchr(DATCHARS,id2) != NULL)  {
+        } else if  (strchr(Seed_C_DATCHARS,id1) != NULL && strchr(Seed_C_DATCHARS,id2) != NULL)  {
                 *byteoff = 0;
                 fseek( fp, 1024+IDOFFSET, 0 );
@@ -4070 +4069 @@
                 fseek( fp, 1024+512+IDOFFSET, 0 );
                 id2 = getc( fp );
-                if  (strchr(DATCHARS,id1) != NULL && strchr(DATCHARS,id2) != NULL)  {
+                if  (strchr(Seed_C_DATCHARS,id1) != NULL && strchr(Seed_C_DATCHARS,id2) != NULL)  {
                         *recsize = 512;
-                } else if  (strchr(DATCHARS,id1) != NULL && id2 == EOF)  {
+                } else if  (strchr(Seed_C_DATCHARS,id1) != NULL && id2 == EOF)  {
                         *recsize = 512;
                 } else if  (id1 == EOF)  {