Merge lp:~jamesodhunt/libnih/typos-2608201 into lp:libnih

Proposed by James Hunt on 2011-08-26
Status: Merged
Approved by: Scott James Remnant on 2011-08-26
Approved revision: 1050
Merged at revision: 1050
Proposed branch: lp:~jamesodhunt/libnih/typos-2608201
Merge into: lp:libnih
Diff against target: 114 lines (+11/-11)
4 files modified
nih/config.c (+1/-1)
nih/error.h (+6/-6)
nih/io.c (+3/-3)
nih/test_files.h (+1/-1)
To merge this branch: bzr merge lp:~jamesodhunt/libnih/typos-2608201
Reviewer Review Type Date Requested Status
Scott James Remnant 2011-08-26 Approve on 2011-08-26
Review via email: mp+73074@code.launchpad.net

Description of the change

* Typo fixes.

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'nih/config.c'
--- nih/config.c 2011-01-06 09:28:39 +0000
+++ nih/config.c 2011-08-26 16:18:31 +0000
@@ -714,7 +714,7 @@
714 * @lineno: line number,714 * @lineno: line number,
715 * @type: block identifier.715 * @type: block identifier.
716 *716 *
717 * Extracts a block of text from @line, stopping when the pharse "end @type"717 * Extracts a block of text from @line, stopping when the phrase "end @type"
718 * is encountered without any quotes or blackslash escaping within it.718 * is encountered without any quotes or blackslash escaping within it.
719 *719 *
720 * @file may be a memory mapped file, in which case @pos should be given720 * @file may be a memory mapped file, in which case @pos should be given
721721
=== modified file 'nih/error.h'
--- nih/error.h 2009-07-03 11:49:13 +0000
+++ nih/error.h 2011-08-26 16:18:31 +0000
@@ -111,7 +111,7 @@
111 * @message: human-readable message.111 * @message: human-readable message.
112 *112 *
113 * Raises an error with the given details in the current error context,113 * Raises an error with the given details in the current error context,
114 * if an unhandled error already exists then an error message is emmitted114 * if an unhandled error already exists then an error message is emitted
115 * through the logging system; you should try to avoid this.115 * through the logging system; you should try to avoid this.
116 *116 *
117 * @message should be a static string, as it will not be freed when the117 * @message should be a static string, as it will not be freed when the
@@ -126,7 +126,7 @@
126 * @format: format string for human-readable message.126 * @format: format string for human-readable message.
127 *127 *
128 * Raises an error with the given details in the current error context,128 * Raises an error with the given details in the current error context,
129 * if an unhandled error already exists then an error message is emmitted129 * if an unhandled error already exists then an error message is emitted
130 * through the logging system; you should try to avoid this.130 * through the logging system; you should try to avoid this.
131 *131 *
132 * The human-readable message for the error is parsed according to @format,132 * The human-readable message for the error is parsed according to @format,
@@ -140,7 +140,7 @@
140 * nih_error_raise_system:140 * nih_error_raise_system:
141 *141 *
142 * Raises an error with details taken from the current value of errno,142 * Raises an error with details taken from the current value of errno,
143 * if an unhandled error already exists then an error message is emmitted143 * if an unhandled error already exists then an error message is emitted
144 * through the logging system; you should try to avoid this.144 * through the logging system; you should try to avoid this.
145 **/145 **/
146#define nih_error_raise_system() \146#define nih_error_raise_system() \
@@ -162,7 +162,7 @@
162 * @error: existing object to raise.162 * @error: existing object to raise.
163 *163 *
164 * Raises the existing error object in the current error context,164 * Raises the existing error object in the current error context,
165 * if an unhandled error already exists then an error message is emmitted165 * if an unhandled error already exists then an error message is emitted
166 * through the logging system; you should try to avoid this.166 * through the logging system; you should try to avoid this.
167 *167 *
168 * This is normally used to raise a taken error that has not been handled,168 * This is normally used to raise a taken error that has not been handled,
@@ -182,7 +182,7 @@
182 * @message: human-readable message.182 * @message: human-readable message.
183 *183 *
184 * Raises an error with the given details in the current error context,184 * Raises an error with the given details in the current error context,
185 * if an unhandled error already exists then an error message is emmitted185 * if an unhandled error already exists then an error message is emitted
186 * through the logging system; you should try to avoid this.186 * through the logging system; you should try to avoid this.
187 *187 *
188 * Will return from the current function with @retval, which may be left188 * Will return from the current function with @retval, which may be left
@@ -199,7 +199,7 @@
199 * @retval: return value for function.199 * @retval: return value for function.
200 *200 *
201 * Raises an error with details taken from the current value of errno,201 * Raises an error with details taken from the current value of errno,
202 * if an unhandled error already exists then an error message is emmitted202 * if an unhandled error already exists then an error message is emitted
203 * through the logging system; you should try to avoid this.203 * through the logging system; you should try to avoid this.
204 *204 *
205 * Will return from the current function with @retval, which may be left205 * Will return from the current function with @retval, which may be left
206206
=== modified file 'nih/io.c'
--- nih/io.c 2009-08-03 23:29:41 +0000
+++ nih/io.c 2011-08-26 16:18:31 +0000
@@ -901,7 +901,7 @@
901 * read and placed into the receive buffer or queue, and the reader function901 * read and placed into the receive buffer or queue, and the reader function
902 * is called if set.902 * is called if set.
903 *903 *
904 * Any data or messaages in the send buffer or queue are written out if the904 * Any data or messages in the send buffer or queue are written out if the
905 * @events includes NIH_IO_WRITE.905 * @events includes NIH_IO_WRITE.
906 *906 *
907 * Errors are handled when data is read, and result in the error handled907 * Errors are handled when data is read, and result in the error handled
@@ -1211,7 +1211,7 @@
1211 * This function is called when the local end of a file descriptor being1211 * This function is called when the local end of a file descriptor being
1212 * managed by NihIo should be closed. Usually this is because the remote1212 * managed by NihIo should be closed. Usually this is because the remote
1213 * end has been closed (without error) but it can also be because no1213 * end has been closed (without error) but it can also be because no
1214 * error handler was given1214 * error handler was given.
1215 *1215 *
1216 * Normally this just calls the close handler, or if not available, it1216 * Normally this just calls the close handler, or if not available, it
1217 * closes the file descriptor and frees the structure (which may be1217 * closes the file descriptor and frees the structure (which may be
@@ -1291,7 +1291,7 @@
1291 * @io: structure to be destroyed.1291 * @io: structure to be destroyed.
1292 *1292 *
1293 * Closes the file descriptor associated with an NihIo structure so that1293 * Closes the file descriptor associated with an NihIo structure so that
1294 * the structure can be freed. IF an error is caught by closing the1294 * the structure can be freed. If an error is caught by closing the
1295 * descriptor, the error handler is called instead of the error being raised;1295 * descriptor, the error handler is called instead of the error being raised;
1296 * this allows you to group your error handling in one place rather than1296 * this allows you to group your error handling in one place rather than
1297 * special-case close.1297 * special-case close.
12981298
=== modified file 'nih/test_files.h'
--- nih/test_files.h 2009-06-30 10:49:15 +0000
+++ nih/test_files.h 2011-08-26 16:18:31 +0000
@@ -39,7 +39,7 @@
39 * TEST_FILENAME:39 * TEST_FILENAME:
40 * @_var: variable to store filename in.40 * @_var: variable to store filename in.
41 *41 *
42 * Generate a filename that may be used for testing, it's unlinked it if42 * Generate a filename that may be used for testing, it's unlinked if it
43 * exists and it's up to you to unlink it when done. @_var should be at43 * exists and it's up to you to unlink it when done. @_var should be at
44 * least PATH_MAX long.44 * least PATH_MAX long.
45 **/45 **/

Subscribers

People subscribed via source and target branches