[ViewVC] Diff of: cvs/libeio/eio.c

Comparing libeio/eio.c (file contents):
Revision 1.72 by root, Fri Jun 10 12:45:20 2011 UTC vs.
Revision 1.75 by root, Wed Jun 29 10:32:55 2011 UTC

 /*****************************************************************************/
 #define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
 /* calculate time difference in ~1/EIO_TICKS of a second */
-ECB_INLINE int
+ecb_inline int
 tvdiff (struct timeval *tv1, struct timeval *tv2)
 {
   return  (tv2->tv_sec  - tv1->tv_sec ) * EIO_TICKS
        + ((tv2->tv_usec - tv1->tv_usec) >> 10);
 }
       /* according to source inspection, this is correct, and useful behaviour */
       if (sbytes)
         res = sbytes;
-# elif defined (__APPLE__)
+# elif defined (__APPLE__) && 0 /* broken, as everything on os x */
       off_t sbytes = count;
       res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
       /* according to the manpage, sbytes is always valid */
       if (sbytes)
     flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
   X_LOCK (wrklock);
   /* the corresponding closedir is in ETP_WORKER_CLEAR */
   self->dirp = dirp = opendir (req->ptr1);
+  if (req->flags & EIO_FLAG_PTR1_FREE)
+    free (req->ptr1);
   req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
   req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
   req->ptr2 = names = malloc (namesalloc);
   X_UNLOCK (wrklock);
 eio_init (void (*want_poll)(void), void (*done_poll)(void))
 {
   return etp_init (want_poll, done_poll);
 }
-ECB_INLINE void
+ecb_inline void
 eio_api_destroy (eio_req *req)
 {
   free (req);
 }

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines