diff options
| author | Jonathan Neuschäfer <j.neuschaefer@gmx.net> | 2011-08-15 22:10:09 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-08-20 18:36:33 +0200 |
| commit | c0eaf0fad88f15c843098a43ca2cadbf009ce094 (patch) | |
| tree | 7b129c5055ded1aa400d34409d64bbab363b3e9e /libpipe | |
| parent | 5a3976828225947d333ff2326d04f8b20e48e072 (diff) | |
fix common misspellings
* Fix spelling with codespell[1] and manually review it.
[1] http://git.profusion.mobi/cgit.cgi/lucas/codespell/
Diffstat (limited to 'libpipe')
| -rw-r--r-- | libpipe/pipe.h | 6 | ||||
| -rw-r--r-- | libpipe/pq.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libpipe/pipe.h b/libpipe/pipe.h index d6c5ae8f..701cc918 100644 --- a/libpipe/pipe.h +++ b/libpipe/pipe.h @@ -98,7 +98,7 @@ struct pipe PACKET_TYPE_CONTROL. Each data packet represents one datagram for protocols that maintain record boundaries. Control packets always represent the control information to be returned from one read - operation, and will be returned in conjuction with the following data + operation, and will be returned in conjunction with the following data packet (if any). Reads interested only in data just skip control packets until they find a data packet. */ struct pq *queue; @@ -139,7 +139,7 @@ pipe_is_readable (struct pipe *pipe, int data_only) return (packet != NULL); } -/* Waits for PIPE to be readable, or an error to occurr. If NOBLOCK is true, +/* Waits for PIPE to be readable, or an error to occur. If NOBLOCK is true, this operation will return EWOULDBLOCK instead of blocking when no data is immediately available. If DATA_ONLY is true, then `control' packets are ignored. */ @@ -156,7 +156,7 @@ pipe_wait_readable (struct pipe *pipe, int noblock, int data_only) return 0; } -/* Waits for PIPE to be readable, or an error to occurr. This call only +/* Waits for PIPE to be readable, or an error to occur. This call only returns once threads waiting using pipe_wait_readable have been woken and given a chance to read, and if there is still data available thereafter. If DATA_ONLY is true, then `control' packets are ignored. */ diff --git a/libpipe/pq.h b/libpipe/pq.h index 3a26aa80..2f8311ef 100644 --- a/libpipe/pq.h +++ b/libpipe/pq.h @@ -219,8 +219,8 @@ pq_tail (struct pq *pq, unsigned type, void *source) int pq_dequeue (struct pq *pq); /* Returns the next available packet in PQ, without removing it from the - queue, or NULL if there is none, or the next packet isn't appropiate. - A packet is inappropiate if SOURCE is non-NULL its source field doesn't + queue, or NULL if there is none, or the next packet isn't appropriate. + A packet is inappropriate if SOURCE is non-NULL its source field doesn't match it, or TYPE is non-NULL and the packet's type field doesn't match it. */ PQ_EI struct packet * |