summaryrefslogtreecommitdiff
path: root/libpipe/pipe.h
diff options
context:
space:
mode:
authorJonathan Neuschäfer <j.neuschaefer@gmx.net>2011-08-15 22:10:09 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2011-08-20 18:36:33 +0200
commitc0eaf0fad88f15c843098a43ca2cadbf009ce094 (patch)
tree7b129c5055ded1aa400d34409d64bbab363b3e9e /libpipe/pipe.h
parent5a3976828225947d333ff2326d04f8b20e48e072 (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/pipe.h')
-rw-r--r--libpipe/pipe.h6
1 files changed, 3 insertions, 3 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. */