/[winpt]/trunk/MyGPGME/w32-io.c
ViewVC logotype

Diff of /trunk/MyGPGME/w32-io.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2 by twoaday, Mon Jan 31 11:02:21 2005 UTC revision 21 by twoaday, Wed Jul 27 11:17:44 2005 UTC
# Line 170  reader (void *arg) Line 170  reader (void *arg)
170              break;              break;
171          }          }
172          nbytes = (c->readpos + READBUF_SIZE - c->writepos-1) % READBUF_SIZE;          nbytes = (c->readpos + READBUF_SIZE - c->writepos-1) % READBUF_SIZE;
173          if ( nbytes > READBUF_SIZE - c->writepos )          if (nbytes > READBUF_SIZE - c->writepos)
174              nbytes = READBUF_SIZE - c->writepos;              nbytes = READBUF_SIZE - c->writepos;
175          UNLOCK (c->mutex);          UNLOCK (c->mutex);
176    
# Line 392  _gpgme_io_read ( int fd, void *buffer, s Line 392  _gpgme_io_read ( int fd, void *buffer, s
392      memcpy (buffer, c->buffer+c->readpos, nread);      memcpy (buffer, c->buffer+c->readpos, nread);
393      c->readpos = (c->readpos + nread) % READBUF_SIZE;      c->readpos = (c->readpos + nread) % READBUF_SIZE;
394      if (c->readpos == c->writepos && !c->eof) {      if (c->readpos == c->writepos && !c->eof) {
395          if ( !ResetEvent (c->have_data_ev) )          if (!ResetEvent (c->have_data_ev))
396              DEBUG1 ("ResetEvent failed: ec=%d\n", (int)GetLastError ());              DEBUG1 ("ResetEvent failed: ec=%d\n", (int)GetLastError ());
397      }      }
398      if (!SetEvent (c->have_space_ev))      if (!SetEvent (c->have_space_ev))
399          DEBUG1 ("SetEvent failed: ec=%d\n", (int)GetLastError ());          DEBUG1 ("SetEvent failed: ec=%d\n", (int)GetLastError ());
400      UNLOCK (c->mutex);      UNLOCK (c->mutex);
401    
402      DEBUG2 ("fd %d: got %d bytes\n", fd, nread );      DEBUG2 ("fd %d: got %d bytes\n", fd, nread);
403    
404      return nread;      return nread;
405  }  }
# Line 1099  _gpgme_io_select (struct io_select_fd_s Line 1099  _gpgme_io_select (struct io_select_fd_s
1099              int k, j = handle_to_fd (waitbuf[i]);              int k, j = handle_to_fd (waitbuf[i]);
1100                                            
1101              DEBUG1 ("WFMO invalid handle %d removed\n", j);              DEBUG1 ("WFMO invalid handle %d removed\n", j);
1102              for (k=0 ; k < nfds; i++ ) {              for (k=0 ; k < nfds; k++ ) {
1103                  if ( fds[k].fd == j ) {                  if ( fds[k].fd == j ) {
1104                      fds[k].for_read = fds[k].for_write = 0;                                                          fds[k].for_read = fds[k].for_write = 0;                                    
1105                      goto restart;                      goto restart;
Legend:
Removed from v.2  
changed lines
  Added in v.21
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26