diff options
author | Sebastian Rasmussen | 2016-05-29 23:11:53 +0200 |
---|---|---|
committer | Sebastian Rasmussen | 2016-05-31 23:40:21 +0200 |
commit | 9e93004171eb0c4c288051b2d7bb37f97a0ae430 (patch) | |
tree | 369493906bb3c1c6f2554609c737ada0230f4b2e /libsmartcols | |
parent | docs: Fix various typos (diff) | |
download | kernel-qcow2-util-linux-9e93004171eb0c4c288051b2d7bb37f97a0ae430.tar.gz kernel-qcow2-util-linux-9e93004171eb0c4c288051b2d7bb37f97a0ae430.tar.xz kernel-qcow2-util-linux-9e93004171eb0c4c288051b2d7bb37f97a0ae430.zip |
misc: Fix various typos
Fix various typos in error messages, warnings, debug strings,
comments and names of static functions.
Signed-off-by: Sebastian Rasmussen <sebras@gmail.com>
Diffstat (limited to 'libsmartcols')
-rw-r--r-- | libsmartcols/samples/continuous.c | 6 | ||||
-rw-r--r-- | libsmartcols/samples/title.c | 6 | ||||
-rw-r--r-- | libsmartcols/samples/tree.c | 6 | ||||
-rw-r--r-- | libsmartcols/samples/wrap.c | 6 | ||||
-rw-r--r-- | libsmartcols/src/smartcolsP.h | 2 | ||||
-rw-r--r-- | libsmartcols/src/symbols.c | 4 | ||||
-rw-r--r-- | libsmartcols/src/table.c | 6 | ||||
-rw-r--r-- | libsmartcols/src/table_print.c | 22 |
8 files changed, 29 insertions, 29 deletions
diff --git a/libsmartcols/samples/continuous.c b/libsmartcols/samples/continuous.c index 02efd5de9..6cd8b489c 100644 --- a/libsmartcols/samples/continuous.c +++ b/libsmartcols/samples/continuous.c @@ -40,7 +40,7 @@ static void setup_columns(struct libscols_table *tb) return; fail: scols_unref_table(tb); - err(EXIT_FAILURE, "faild to create output columns"); + err(EXIT_FAILURE, "failed to create output columns"); } static struct libscols_line *add_line(struct libscols_table *tb, size_t i) @@ -62,7 +62,7 @@ static struct libscols_line *add_line(struct libscols_table *tb, size_t i) return ln; fail: scols_unref_table(tb); - err(EXIT_FAILURE, "faild to create output line"); + err(EXIT_FAILURE, "failed to create output line"); } int main(int argc, char *argv[]) @@ -75,7 +75,7 @@ int main(int argc, char *argv[]) tb = scols_new_table(); if (!tb) - err(EXIT_FAILURE, "faild to create output table"); + err(EXIT_FAILURE, "failed to create output table"); setup_columns(tb); gettimeofday(&last, NULL); diff --git a/libsmartcols/samples/title.c b/libsmartcols/samples/title.c index ec72093cc..2cf4f8aba 100644 --- a/libsmartcols/samples/title.c +++ b/libsmartcols/samples/title.c @@ -33,7 +33,7 @@ static void setup_columns(struct libscols_table *tb) return; fail: scols_unref_table(tb); - err(EXIT_FAILURE, "faild to create output columns"); + err(EXIT_FAILURE, "failed to create output columns"); } static void add_line(struct libscols_table *tb, const char *name, const char *data) @@ -49,7 +49,7 @@ static void add_line(struct libscols_table *tb, const char *name, const char *da return; fail: scols_unref_table(tb); - err(EXIT_FAILURE, "faild to create output line"); + err(EXIT_FAILURE, "failed to create output line"); } int main(int argc, char *argv[]) @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) tb = scols_new_table(); if (!tb) - err(EXIT_FAILURE, "faild to create output table"); + err(EXIT_FAILURE, "failed to create output table"); scols_table_enable_colors(tb, 1); setup_columns(tb); diff --git a/libsmartcols/samples/tree.c b/libsmartcols/samples/tree.c index d2afc4717..868c456e4 100644 --- a/libsmartcols/samples/tree.c +++ b/libsmartcols/samples/tree.c @@ -39,7 +39,7 @@ static void setup_columns(struct libscols_table *tb, int notree) return; fail: scols_unref_table(tb); - err(EXIT_FAILURE, "faild to create output columns"); + err(EXIT_FAILURE, "failed to create output columns"); } /* add a new line to @tb, the content is based on @st */ @@ -104,7 +104,7 @@ fail: return -1; } -/* read all entrines from directory addressed by @fd */ +/* read all entries from directory addressed by @fd */ static int add_children(struct libscols_table *tb, struct libscols_line *ln, int fd) @@ -180,7 +180,7 @@ int main(int argc, char *argv[]) tb = scols_new_table(); if (!tb) - err(EXIT_FAILURE, "faild to create output table"); + err(EXIT_FAILURE, "failed to create output table"); while((c = getopt_long(argc, argv, "ciJlnprS:E:", longopts, NULL)) != -1) { switch(c) { diff --git a/libsmartcols/samples/wrap.c b/libsmartcols/samples/wrap.c index 96cdff31c..1da4c011b 100644 --- a/libsmartcols/samples/wrap.c +++ b/libsmartcols/samples/wrap.c @@ -39,7 +39,7 @@ static void setup_columns(struct libscols_table *tb) return; fail: scols_unref_table(tb); - err(EXIT_FAILURE, "faild to create output columns"); + err(EXIT_FAILURE, "failed to create output columns"); } static char *gen_text(const char *prefix, const char *sub_prefix, char *buf, size_t sz) @@ -76,7 +76,7 @@ static struct libscols_line * add_line( struct libscols_table *tb, return ln; fail: scols_unref_table(tb); - err(EXIT_FAILURE, "faild to create output line"); + err(EXIT_FAILURE, "failed to create output line"); } int main(int argc, char *argv[]) @@ -90,7 +90,7 @@ int main(int argc, char *argv[]) tb = scols_new_table(); if (!tb) - err(EXIT_FAILURE, "faild to create output table"); + err(EXIT_FAILURE, "failed to create output table"); scols_table_enable_colors(tb, 1); setup_columns(tb); diff --git a/libsmartcols/src/smartcolsP.h b/libsmartcols/src/smartcolsP.h index e29ec7d93..b3c8e7cfa 100644 --- a/libsmartcols/src/smartcolsP.h +++ b/libsmartcols/src/smartcolsP.h @@ -156,7 +156,7 @@ struct libscols_table { unsigned int ascii :1, /* don't use unicode */ colors_wanted :1, /* enable colors */ is_term :1, /* isatty() */ - maxout :1, /* maximalize output */ + maxout :1, /* maximize output */ header_printed :1, /* header already printed */ no_headings :1, /* don't print header */ no_linesep :1, /* don't print line separator */ diff --git a/libsmartcols/src/symbols.c b/libsmartcols/src/symbols.c index 947e32c83..df31f454c 100644 --- a/libsmartcols/src/symbols.c +++ b/libsmartcols/src/symbols.c @@ -108,7 +108,7 @@ int scols_symbols_set_right(struct libscols_symbols *sb, const char *str) * @sb: a pointer to a struct libscols_symbols instance * @str: a string which will represent the symbols which wraps title output * - * The current implemetation uses only the first byte from the padding string. + * The current implementation uses only the first byte from the padding string. * A multibyte chars are not supported yet. * * Returns: 0, a negative value in case of an error. @@ -124,7 +124,7 @@ int scols_symbols_set_title_padding(struct libscols_symbols *sb, const char *str * scols_copy_symbols: * @sb: a pointer to a struct libscols_symbols instance * - * Returns: a newly allocated copy of the @sb symbol group or NULL in caes of an error. + * Returns: a newly allocated copy of the @sb symbol group or NULL in case of an error. */ struct libscols_symbols *scols_copy_symbols(const struct libscols_symbols *sb) { diff --git a/libsmartcols/src/table.c b/libsmartcols/src/table.c index 809ad8200..f61d6b492 100644 --- a/libsmartcols/src/table.c +++ b/libsmartcols/src/table.c @@ -3,7 +3,7 @@ * * Copyright (C) 2010-2014 Karel Zak <kzak@redhat.com> * Copyright (C) 2014 Ondrej Oprala <ooprala@redhat.com> - * Copytight (C) 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> + * Copyright (C) 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> * * This file may be redistributed under the terms of the * GNU Lesser General Public License. @@ -375,7 +375,7 @@ FILE *scols_table_get_stream(struct libscols_table *tb) * If necessary then libsmartcols use all terminal width, the @reduce setting * provides extra space (for example for borders in ncurses applications). * - * The @reduce must be smaller than terminal width, otherwise it's sillently + * The @reduce must be smaller than terminal width, otherwise it's silently * ignored. The reduction is not applied when STDOUT_FILENO is not terminal. * * Returns: 0, a negative value in case of an error. @@ -702,7 +702,7 @@ int scols_table_set_symbols(struct libscols_table *tb, * @tb: table * @enable: 1 or 0 * - * Enable/disable line separator printing. This is usefull if you want to + * Enable/disable line separator printing. This is useful if you want to * re-printing the same line more than once (e.g. progress bar). Don't use it * if you're not sure. * diff --git a/libsmartcols/src/table_print.c b/libsmartcols/src/table_print.c index d86b06841..20b015344 100644 --- a/libsmartcols/src/table_print.c +++ b/libsmartcols/src/table_print.c @@ -210,7 +210,7 @@ static int has_pending_data(struct libscols_table *tb) return 0; } -/* print padding or asci-art instead of data of @cl */ +/* print padding or ASCII-art instead of data of @cl */ static void print_empty_cell(struct libscols_table *tb, struct libscols_column *cl, struct libscols_line *ln, /* optional */ @@ -218,7 +218,7 @@ static void print_empty_cell(struct libscols_table *tb, { size_t len_pad = 0; /* in screen cells as opposed to bytes */ - /* generate tree asci-art rather than padding */ + /* generate tree ASCII-art rather than padding */ if (ln && scols_column_is_tree(cl)) { if (!ln->parent) { /* only print symbols->vert if followed by child */ @@ -1017,7 +1017,7 @@ done: } /* - * This is core of the scols_* voodo... + * This is core of the scols_* voodoo... */ static int recount_widths(struct libscols_table *tb, struct libscols_buffer *buf) { @@ -1096,7 +1096,7 @@ static int recount_widths(struct libscols_table *tb, struct libscols_buffer *buf if (!cl->is_extreme) continue; - /* this column is tooo large, ignore? + /* this column is too large, ignore? if (cl->width_max - cl->width > (tb->termwidth - width)) continue; @@ -1171,7 +1171,7 @@ static int recount_widths(struct libscols_table *tb, struct libscols_buffer *buf if (cl->width == cl->width_min) continue; - DBG(TAB, ul_debugobj(tb, " tring to reduce: %s (width=%zu)", cl->header.data, cl->width)); + DBG(TAB, ul_debugobj(tb, " trying to reduce: %s (width=%zu)", cl->header.data, cl->width)); /* truncate column with relative sizes */ if (cl->width_hint < 1 && cl->width > 0 && width > 0 && @@ -1238,14 +1238,14 @@ static size_t strlen_line(struct libscols_line *ln) return sz; } -static int initialize_printting(struct libscols_table *tb, struct libscols_buffer **buf) +static int initialize_printing(struct libscols_table *tb, struct libscols_buffer **buf) { size_t bufsz, extra_bufsz = 0; struct libscols_line *ln; struct libscols_iter itr; int rc; - DBG(TAB, ul_debugobj(tb, "initialize printting")); + DBG(TAB, ul_debugobj(tb, "initialize printing")); if (!tb->symbols) scols_table_set_symbols(tb, NULL); /* use default */ @@ -1324,7 +1324,7 @@ err: /** * scola_table_print_range: * @tb: table - * @start: first printed line or NULL to print from the beggin of the table + * @start: first printed line or NULL to print from the begin of the table * @end: last printed line or NULL to print all from start. * * If the start is the first line in the table than prints table header too. @@ -1345,7 +1345,7 @@ int scols_table_print_range( struct libscols_table *tb, DBG(TAB, ul_debugobj(tb, "printing range")); - rc = initialize_printting(tb, &buf); + rc = initialize_printing(tb, &buf); if (rc) return rc; @@ -1431,12 +1431,12 @@ int scols_print_table(struct libscols_table *tb) DBG(TAB, ul_debugobj(tb, "printing")); if (list_empty(&tb->tb_lines)) { - DBG(TAB, ul_debugobj(tb, "ignore -- epmty table")); + DBG(TAB, ul_debugobj(tb, "ignore -- empty table")); return 0; } tb->header_printed = 0; - rc = initialize_printting(tb, &buf); + rc = initialize_printing(tb, &buf); if (rc) return rc; |