Changeset 8427 for trunk/Ohana/src/opihi/dvo/catalog.c

Timestamp:

Aug 20, 2006, 5:36:41 PM (20 years ago)

Author:

eugene

Message:

updated to the new DVO APIs; minor cleanups (unused variables, etc)

File:

• trunk/Ohana/src/opihi/dvo/catalog.c (modified) (1 diff)

trunk/Ohana/src/opihi/dvo/catalog.c

@@ -316 +316 @@
       /* lock, load, unlock catalog */
       catalog.filename = filename;
-      switch (lock_catalog (&catalog, LCK_SOFT)) {
-      case 2:
-        unlock_catalog (&catalog);
-      case 0:
-        continue;
-      }
       catalog.catflags = LOAD_AVES;
-      if (!load_catalog (&catalog, TRUE)) {
-        unlock_catalog (&catalog);
-        continue;
-      }
-      unlock_catalog (&catalog);
+
+      // an error exit status here is a significant error
+      if (!dvo_catalog_open (&catalog, NULL, FALSE, "r")) {
+          fprintf (stderr, "ERROR: failure to open catalog file %s\n", catalog.filename);
+          exit (2);
+      }
+      dvo_catalog_unlock (&catalog);
     }