Changeset 34345

Timestamp:

Aug 23, 2012, 11:26:47 AM (14 years ago)

Author:

bills

Message:

Restructure code to work around apparent compiler bug where when buildling optimized
it thinks a variable may be used uninitialized.

File:

• trunk/Ohana/src/opihi/cmd.astro/getcoords.c (modified) (2 diffs)

trunk/Ohana/src/opihi/cmd.astro/getcoords.c

@@ -57 +57 @@
       return (FALSE);
     }
-    if ((mosbuffer = SelectBuffer (MOSAIC, OLDBUFFER, TRUE)) == NULL) goto escape;
+    if ((mosbuffer = SelectBuffer (MOSAIC, OLDBUFFER, TRUE)) == NULL) {
+        // Using goto_escape triggers a compiler bug with our build flags when using gcc 4.3.2
+        // It thinks MOSAIC may be uninitialzed even when it can't be. Just free 
+        // goto escape;
+        free (MOSAIC);
+        return (FALSE);
+    }
     GetCoords (&moscoords, &mosbuffer[0].header);
     RegisterMosaic (&moscoords);
@@ -100 +106 @@
   gprint (GP_ERR, "USAGE: getcoords [buffer] (crval1) (crval2) [-transform C/E/G C/E/G]\n");
   gprint (GP_ERR, "generate images of the two coordinate dimensions for the image WCS\n");
- escape:
-  if (MOSAIC != NULL) free (MOSAIC);
+  // escape:
+  // Jumping here and trying to free this here causes the compiler to fail on optimized build to fail See comments
+  // above.
+  // if (MOSAIC != NULL) free (MOSAIC);
   return (FALSE);
 }