Changeset 38441 for trunk/Ohana/src/libfits/table/F_table_format.c

Timestamp:

Jun 12, 2015, 6:18:23 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM dev branch ohana.20150429

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libfits/table/F_table_format.c (modified) (4 diffs)

trunk/Ohana/src/libfits/table/F_table_format.c

@@ -8 +8 @@
 int gfits_bintable_format (char *format, char *type, int *Nval, int *Nbytes) {
 
-  char *Lchar, *Fchar;
-  int Nv;
-
-  if (format == (char *) NULL) return (FALSE);
-  if (format[0] == 0) return (FALSE);
-  Lchar = &format[strlen(format) - 1];
-
-  Nv = strtol (format, &Fchar, 10);
-  if (Fchar != Lchar) return (FALSE);
+  char *Fchar;
+
+  if (format == (char *) NULL) return (FALSE); // format must be defined
+  if (format[0] == 0) return (FALSE);          // format must not be empty string
+  // char *Lchar = &format[strlen(format) - 1];        // last-char pointer
+
+  int Nv = strtol (format, &Fchar, 10);            // Fchar points at end of leading number
+  // if (Fchar != Lchar) return (FALSE);       -- this test is invalid for eg 1PB(nn)
   if ((Nv == 0) && (Fchar == format)) Nv = 1;
 
@@ -51 +50 @@
     { *Nbytes = 8;  strcpy (type, "double"); *Nval = Nv;               }
     break;
-  case  'P':
-    { *Nbytes = 8;  strcpy (type, "var");    *Nval = 2*Nv;             }
-    break;
   case  'C':
     { *Nbytes = 8;  strcpy (type, "float");  *Nval = 2*Nv;             }
@@ -59 +55 @@
   case  'M':
     { *Nbytes = 16; strcpy (type, "double"); *Nval = 2*Nv;             }
+    break;
+  case  'P':
+    { *Nbytes = 4;  strcpy (type, "var");    *Nval = 2*Nv;             }
+    break;
+  case  'Q':
+    { *Nbytes = 8;  strcpy (type, "var64"); *Nval = 2*Nv;             }
     break;
   default:
@@ -80 +82 @@
    C - complex float
    M - complex double
-   P - var length array descrpt (64 bit)
+   P - var length array descrpt (32 bit pointer)
+   Q - var length array descrpt (64 bit pointer)
    
    all can be preceeded by integer N which specified number
    of entries in array
-   
 */