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
1=== modified file 'nih/config.c'
2--- nih/config.c 2011-01-06 09:28:39 +0000
3+++ nih/config.c 2011-08-26 16:18:31 +0000
4@@ -714,7 +714,7 @@
5 * @lineno: line number,
6 * @type: block identifier.
7 *
8- * Extracts a block of text from @line, stopping when the pharse "end @type"
9+ * Extracts a block of text from @line, stopping when the phrase "end @type"
10 * is encountered without any quotes or blackslash escaping within it.
11 *
12 * @file may be a memory mapped file, in which case @pos should be given
13
14=== modified file 'nih/error.h'
15--- nih/error.h 2009-07-03 11:49:13 +0000
16+++ nih/error.h 2011-08-26 16:18:31 +0000
17@@ -111,7 +111,7 @@
18 * @message: human-readable message.
19 *
20 * Raises an error with the given details in the current error context,
21- * if an unhandled error already exists then an error message is emmitted
22+ * if an unhandled error already exists then an error message is emitted
23 * through the logging system; you should try to avoid this.
24 *
25 * @message should be a static string, as it will not be freed when the
26@@ -126,7 +126,7 @@
27 * @format: format string for human-readable message.
28 *
29 * Raises an error with the given details in the current error context,
30- * if an unhandled error already exists then an error message is emmitted
31+ * if an unhandled error already exists then an error message is emitted
32 * through the logging system; you should try to avoid this.
33 *
34 * The human-readable message for the error is parsed according to @format,
35@@ -140,7 +140,7 @@
36 * nih_error_raise_system:
37 *
38 * Raises an error with details taken from the current value of errno,
39- * if an unhandled error already exists then an error message is emmitted
40+ * if an unhandled error already exists then an error message is emitted
41 * through the logging system; you should try to avoid this.
42 **/
43 #define nih_error_raise_system() \
44@@ -162,7 +162,7 @@
45 * @error: existing object to raise.
46 *
47 * Raises the existing error object in the current error context,
48- * if an unhandled error already exists then an error message is emmitted
49+ * if an unhandled error already exists then an error message is emitted
50 * through the logging system; you should try to avoid this.
51 *
52 * This is normally used to raise a taken error that has not been handled,
53@@ -182,7 +182,7 @@
54 * @message: human-readable message.
55 *
56 * Raises an error with the given details in the current error context,
57- * if an unhandled error already exists then an error message is emmitted
58+ * if an unhandled error already exists then an error message is emitted
59 * through the logging system; you should try to avoid this.
60 *
61 * Will return from the current function with @retval, which may be left
62@@ -199,7 +199,7 @@
63 * @retval: return value for function.
64 *
65 * Raises an error with details taken from the current value of errno,
66- * if an unhandled error already exists then an error message is emmitted
67+ * if an unhandled error already exists then an error message is emitted
68 * through the logging system; you should try to avoid this.
69 *
70 * Will return from the current function with @retval, which may be left
71
72=== modified file 'nih/io.c'
73--- nih/io.c 2009-08-03 23:29:41 +0000
74+++ nih/io.c 2011-08-26 16:18:31 +0000
75@@ -901,7 +901,7 @@
76 * read and placed into the receive buffer or queue, and the reader function
77 * is called if set.
78 *
79- * Any data or messaages in the send buffer or queue are written out if the
80+ * Any data or messages in the send buffer or queue are written out if the
81 * @events includes NIH_IO_WRITE.
82 *
83 * Errors are handled when data is read, and result in the error handled
84@@ -1211,7 +1211,7 @@
85 * This function is called when the local end of a file descriptor being
86 * managed by NihIo should be closed. Usually this is because the remote
87 * end has been closed (without error) but it can also be because no
88- * error handler was given
89+ * error handler was given.
90 *
91 * Normally this just calls the close handler, or if not available, it
92 * closes the file descriptor and frees the structure (which may be
93@@ -1291,7 +1291,7 @@
94 * @io: structure to be destroyed.
95 *
96 * Closes the file descriptor associated with an NihIo structure so that
97- * the structure can be freed. IF an error is caught by closing the
98+ * the structure can be freed. If an error is caught by closing the
99 * descriptor, the error handler is called instead of the error being raised;
100 * this allows you to group your error handling in one place rather than
101 * special-case close.
102
103=== modified file 'nih/test_files.h'
104--- nih/test_files.h 2009-06-30 10:49:15 +0000
105+++ nih/test_files.h 2011-08-26 16:18:31 +0000
106@@ -39,7 +39,7 @@
107 * TEST_FILENAME:
108 * @_var: variable to store filename in.
109 *
110- * Generate a filename that may be used for testing, it's unlinked it if
111+ * Generate a filename that may be used for testing, it's unlinked if it
112 * exists and it's up to you to unlink it when done. @_var should be at
113 * least PATH_MAX long.
114 **/

Subscribers

People subscribed via source and target branches