Index: ossp-pkg/pth/pth_high.c
RCS File: /v/ossp/cvs/ossp-pkg/pth/pth_high.c,v
rcsdiff -q -kk '-r1.77' '-r1.78' -u '/v/ossp/cvs/ossp-pkg/pth/pth_high.c,v' 2>/dev/null
--- pth_high.c	2001/07/30 18:29:32	1.77
+++ pth_high.c	2001/07/30 18:45:07	1.78
@@ -290,7 +290,7 @@
     /* now directly poll filedescriptor sets to avoid unneccessary
        (and resource consuming because of context switches, etc) event
        handling through the scheduler. We've to be carefully here, because not
-       all platforms guarranty us that the sets are unmodified when an error
+       all platforms guarranty us that the sets are unmodified if an error
        or timeout occured. */
     delay.tv_sec  = 0;
     delay.tv_usec = 0;
@@ -495,7 +495,7 @@
     /* restore filedescriptor mode */
     errno_shield { pth_fdmode(s, fdmode); }
 
-    /* when it is still on progress wait until socket is really writeable */
+    /* if it is still on progress wait until socket is really writeable */
     if (rv == -1 && errno == EINPROGRESS) {
         ev = pth_event(PTH_EVENT_FD|PTH_UNTIL_FD_WRITEABLE|PTH_MODE_STATIC, &ev_key, s);
         if (ev_extra != NULL)
@@ -593,7 +593,7 @@
     if (nbytes == 0)
         return 0;
 
-    /* poll filedescriptor when not already in non-blocking operation */
+    /* poll filedescriptor if not already in non-blocking operation */
     if (pth_fdmode(fd, PTH_FDMODE_POLL) == PTH_FDMODE_BLOCK) {
 
         /* now directly poll filedescriptor for readability
@@ -606,7 +606,7 @@
         while ((n = pth_sc(select)(fd+1, &fds, NULL, NULL, &delay)) < 0
                && errno == EINTR) ;
 
-        /* when filedescriptor is still not readable,
+        /* if filedescriptor is still not readable,
            let thread sleep until it is or the extra event occurs */
         if (n < 1) {
             ev = pth_event(PTH_EVENT_FD|PTH_UNTIL_FD_READABLE|PTH_MODE_STATIC, &ev_key, fd);
@@ -661,7 +661,7 @@
     /* force filedescriptor into non-blocking mode */
     fdmode = pth_fdmode(fd, PTH_FDMODE_NONBLOCK);
 
-    /* poll filedescriptor when not already in non-blocking operation */
+    /* poll filedescriptor if not already in non-blocking operation */
     if (fdmode != PTH_FDMODE_NONBLOCK) {
 
         /* now directly poll filedescriptor for writeability
@@ -676,7 +676,7 @@
 
         rv = 0;
         for (;;) {
-            /* when filedescriptor is still not writeable,
+            /* if filedescriptor is still not writeable,
                let thread sleep until it is or event occurs */
             if (n < 1) {
                 ev = pth_event(PTH_EVENT_FD|PTH_UNTIL_FD_WRITEABLE|PTH_MODE_STATIC, &ev_key, fd);
@@ -717,7 +717,7 @@
         }
     }
     else {
-        /* Now perform the actual write operation */
+        /* just perform the actual write operation */
         while ((rv = pth_sc(write)(fd, buf, nbytes)) < 0
                && errno == EINTR) ;
     }
@@ -751,7 +751,7 @@
     if (iovcnt <= 0 || iovcnt > UIO_MAXIOV)
         return_errno(-1, EINVAL);
 
-    /* poll filedescriptor when not already in non-blocking operation */
+    /* poll filedescriptor if not already in non-blocking operation */
     if (pth_fdmode(fd, PTH_FDMODE_POLL) == PTH_FDMODE_BLOCK) {
 
         /* first directly poll filedescriptor for readability
@@ -764,7 +764,7 @@
         while ((n = pth_sc(select)(fd+1, &fds, NULL, NULL, &delay)) < 0
                && errno == EINTR) ;
 
-        /* when filedescriptor is still not readable,
+        /* if filedescriptor is still not readable,
            let thread sleep until it is or event occurs */
         if (n < 1) {
             ev = pth_event(PTH_EVENT_FD|PTH_UNTIL_FD_READABLE|PTH_MODE_STATIC, &ev_key, fd);
@@ -871,7 +871,7 @@
     /* force filedescriptor into non-blocking mode */
     fdmode = pth_fdmode(fd, PTH_FDMODE_NONBLOCK);
 
-    /* poll filedescriptor when not already in non-blocking operation */
+    /* poll filedescriptor if not already in non-blocking operation */
     if (fdmode != PTH_FDMODE_NONBLOCK) {
 
         /* init return value and number of bytes to write */
@@ -894,7 +894,7 @@
                && errno == EINTR) ;
 
         for (;;) {
-            /* when filedescriptor is still not writeable,
+            /* if filedescriptor is still not writeable,
                let thread sleep until it is or event occurs */
             if (n < 1) {
                 ev = pth_event(PTH_EVENT_FD|PTH_UNTIL_FD_WRITEABLE|PTH_MODE_STATIC, &ev_key, fd);
@@ -1151,7 +1151,7 @@
     if (nbytes == 0)
         return 0;
 
-    /* poll filedescriptor when not already in non-blocking operation */
+    /* poll filedescriptor if not already in non-blocking operation */
     if (pth_fdmode(fd, PTH_FDMODE_POLL) == PTH_FDMODE_BLOCK) {
 
         /* now directly poll filedescriptor for readability
@@ -1164,7 +1164,7 @@
         while ((n = pth_sc(select)(fd+1, &fds, NULL, NULL, &delay)) < 0
                && errno == EINTR) ;
 
-        /* when filedescriptor is still not readable,
+        /* if filedescriptor is still not readable,
            let thread sleep until it is or the extra event occurs */
         if (n < 1) {
             ev = pth_event(PTH_EVENT_FD|PTH_UNTIL_FD_READABLE|PTH_MODE_STATIC, &ev_key, fd);
@@ -1231,7 +1231,7 @@
     /* force filedescriptor into non-blocking mode */
     fdmode = pth_fdmode(fd, PTH_FDMODE_NONBLOCK);
 
-    /* poll filedescriptor when not already in non-blocking operation */
+    /* poll filedescriptor if not already in non-blocking operation */
     if (fdmode != PTH_FDMODE_NONBLOCK) {
 
         /* now directly poll filedescriptor for writeability
@@ -1246,7 +1246,7 @@
 
         rv = 0;
         for (;;) {
-            /* when filedescriptor is still not writeable,
+            /* if filedescriptor is still not writeable,
                let thread sleep until it is or event occurs */
             if (n < 1) {
                 ev = pth_event(PTH_EVENT_FD|PTH_UNTIL_FD_WRITEABLE|PTH_MODE_STATIC, &ev_key, fd);