Changeset 16057

Timestamp:

Jan 14, 2008, 1:46:57 PM (18 years ago)

Author:

eugene

Message:

fixing Wall,Werror warnings; fixed sort error

Location:

trunk/Ohana/src/libdvo

Files:

• include/dvo.h (modified) (2 diffs)
• src/dvo_catalog.c (modified) (1 diff)
• src/dvo_catalog_split.c (modified) (5 diffs)
• src/skyregion_gsc.c (modified) (1 diff)

trunk/Ohana/src/libdvo/include/dvo.h

@@ -335 +335 @@
 void dvo_catalog_create (SkyRegion *region, Catalog *catalog);
 void dvo_catalog_free (Catalog *catalog);
+void dvo_catalog_free_data (Catalog *catalog);
 int dvo_catalog_check (Catalog *catalog, int Nsecfilt, int extend);
 int dvo_catalog_lock (Catalog *catalog, int lockmode);
@@ -354 +355 @@
 int dvo_catalog_save_split (Catalog *catalog, char VERBOSE);
 int dvo_catalog_update_split (Catalog *catalog, char VERBOSE);
+
+int dvo_catalog_load_segment (Catalog *catalog, int VERBOSE, int start, int Nrows);
+int dvo_catalog_load_segment_split (Catalog *catalog, int VERBOSE, int start, int Nrows);
 
 /*** conversion functions / I/O conversions ***/

trunk/Ohana/src/libdvo/src/dvo_catalog.c

@@ -396 +396 @@
 
 int dvo_catalog_load_segment (Catalog *catalog, int VERBOSE, int start, int Nrows) {
-  
-  int Naxis, split, status;
-  char measure[80];
 
   switch (catalog[0].catmode) {

trunk/Ohana/src/libdvo/src/dvo_catalog_split.c

@@ -40 +40 @@
   *mySecfilt = secfilt;
   *myNsecfilt = Nsecfilt;
+  return (TRUE);
 }
 
@@ -157 +158 @@
 int dvo_catalog_load_split (Catalog *catalog, int VERBOSE) {
 
-  int Nbytes, Nitems, Nexpect, Naverage, Nmeasure, Nmissing, Nsecfilt, status;
+  int Nbytes, Nitems, Naverage, Nmeasure, Nmissing, Nsecfilt, status;
   Header header;
   FTable ftable;
@@ -328 +329 @@
 int dvo_catalog_load_segment_split (Catalog *catalog, int VERBOSE, int start, int Nrows) {
 
-  int Nbytes, Naverage, Nsecfilt, Nexpect, Nitems, Nmeasure, Nmissing;
+  int Nbytes, Naverage, Nexpect, Nitems, Nmeasure, Nmissing;
   Header header;
   FTable ftable;
@@ -469 +470 @@
 
   int Nitems;
-  Matrix matrix;
   Header header;
   FTable ftable;
-  Catalog *catfile;
   SecFilt *primary, *secfilt;
-  int i, j, Nsecfilt, Nallfilt, Ntotal;
+  int Nsecfilt;
   int Naves_disk_new, Nmeas_disk_new, Nmiss_disk_new, Nsecf_disk_new;
   int first, start, Nrows;
@@ -650 +649 @@
 int dvo_catalog_update_split (Catalog *catalog, char VERBOSE) {
 
-  int i, Nx, Ny, Nlines;
-  int Nitems, Nskip, Nout, Ndisk, Nstart;
-  Matrix matrix;
+  int Nitems;
   Header header;
   FTable ftable;
-  Catalog *catfile;
   SecFilt *primary, *secfilt;
-  int j, Nsecfilt, Nallfilt, Ntotal;
+  int Nsecfilt;
   int Naves_disk_new, Nmeas_disk_new, Nmiss_disk_new, Nsecf_disk_new;
   int first, start, Nrows;

trunk/Ohana/src/libdvo/src/skyregion_gsc.c

@@ -212 +212 @@
   filename = table[0].filename;
 
-# define SWAPFUNC(A,B){ int tmp; \
-  char     *tempfile = filename[A]; filename[A] = filename[B]; filename[B] = tempfile; \
+# define SWAPFUNC(A,B){ \
+  if (table[0].filename) { \
+    char     *tempfile = filename[A]; filename[A] = filename[B]; filename[B] = tempfile; \
+  } \
   SkyRegion tempregion = regions[A]; regions[A] = regions[B]; regions[B] = tempregion; \
 }