Changeset 39457 for trunk/Ohana/src/dvomerge

Timestamp:

Mar 11, 2016, 10:23:42 PM (10 years ago)

Author:

eugene

Message:

modify to pass with extremely pedantic build; force consistency for signed vs unsigned and int sizes; various relastro updates

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/dvomerge/src/build_links.c (modified) (1 diff)
• src/dvomerge/src/dvomergeCreate.c (modified) (1 diff)
• src/dvomerge/src/dvorepairDeleteImagesByExternID.c (modified) (2 diffs)
• src/dvomerge/src/dvorepairFixImages.c (modified) (1 diff)
• src/dvomerge/src/replace_match.c (modified) (1 diff)
• src/dvomerge/src/replace_tycho.c (modified) (1 diff)

trunk/Ohana/src/dvomerge/src/build_links.c

@@ -180 +180 @@
 /* build the initial links assuming the table is sorted */
 off_t *init_missing_links (Average *average, off_t Naverage, Missing *missing, off_t Nmissing) {
+  OHANA_UNUSED_PARAM(missing);
 
   off_t i, j, N;

trunk/Ohana/src/dvomerge/src/dvomergeCreate.c

@@ -4 +4 @@
 // the output db may have a different SKY_DEPTH from the input dbs
 int dvomergeCreate (int argc, char **argv) {
+  OHANA_UNUSED_PARAM(argc);
 
   int depth1, depth2;

trunk/Ohana/src/dvomerge/src/dvorepairDeleteImagesByExternID.c

@@ -32 +32 @@
 
 int dvorepairDeleteImagesByExternID (int argc, char **argv) {
+  OHANA_UNUSED_PARAM(argc);
 
   FITS_DB db;  // database handle pointing to input image table
@@ -306 +307 @@
 
 int RepairTableCPT_V1(char *cptFilenameSrc, char *cptFilenameTgt, char *cpsFilenameSrc, char *cpsFilenameTgt, Measure *measure, off_t Nmeasure, Image *image, off_t Nimage, myIndexType *imageIDindex, char catformat) {
+  OHANA_UNUSED_PARAM(Nimage);
 
   off_t *averefMatch;

trunk/Ohana/src/dvomerge/src/dvorepairFixImages.c

@@ -126 +126 @@
 
 int MarkMosaicsToDelete(Image *image, off_t Nimage, int *deleteIndex) {
+  OHANA_UNUSED_PARAM(image);
+  OHANA_UNUSED_PARAM(Nimage);
+  OHANA_UNUSED_PARAM(deleteIndex);
 
   myAbort ("this function needs to be redone with a concept to match the old BuildChipMatch");

trunk/Ohana/src/dvomerge/src/replace_match.c

@@ -7 +7 @@
 // average and measure pointers to the objects of interest and their first / current measurement
 int replace_match (Average *average_out, Measure *measure_out, off_t *next_meas, Average *average_in, Measure *measure_in) {
+  OHANA_UNUSED_PARAM(average_in);
 
   int Nout;

trunk/Ohana/src/dvomerge/src/replace_tycho.c

@@ -11 +11 @@
 
 int replace_tycho (Average *averageOut, Measure *measureOut, off_t *next_meas, Average *averageInp, Measure *measureInp) {
+  OHANA_UNUSED_PARAM(averageInp);
 
   int i;