Changeset 27368 for branches/eam_branches/largefiles.20100314/Ohana/src/libfits/header/F_print.c

Timestamp:

Mar 19, 2010, 5:35:25 PM (16 years ago)

Author:

eugene

Message:

update ohana formatting functions to check format and associated types; fixes derived from format checks

File:

• branches/eam_branches/largefiles.20100314/Ohana/src/libfits/header/F_print.c (modified) (4 diffs)

branches/eam_branches/largefiles.20100314/Ohana/src/libfits/header/F_print.c

@@ -2 +2 @@
 # include <gfitsio.h>
 
+// this only prints the regular and non-boolean fields
 int gfits_print (Header *header, char *field, char *mode, int N,...) {
   
@@ -8 +9 @@
   static char blank[] = " ";
   char string[82], line[80];
-  char *p, a;
+  char *p;
   va_list argp;  
 
@@ -61 +62 @@
   if (!strcmp (mode, "%lg")) { snprintf (string, 81, "%-8s= %20.10G / %46s ", field, va_arg (argp, double),             blank); }
 
+  /* string value.  Quotes must be at least 18 chars apart.  Longer lines will this should be fixed to allow arbitrary string lengths, up to 69 chars */
+  if (!strcmp (mode, "%s")) {
+    strcpy (line, va_arg (argp, char *));
+    line[68] = 0;
+    snprintf (string, 81, "%-8s= '%-18s' / %46s ", field, line, blank);
+  }
+
+  strncpy (p, string, 80);
+  
+  va_end (argp);
+  return (TRUE);
+
+}
+
+// alternate version for the special types (boolean, comments, COMMENT)
+int gfits_print_alt (Header *header, char *field, char *mode, int N,...) {
+  
+  /* this function expects one more argument, the value to be written */
+
+  static char blank[] = " ";
+  char string[82], line[80];
+  char *p, a;
+  va_list argp;  
+
+  va_start (argp, N);
+  
+  if (mode[0] != '%') {
+    fprintf (stderr, "gfits_print: weird mode:  %s\n", mode);
+    return (FALSE);
+  }
+
+  /* this is supposed to create a new field, not modify an old one.  */
+  p = gfits_header_field (header, field, N);
+  if (p != NULL) return (FALSE);
+
+  /* find the END of the header */
+  p = gfits_header_field (header, "END", 1);
+  if (p == NULL) return (FALSE); 
+
+  /* is there enough space for 1 more line? */
+  if (header[0].datasize - (p - (header[0].buffer)) < 2*FT_LINE_LENGTH) {
+    header[0].datasize += FT_RECORD_SIZE;
+    REALLOCATE (header[0].buffer, char, header[0].datasize);
+    /* re-find the "END" marker, in case new memory block is used */
+    p = gfits_header_field (header, "END", 1);
+    if (p == NULL) return (FALSE); 
+    memset (p + FT_LINE_LENGTH, ' ', FT_RECORD_SIZE);
+  }
+
+  /* push END line back 1 */
+  memmove ((p + FT_LINE_LENGTH), p, FT_LINE_LENGTH);
+  memset (p, ' ', FT_LINE_LENGTH);
+
   /* write the boolean mode */
   if (!strcmp (mode, "%t")) {
@@ -68 +122 @@
     else
       snprintf (string, 81, "%-8s= %18s F / %46s ", field, blank, blank);
-  }
-
-  /* string value.  Quotes must be at least 18 chars apart.  Longer lines will this should be fixed to allow arbitrary string lengths, up to 69 chars */
-  if (!strcmp (mode, "%s")) {
-    strcpy (line, va_arg (argp, char *));
-    line[68] = 0;
-    snprintf (string, 81, "%-8s= '%-18s' / %46s ", field, line, blank);
   }