Changeset 38441 for trunk/Ohana/src/libfits/header/F_modify.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/header/F_modify.c (modified) (4 diffs)

trunk/Ohana/src/libfits/header/F_modify.c

@@ -48 +48 @@
     strncpy (comment, qe, p + 80 - qe);
   }
-  gfits_pad_ending (comment, ' ', 82);  /* comment must contain spaces to the end */
+  gfits_pad_ending (comment, 0x20, 82);  /* comment must contain spaces to the end */
 
   /* write the numeric modes */
@@ -134 +134 @@
     strncpy (comment, qe, p + 80 - qe);
   }
-  gfits_pad_ending (comment, ' ', 82);  /* comment must contain spaces to the end */
+  gfits_pad_ending (comment, 0x20, 82);  /* comment must contain spaces to the end */
 
   /* write the boolean mode */
@@ -166 +166 @@
     if (!ptr) goto invalid;
     strncpy (comment, ptr, 80);
-    gfits_pad_ending (comment, ' ', 82);  /* comment must contain spaces to the end */
+    gfits_pad_ending (comment, 0x20, 82);  /* comment must contain spaces to the end */
     snprintf (string, 81, "%-8s= %s / %-s", field, data, comment);
     /* this will keep the original line, but truncate the comment */
@@ -296 +296 @@
  */
 
+// XXX this is an absurd patch on a gcc bug: memset has a problem is value != 0 and N is constant
+void myMemset (char *ptr, int value, size_t N) {
+
+  char *p = ptr;
+  
+  size_t i = 0;
+  for (i = 0; i < N; i++, p++) {
+    *p = value;
+  }
+}
+
 /* fill 'line' with Nbyte space from first NULL to last byte with value */
 void gfits_pad_ending (char *line, char value, int Nbyte) {
-  
-  char *p;
-  int N;
 
   line[Nbyte-1] = 0;
   
-  p = line + strlen (line);
-  N = MAX (Nbyte - strlen (line) - 1, 0);
-  memset (p, value, N);
+  char *p = line + strlen (line);
+  size_t N = MAX (Nbyte - strlen (line) - 1, 0);
+  myMemset (p, value, N);
 }