uv: upgrade to c468e2a

nodejs · Nov 5, 2011 · 10edbbb · 10edbbb
1 parent 7335a42
commit 10edbbb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/deps/uv/src/unix/linux.c b/deps/uv/src/unix/linux.c
@@ -158,7 +158,7 @@ int uv_fs_event_init(uv_loop_t* loop,
                      const char* filename,
                      uv_fs_event_cb cb,
                      int flags) {
-  int flags;
+  int events;
   int fd;
 
   /* We don't support any flags yet. */
@@ -174,15 +174,15 @@ int uv_fs_event_init(uv_loop_t* loop,
     return -1;
   }
 
-  flags = IN_ATTRIB
-        | IN_CREATE
-        | IN_MODIFY
-        | IN_DELETE
-        | IN_DELETE_SELF
-        | IN_MOVED_FROM
-        | IN_MOVED_TO;
+  events = IN_ATTRIB
+         | IN_CREATE
+         | IN_MODIFY
+         | IN_DELETE
+         | IN_DELETE_SELF
+         | IN_MOVED_FROM
+         | IN_MOVED_TO;
 
-  if (inotify_add_watch(fd, filename, flags) == -1) {
+  if (inotify_add_watch(fd, filename, events) == -1) {
     uv__set_sys_error(loop, errno);
     uv__close(fd);
     return -1;

diff --git a/deps/uv/test/test-fs.c b/deps/uv/test/test-fs.c
@@ -1435,7 +1435,7 @@ TEST_IMPL(fs_file_open_append) {
   ASSERT(close_req.result != -1);
   uv_fs_req_cleanup(&close_req);
 
-  r = uv_fs_open(loop, &open_req1, "test_file", _O_RDWR | O_APPEND, 0, NULL);
+  r = uv_fs_open(loop, &open_req1, "test_file", O_RDWR | O_APPEND, 0, NULL);
   ASSERT(r != -1);
   ASSERT(open_req1.result != -1);
   uv_fs_req_cleanup(&open_req1);
@@ -1461,7 +1461,9 @@ TEST_IMPL(fs_file_open_append) {
   printf("read = %d\n", r);
   ASSERT(r == 26);
   ASSERT(read_req.result == 26);
-  ASSERT(memcmp(buf, "test-buffer\n\0test-buffer\n\0", sizeof(buf)) == 0);
+  ASSERT(memcmp(buf,
+                "test-buffer\n\0test-buffer\n\0",
+                sizeof("test-buffer\n\0test-buffer\n\0") - 1) == 0);
   uv_fs_req_cleanup(&read_req);
 
   r = uv_fs_close(loop, &close_req, open_req1.result, NULL);
@@ -1473,4 +1475,4 @@ TEST_IMPL(fs_file_open_append) {
   unlink("test_file");
 
   return 0;
-}
+}