diff options
author | Jonathan Neuschäfer <j.neuschaefer@gmx.net> | 2011-08-15 22:10:09 +0200 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-08-20 18:36:33 +0200 |
commit | c0eaf0fad88f15c843098a43ca2cadbf009ce094 (patch) | |
tree | 7b129c5055ded1aa400d34409d64bbab363b3e9e /console-client | |
parent | 5a3976828225947d333ff2326d04f8b20e48e072 (diff) |
fix common misspellings
* Fix spelling with codespell[1] and manually review it.
[1] http://git.profusion.mobi/cgit.cgi/lucas/codespell/
Diffstat (limited to 'console-client')
-rw-r--r-- | console-client/bdf.c | 4 | ||||
-rw-r--r-- | console-client/bdf.h | 8 | ||||
-rw-r--r-- | console-client/driver.c | 2 | ||||
-rw-r--r-- | console-client/ncursesw.c | 2 | ||||
-rw-r--r-- | console-client/pc-kbd.c | 6 | ||||
-rw-r--r-- | console-client/vga-dynacolor.c | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/console-client/bdf.c b/console-client/bdf.c index 30501f4a..f62a2473 100644 --- a/console-client/bdf.c +++ b/console-client/bdf.c @@ -154,7 +154,7 @@ next_line (char **line, int *size, FILE *file, int *count) } -/* Isolate the next white-space seperated argument from the current +/* Isolate the next white-space separated argument from the current line, and set ARGP to the beginning of the next argument. It is an error if there is no further argument. */ static bdf_error_t @@ -178,7 +178,7 @@ find_arg (char **argp) /* Read the font from stream FILE, and return it in FONT. If LINECOUNT is not zero, it will contain the number of lines in the - file at success, and the line an error occured at failure. */ + file at success, and the line an error occurred at failure. */ bdf_error_t bdf_read (FILE *filep, bdf_font_t *font, int *linecount) { diff --git a/console-client/bdf.h b/console-client/bdf.h index 1f0bce41..17cd0235 100644 --- a/console-client/bdf.h +++ b/console-client/bdf.h @@ -32,17 +32,17 @@ types of the arguments, so we treat a string as an 8-bit string which must not contain a binary null, and a number like an integer as an int. Leading and trailing white space are removed, multiple - spaces that seperate arguments are replaced by a single white + spaces that separate arguments are replaced by a single white space, and empty lines are ignored. */ /* Possible error values returned by the BDF functions. */ typedef enum { - /* No error occured. This is guaranteed to be zero. */ + /* No error occurred. This is guaranteed to be zero. */ BDF_NO_ERROR = 0, - /* A system error occured. The caller should consult errno. */ + /* A system error occurred. The caller should consult errno. */ BDF_SYSTEM_ERROR, /* All following errors indicate that the file is not a valid BDF @@ -200,7 +200,7 @@ typedef struct bdf_font *bdf_font_t; /* Read the font from stream FILE, and return it in FONT. If LINECOUNT is not zero, it will contain the number of lines in the - file at success, and the current line an error occured at + file at success, and the current line an error occurred at failure. */ bdf_error_t bdf_read (FILE *file, bdf_font_t *font, int *linecount); diff --git a/console-client/driver.c b/console-client/driver.c index 2a56729d..7f799f0a 100644 --- a/console-client/driver.c +++ b/console-client/driver.c @@ -83,7 +83,7 @@ driver_fini (void) /* Load, intialize and (if START is non-zero) start the driver DRIVER under the given NAME (which must be unique among all loaded - drivers) with arguments ARGZ with length ARGZ_LEN. This funtion + drivers) with arguments ARGZ with length ARGZ_LEN. This function will grab the driver list lock. The driver itself might try to grab the display, input source and bell list locks as well. */ error_t driver_add (const char *const name, const char *const driver, diff --git a/console-client/ncursesw.c b/console-client/ncursesw.c index 8b559016..a34026a2 100644 --- a/console-client/ncursesw.c +++ b/console-client/ncursesw.c @@ -47,7 +47,7 @@ static WINDOW *conspad; static unsigned int padx; static unsigned int pady; -/* Autoscroll is on or off. Autoscroll makes scrolling dependant on +/* Autoscroll is on or off. Autoscroll makes scrolling dependent on the cursor position. */ static int autoscroll; diff --git a/console-client/pc-kbd.c b/console-client/pc-kbd.c index 35e25617..d66e94b3 100644 --- a/console-client/pc-kbd.c +++ b/console-client/pc-kbd.c @@ -583,7 +583,7 @@ gnumach_v1_input_next () error_t err = device_read_inband (kbd_dev, 0, -1, sizeof (kd_event), (void *) &data_buf, &data_cnt); - /* XXX The error occured likely because KBD_DEV was closed, so + /* XXX The error occurred likely because KBD_DEV was closed, so terminate. */ if (err) return 0; @@ -661,7 +661,7 @@ input_next () error_t err = device_read_inband (kbd_dev, 0, -1, 1, (void *) &next, &data_cnt); - /* XXX The error occured likely because KBD_DEV was closed, so + /* XXX The error occurred likely because KBD_DEV was closed, so terminate. */ if (err) return 0; @@ -761,7 +761,7 @@ input_loop (any_t unused) /* The virtual console to switch to. */ int vc = 0; - /* Check if a funtion key was pressed. + /* Check if a function key was pressed. Choose the virtual console corresponding to that key. */ switch (sc) { diff --git a/console-client/vga-dynacolor.c b/console-client/vga-dynacolor.c index 7b81e2f9..9289e1eb 100644 --- a/console-client/vga-dynacolor.c +++ b/console-client/vga-dynacolor.c @@ -177,7 +177,7 @@ dynacolor_replace_colors (dynacolor_t *dc, based on pairs, but that increases the number of cases a lot. */ /* Note that no color must occur twice in one replacement list, - and that the color to be replaced must not occure either. */ + and that the color to be replaced must not occur either. */ static signed char pref[16][9] = { /* Replacements for CONS_COLOR_BLACK. */ |