Changeset 458 for trunk/src/sh_hash.c

Timestamp:

Aug 5, 2014, 12:26:42 PM (10 years ago)

Author:

katerina

Message:

Fix for ticket #358 (repetitive lstat warning) and #359 (reporting of added/deleted top level directories).

File:

• trunk/src/sh_hash.c (modified) (6 diffs)

trunk/src/sh_hash.c

@@ -477 +477 @@
   SH_MUTEX_UNLOCK(mutex_hash);
 
+  /* remove here to avoid second message from hash_unvisited */
+  if (retval == 0)
+    sh_hash_remove (fullpath);
+
   return retval;
 }
@@ -537 +541 @@
       SL_RET0(_("hash_unvisited"));
     }
-#if 0
-  if (!strcmp(p->fullpath, "/var/lib/synaptic"))
-    {
-      fprintf(stderr, "FIXME: Check for missing files %s\n", p->fullpath);
-      if (SH_FFLAG_VISITED_SET(p->fflags)) fprintf(stderr, "FIXME: visited\n");
-      if (SH_FFLAG_CHECKED_SET(p->fflags)) fprintf(stderr, "FIXME: checked\n");
-      if (SH_FFLAG_REPORTED_SET(p->fflags)) fprintf(stderr, "FIXME: reported\n");
-      if (SH_FFLAG_ALLIGNORE_SET(p->fflags)) fprintf(stderr, "FIXME: allignore\n");
-    }
-#endif
+
   /* visited   flag not set: not seen; 
    * checked   flag     set: not seen (i.e. missing), and already checked 
@@ -560 +555 @@
     {
       i = retry_lstat(FIL__, __LINE__, p->fullpath, &buf);
-#if 0
-      if (!strcmp(p->fullpath, "/var/lib/synaptic"))
-        fprintf(stderr, "FIXME: Check for missing files %s (%d)\n", p->fullpath, i);
-#endif
+
      /* if file does not exist
        */
@@ -653 +645 @@
   CLEAR_SH_FFLAG_VISITED(p->fflags);
   CLEAR_SH_FFLAG_CHECKED(p->fflags);
+  SET_SH_FFLAG_ENOENT(p->fflags);
 
   SL_RET0(_("hash_unvisited"));
@@ -2202 +2195 @@
 /* needs lock to be threadsafe
  */
-void sh_hash_addflag (char * filename, int flag_to_set)
+void sh_hash_set_flag (char * filename, int flag_to_set)
 {
   sh_file_t * p;
@@ -2218 +2211 @@
   return;
 }
+
+/* needs lock to be threadsafe
+ */
+void sh_hash_clear_flag (char * filename, int flag_to_clear)
+{
+  sh_file_t * p;
+
+  if (IsInit != 1) 
+    sh_hash_init();
+
+  SH_MUTEX_LOCK(mutex_hash);
+  p = sh_hash_have_it_int (filename);
+  if (p)
+    {
+      p->fflags &= ~flag_to_clear;
+    }
+  SH_MUTEX_UNLOCK(mutex_hash);
+  return;
+}
+
 
 /*****************************************************************