Changeset 3649 for trunk/Ohana/src/addstar

Timestamp:

Apr 3, 2005, 9:11:15 PM (22 years ago)

Author:

eugene

Message:

cleaning up fsetlockfile / fclearlockfile (dropped setlockfile2/clearlockfile2)

Location:

trunk/Ohana/src/addstar/src

Files:

• gimages.c (modified) (1 diff)
• image-db.c (modified) (1 diff)

trunk/Ohana/src/addstar/src/gimages.c

@@ -17 +17 @@
   
   /* if image.db is opened successfully, f will not be NULL.
-     if image.db is empty, dbstate will be LCK_EMPTY */
+     if image.db is empty, dbstate will be LCK_EMPTY 
+     if image.db is not locked & opened successfully, we will not reach here!
+  */
   f = GetDB (&dbstate);
   if (dbstate == LCK_EMPTY) {

trunk/Ohana/src/addstar/src/image-db.c

@@ -36 +36 @@
   check_permissions (ImageCat);
   f = fsetlockfile (ImageCat, 3600.0, LOCK, &dbstate);
-  if ((f == (FILE *) NULL) && (dbstate != LCK_EMPTY)) {
+  if (f == NULL) {
     fprintf (stderr, "ERROR: can't lock image catalog\n");
     exit (1);