Changeset 481 for trunk/src/sh_inotify.c

Timestamp:

Jul 18, 2015, 5:06:52 PM (9 years ago)

Author:

katerina

Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

File:

• trunk/src/sh_inotify.c (modified) (17 diffs)

trunk/src/sh_inotify.c

@@ -135 +135 @@
   int    class;
   int    rdepth;
-  unsigned long check_mask;
+  unsigned long check_flags;
   char * file;
 } sh_watch;
@@ -236 +236 @@
   int     ifd = sh_inotify_getfd();
 
-  len = sl_read_timeout_fd (ifd, buffer, count, timeout, SL_FALSE);
+  len = sl_read_timeout_fd (ifd, buffer, count, timeout, S_FALSE);
 
   return len;
@@ -364 +364 @@
 
 char * sh_inotify_pop_dormant(sh_watches * watches, 
-                              int * class, unsigned long * check_mask, 
+                              int * class, unsigned long * check_flags, 
                               int * type, int * rdepth)
 {
@@ -384 +384 @@
       *type   = this->watch->type;
       *rdepth = this->watch->rdepth;
-      *check_mask = this->watch->check_mask;
+      *check_flags = this->watch->check_flags;
       popret  = sh_util_strdup_track(this->watch->file, __FILE__, __LINE__);
 
@@ -424 +424 @@
 static zAVLKey sh_inotify_getkey(void const *item)
 {
-  return (&((sh_watch *)item)->watch);
+  return (&((const sh_watch *)item)->watch);
 }
 
@@ -490 +490 @@
 int sh_inotify_add_watch_later(const char * filename, sh_watches * watches, 
                                int * errnum,
-                               int class, unsigned long check_mask, int type, 
+                               int class, unsigned long check_flags, int type, 
                                int rdepth)
 {
@@ -500 +500 @@
   item->type       = (short) type;
   item->rdepth     = (short) rdepth;
-  item->check_mask = check_mask;
+  item->check_flags = check_flags;
 
   sh_inotify_add_dormant(watches, item);
@@ -548 +548 @@
 
   extern void sh_fInotify_report_add(char * path, 
-                                     int class, unsigned long check_mask);
+                                     int class, unsigned long check_flags);
 
   sh_dummy_litem = (void*) &litem;
@@ -575 +575 @@
               SH_MUTEX_UNLOCK(mutex_watches);
 
-              sh_fInotify_report_add(litem->file, litem->class, litem->check_mask);
+              sh_fInotify_report_add(litem->file, litem->class, litem->check_flags);
 
               litem = sh_inotify_list_del_cur(&listcursor, save);
@@ -592 +592 @@
  */
 int sh_inotify_add_watch(char * filename, sh_watches * watches, int * errnum,
-                         int class, unsigned long check_mask, int type, int rdepth)
+                         int class, unsigned long check_flags, int type, int rdepth)
 {
   volatile int retval = 0;
@@ -637 +637 @@
           item->type       = type;
           item->rdepth     = rdepth;
-          item->check_mask = check_mask;
+          item->check_flags = check_flags;
           
           if (NULL == watches->list_of_watches)
@@ -692 +692 @@
 
 char * sh_inotify_search_item(sh_watches * watches, int watch, 
-                              int * class, unsigned long * check_mask, 
+                              int * class, unsigned long * check_flags, 
                               int * type, int * rdepth)
 {
@@ -709 +709 @@
     {
       *class      = item->class;
-      *check_mask = item->check_mask;
+      *check_flags = item->check_flags;
       *type       = item->type;
       *rdepth     = item->rdepth;
@@ -882 +882 @@
 
 int sh_inotify_add_watch(char * filename, sh_watches * watches, int  * errnum,
-                         int class, unsigned long check_mask, int type, int rdepth)
+                         int class, unsigned long check_flags, int type, int rdepth)
 {
   (void) filename;
   (void) watches;
   (void) class;
-  (void) check_mask;
+  (void) check_flags;
   (void) type;
   (void) rdepth;
@@ -898 +898 @@
 int sh_inotify_add_watch_later(const char * filename, sh_watches * watches, 
                                int  * errnum,
-                               int class, unsigned long check_mask, int type, int rdepth)
+                               int class, unsigned long check_flags, int type, int rdepth)
 {
   (void) filename;
   (void) watches;
   (void) class;
-  (void) check_mask;
+  (void) check_flags;
   (void) type;
   (void) rdepth;
@@ -927 +927 @@
   int type;
   int rdepth;
-  unsigned long check_mask;
+  unsigned long check_flags;
   int           nrun = 0;
 
@@ -1022 +1022 @@
     CuAssertIntEquals(tc, count, 5);
     
-    p = sh_inotify_pop_dormant(&twatch, &class, &check_mask, &type, &rdepth);
+    p = sh_inotify_pop_dormant(&twatch, &class, &check_flags, &type, &rdepth);
     CuAssertStrEquals(tc, p, "a5");
     
-    p = sh_inotify_pop_dormant(&twatch, &class, &check_mask, &type, &rdepth);
+    p = sh_inotify_pop_dormant(&twatch, &class, &check_flags, &type, &rdepth);
     CuAssertStrEquals(tc, p, "a3");
     CuAssertIntEquals(tc, class, 3);
     
-    p = sh_inotify_pop_dormant(&twatch, &class, &check_mask, &type, &rdepth);
+    p = sh_inotify_pop_dormant(&twatch, &class, &check_flags, &type, &rdepth);
     CuAssertTrue(tc, NULL == p);
     CuAssertTrue(tc, NULL == twatch.dormant_watches);