Skip to content

Commit 8b58ed7

Browse files
Cruz Monrreal IICruz Monrreal II
authored andcommitted
Merge branch 'kegilbert-patch-6' of ssh://github.com/ARMmbed/mbed-os into rollup
2 parents 76008d2 + 9ab13df commit 8b58ed7

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

platform/FileHandle.h

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace mbed {
3636
/** Class FileHandle
3737
*
3838
* An abstract interface that represents operations on a file-like
39-
* object. The core functions are read, write, and seek, but only
39+
* object. The core functions are read, write and seek, but only
4040
* a subset of these operations can be provided.
4141
*
4242
* @note to create a file, @see File
@@ -50,7 +50,7 @@ class FileHandle : private NonCopyable<FileHandle> {
5050
*
5151
* Devices acting as FileHandles should follow POSIX semantics:
5252
*
53-
* * if no data is available, and non-blocking set return -EAGAIN
53+
* * if no data is available, and nonblocking set, return -EAGAIN
5454
* * if no data is available, and blocking set, wait until some data is available
5555
* * If any data is available, call returns immediately
5656
*
@@ -65,8 +65,8 @@ class FileHandle : private NonCopyable<FileHandle> {
6565
* Devices acting as FileHandles should follow POSIX semantics:
6666
*
6767
* * if blocking, block until all data is written
68-
* * if no data can be written, and non-blocking set, return -EAGAIN
69-
* * if some data can be written, and non-blocking set, write partial
68+
* * if no data can be written, and nonblocking set, return -EAGAIN
69+
* * if some data can be written, and nonblocking set, write partial
7070
*
7171
* @param buffer The buffer to write from
7272
* @param size The number of bytes to write
@@ -181,11 +181,11 @@ class FileHandle : private NonCopyable<FileHandle> {
181181
return size();
182182
}
183183

184-
/** Set blocking or non-blocking mode of the file operation like read/write.
185-
* Definition depends upon the subclass implementing FileHandle.
184+
/** Set blocking or nonblocking mode of the file operation like read/write.
185+
* Definition depends on the subclass implementing FileHandle.
186186
* The default is blocking.
187187
*
188-
* @param blocking true for blocking mode, false for non-blocking mode.
188+
* @param blocking true for blocking mode, false for nonblocking mode.
189189
*
190190
* @return 0 on success
191191
* @return Negative error code on failure
@@ -195,19 +195,19 @@ class FileHandle : private NonCopyable<FileHandle> {
195195
return blocking ? 0 : -ENOTTY;
196196
}
197197

198-
/** Check current blocking or non-blocking mode for file operations.
198+
/** Check current blocking or nonblocking mode for file operations.
199199
*
200-
* @return true for blocking mode, false for non-blocking mode.
200+
* @return true for blocking mode, false for nonblocking mode.
201201
*/
202202
virtual bool is_blocking() const
203203
{
204204
return true;
205205
}
206206

207207
/** Check for poll event flags
208-
* The input parameter can be used or ignored - the could always return all events,
209-
* or could check just the events listed in events.
210-
* Call is non-blocking - returns instantaneous state of events.
208+
* You can use or ignore the input parameter. You can return all events
209+
* or check just the events listed in events.
210+
* Call is nonblocking - returns instantaneous state of events.
211211
* Whenever an event occurs, the derived class should call the sigio() callback).
212212
*
213213
* @param events bitmask of poll events we're interested in - POLLIN/POLLOUT etc.
@@ -220,7 +220,7 @@ class FileHandle : private NonCopyable<FileHandle> {
220220
return POLLIN | POLLOUT;
221221
}
222222

223-
/** Definition depends upon the subclass implementing FileHandle.
223+
/** Definition depends on the subclass implementing FileHandle.
224224
* For example, if the FileHandle is of type Stream, writable() could return
225225
* true when there is ample buffer space available for write() calls.
226226
*
@@ -231,7 +231,7 @@ class FileHandle : private NonCopyable<FileHandle> {
231231
return poll(POLLOUT) & POLLOUT;
232232
}
233233

234-
/** Definition depends upon the subclass implementing FileHandle.
234+
/** Definition depends on the subclass implementing FileHandle.
235235
* For example, if the FileHandle is of type Stream, readable() could return
236236
* true when there is something available to read.
237237
*
@@ -250,11 +250,11 @@ class FileHandle : private NonCopyable<FileHandle> {
250250
* The callback may be called in an interrupt context and should not
251251
* perform expensive operations.
252252
*
253-
* Note! This is not intended as an attach-like asynchronous api, but rather
254-
* as a building block for constructing such functionality.
253+
* Note! This is not intended as an attach-like asynchronous API, but rather
254+
* as a building block for constructing such functionality.
255255
*
256256
* The exact timing of when the registered function
257-
* is called is not guaranteed and susceptible to change. It should be used
257+
* is called is not guaranteed and is susceptible to change. It should be used
258258
* as a cue to make read/write/poll calls to find the current state.
259259
*
260260
* @param func Function to call on state change

0 commit comments

Comments
 (0)