| Message ID | 1405531620-9983-5-git-send-email-elder@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Wed 2014-07-16 12:27:00, Alex Elder wrote: > This patch corrects a few more typographical errors in "printk.c". > > Signed-off-by: Alex Elder <elder@linaro.org> > --- > kernel/printk/printk.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c > index 3f15d95..0cbd060 100644 > --- a/kernel/printk/printk.c > +++ b/kernel/printk/printk.c > @@ -201,7 +201,7 @@ static int console_may_schedule; > * > * The optional key/value pairs are attached as continuation lines starting > * with a space character and terminated by a newline. All possible > - * non-prinatable characters are escaped in the "\xff" notation. > + * non-printable characters are escaped in the "\xff" notation. > * > * Users of the export format should ignore possible additional values > * separated by ',', and find the message after the ';' character. > @@ -411,7 +411,7 @@ static int log_store(int facility, int level, > /* truncate the message if it is too long for empty buffer */ > size = truncate_msg(&text_len, &trunc_msg_len, > &dict_len, &pad_len); > - /* survive when the log buffer is too small for trunc_msg */ > + /* survive when the log buffer is too small for truncate_msg */ It meant the trunc_msg = "<truncated>" string. So, the original text was more precise. I agree that it is a bit confusing :-) The other changes look correct. Best Regards, Petr > if (log_make_free_space(size)) > return 0; > } > @@ -614,7 +614,7 @@ static ssize_t devkmsg_read(struct file *file, char __user *buf, > /* > * If we couldn't merge continuation line fragments during the print, > * export the stored flags to allow an optional external merge of the > - * records. Merging the records isn't always neccessarily correct, like > + * records. Merging the records isn't always necessarily correct, like > * when we hit a race during printing. In most cases though, it produces > * better readable output. 'c' in the record flags mark the first > * fragment of a line, '+' the following. > @@ -2881,7 +2881,7 @@ bool kmsg_dump_get_buffer(struct kmsg_dumper *dumper, bool syslog, > prev = msg->flags; > } > > - /* last message in next interation */ > + /* last message in next iteration */ > next_seq = seq; > next_idx = idx; > > @@ -2907,7 +2907,7 @@ out: > EXPORT_SYMBOL_GPL(kmsg_dump_get_buffer); > > /** > - * kmsg_dump_rewind_nolock - reset the interator (unlocked version) > + * kmsg_dump_rewind_nolock - reset the iterator (unlocked version) > * @dumper: registered kmsg dumper > * > * Reset the dumper's iterator so that kmsg_dump_get_line() and > @@ -2925,7 +2925,7 @@ void kmsg_dump_rewind_nolock(struct kmsg_dumper *dumper) > } > > /** > - * kmsg_dump_rewind - reset the interator > + * kmsg_dump_rewind - reset the iterator > * @dumper: registered kmsg dumper > * > * Reset the dumper's iterator so that kmsg_dump_get_line() and > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On 07/17/2014 06:46 AM, Petr Mládek wrote: > On Wed 2014-07-16 12:27:00, Alex Elder wrote: >> This patch corrects a few more typographical errors in "printk.c". >> >> Signed-off-by: Alex Elder <elder@linaro.org> >> --- >> kernel/printk/printk.c | 12 ++++++------ >> 1 file changed, 6 insertions(+), 6 deletions(-) >> >> diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c >> index 3f15d95..0cbd060 100644 >> --- a/kernel/printk/printk.c >> +++ b/kernel/printk/printk.c >> @@ -201,7 +201,7 @@ static int console_may_schedule; >> * >> * The optional key/value pairs are attached as continuation lines starting >> * with a space character and terminated by a newline. All possible >> - * non-prinatable characters are escaped in the "\xff" notation. >> + * non-printable characters are escaped in the "\xff" notation. >> * >> * Users of the export format should ignore possible additional values >> * separated by ',', and find the message after the ';' character. >> @@ -411,7 +411,7 @@ static int log_store(int facility, int level, >> /* truncate the message if it is too long for empty buffer */ >> size = truncate_msg(&text_len, &trunc_msg_len, >> &dict_len, &pad_len); >> - /* survive when the log buffer is too small for trunc_msg */ >> + /* survive when the log buffer is too small for truncate_msg */ > > It meant the trunc_msg = "<truncated>" string. So, the original text > was more precise. I agree that it is a bit confusing :-) Oh, I see now. No it's not confusing, it's just that right here trunc_msg[] is not mentioned--that's buried inside truncate_msg(). I don't feel strongly about this one, I'll drop this hunk. -Alex > The other changes look correct. > > Best Regards, > Petr > >> if (log_make_free_space(size)) >> return 0; >> } >> @@ -614,7 +614,7 @@ static ssize_t devkmsg_read(struct file *file, char __user *buf, >> /* >> * If we couldn't merge continuation line fragments during the print, >> * export the stored flags to allow an optional external merge of the >> - * records. Merging the records isn't always neccessarily correct, like >> + * records. Merging the records isn't always necessarily correct, like >> * when we hit a race during printing. In most cases though, it produces >> * better readable output. 'c' in the record flags mark the first >> * fragment of a line, '+' the following. >> @@ -2881,7 +2881,7 @@ bool kmsg_dump_get_buffer(struct kmsg_dumper *dumper, bool syslog, >> prev = msg->flags; >> } >> >> - /* last message in next interation */ >> + /* last message in next iteration */ >> next_seq = seq; >> next_idx = idx; >> >> @@ -2907,7 +2907,7 @@ out: >> EXPORT_SYMBOL_GPL(kmsg_dump_get_buffer); >> >> /** >> - * kmsg_dump_rewind_nolock - reset the interator (unlocked version) >> + * kmsg_dump_rewind_nolock - reset the iterator (unlocked version) >> * @dumper: registered kmsg dumper >> * >> * Reset the dumper's iterator so that kmsg_dump_get_line() and >> @@ -2925,7 +2925,7 @@ void kmsg_dump_rewind_nolock(struct kmsg_dumper *dumper) >> } >> >> /** >> - * kmsg_dump_rewind - reset the interator >> + * kmsg_dump_rewind - reset the iterator >> * @dumper: registered kmsg dumper >> * >> * Reset the dumper's iterator so that kmsg_dump_get_line() and >> -- >> 1.9.1 >> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 3f15d95..0cbd060 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -201,7 +201,7 @@ static int console_may_schedule; * * The optional key/value pairs are attached as continuation lines starting * with a space character and terminated by a newline. All possible - * non-prinatable characters are escaped in the "\xff" notation. + * non-printable characters are escaped in the "\xff" notation. * * Users of the export format should ignore possible additional values * separated by ',', and find the message after the ';' character. @@ -411,7 +411,7 @@ static int log_store(int facility, int level, /* truncate the message if it is too long for empty buffer */ size = truncate_msg(&text_len, &trunc_msg_len, &dict_len, &pad_len); - /* survive when the log buffer is too small for trunc_msg */ + /* survive when the log buffer is too small for truncate_msg */ if (log_make_free_space(size)) return 0; } @@ -614,7 +614,7 @@ static ssize_t devkmsg_read(struct file *file, char __user *buf, /* * If we couldn't merge continuation line fragments during the print, * export the stored flags to allow an optional external merge of the - * records. Merging the records isn't always neccessarily correct, like + * records. Merging the records isn't always necessarily correct, like * when we hit a race during printing. In most cases though, it produces * better readable output. 'c' in the record flags mark the first * fragment of a line, '+' the following. @@ -2881,7 +2881,7 @@ bool kmsg_dump_get_buffer(struct kmsg_dumper *dumper, bool syslog, prev = msg->flags; } - /* last message in next interation */ + /* last message in next iteration */ next_seq = seq; next_idx = idx; @@ -2907,7 +2907,7 @@ out: EXPORT_SYMBOL_GPL(kmsg_dump_get_buffer); /** - * kmsg_dump_rewind_nolock - reset the interator (unlocked version) + * kmsg_dump_rewind_nolock - reset the iterator (unlocked version) * @dumper: registered kmsg dumper * * Reset the dumper's iterator so that kmsg_dump_get_line() and @@ -2925,7 +2925,7 @@ void kmsg_dump_rewind_nolock(struct kmsg_dumper *dumper) } /** - * kmsg_dump_rewind - reset the interator + * kmsg_dump_rewind - reset the iterator * @dumper: registered kmsg dumper * * Reset the dumper's iterator so that kmsg_dump_get_line() and
This patch corrects a few more typographical errors in "printk.c". Signed-off-by: Alex Elder <elder@linaro.org> --- kernel/printk/printk.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)