summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/wee-command.c6
-rw-r--r--src/core/wee-config-file.h4
-rw-r--r--src/core/wee-debug.c4
-rw-r--r--src/core/wee-eval.c2
-rw-r--r--src/core/wee-hook.c8
-rw-r--r--src/core/wee-hook.h4
-rw-r--r--src/core/wee-network.c18
-rw-r--r--src/core/wee-string.c2
-rw-r--r--src/core/wee-version.c2
-rw-r--r--src/core/weechat.c4
-rw-r--r--src/gui/curses/gui-curses-chat.c4
-rw-r--r--src/gui/curses/gui-curses-key.c2
-rw-r--r--src/gui/curses/gui-curses-main.c2
-rw-r--r--src/gui/curses/gui-curses-window.c4
-rw-r--r--src/gui/gui-bar.c4
-rw-r--r--src/gui/gui-buffer.c4
-rw-r--r--src/gui/gui-completion.c4
-rw-r--r--src/gui/gui-completion.h2
-rw-r--r--src/gui/gui-focus.h2
-rw-r--r--src/gui/gui-hotlist.c4
-rw-r--r--src/gui/gui-line.c2
-rw-r--r--src/plugins/aspell/weechat-aspell.c4
-rw-r--r--src/plugins/fifo/fifo.c2
-rw-r--r--src/plugins/guile/weechat-guile-api.c2
-rw-r--r--src/plugins/guile/weechat-guile.c2
-rw-r--r--src/plugins/irc/irc-channel.c2
-rw-r--r--src/plugins/irc/irc-channel.h2
-rw-r--r--src/plugins/irc/irc-command.c6
-rw-r--r--src/plugins/irc/irc-config.c4
-rw-r--r--src/plugins/irc/irc-info.c2
-rw-r--r--src/plugins/irc/irc-mode.c4
-rw-r--r--src/plugins/irc/irc-nick.c4
-rw-r--r--src/plugins/irc/irc-protocol.c4
-rw-r--r--src/plugins/irc/irc-redirect.h2
-rw-r--r--src/plugins/irc/irc-server.c2
-rw-r--r--src/plugins/irc/irc-server.h2
-rw-r--r--src/plugins/lua/weechat-lua.c2
-rw-r--r--src/plugins/perl/weechat-perl.c4
-rw-r--r--src/plugins/python/weechat-python.c2
-rw-r--r--src/plugins/relay/irc/relay-irc.c2
-rw-r--r--src/plugins/relay/irc/relay-irc.h2
-rw-r--r--src/plugins/relay/relay-client.c2
-rw-r--r--src/plugins/relay/weechat/relay-weechat-protocol.c2
-rw-r--r--src/plugins/relay/weechat/relay-weechat.h2
-rw-r--r--src/plugins/ruby/weechat-ruby.c2
-rw-r--r--src/plugins/script/script-action.c2
-rw-r--r--src/plugins/tcl/weechat-tcl.c4
-rw-r--r--src/plugins/xfer/xfer-dcc.c6
-rw-r--r--src/plugins/xfer/xfer.c2
-rw-r--r--src/plugins/xfer/xfer.h12
50 files changed, 89 insertions, 89 deletions
diff --git a/src/core/wee-command.c b/src/core/wee-command.c
index 735698ac8..d4ab0d00a 100644
--- a/src/core/wee-command.c
+++ b/src/core/wee-command.c
@@ -1926,7 +1926,7 @@ command_help_list_plugin_commands (struct t_weechat_plugin *plugin,
snprintf (str_format, sizeof (str_format),
" %%-%ds", max_length);
- /* auto compute number of colums, max size is 90% of chat width */
+ /* auto compute number of columns, max size is 90% of chat width */
cols = ((gui_current_window->win_chat_width * 90) / 100) / (max_length + 1);
if (cols == 0)
cols = 1;
@@ -5118,7 +5118,7 @@ COMMAND_CALLBACK(upgrade)
exec_args[3] = strdup (weechat_home);
execvp (exec_args[0], exec_args);
- /* this code should not be reached if execvp is ok */
+ /* this code should not be reached if execvp is OK */
string_iconv_fprintf (stderr, "\n\n*****\n");
string_iconv_fprintf (stderr,
_("***** Error: exec failed (program: \"%s\"), exiting WeeChat"),
@@ -6113,7 +6113,7 @@ command_init ()
" 50 > 100 ==> 0\n"
" \"50\" > \"100\" ==> 1\n\n"
"Some variables are replaced in expression, using the "
- "format ${variable}, variable can be, by order of prioity :\n"
+ "format ${variable}, variable can be, by order of priority :\n"
" 1. the name of an option (file.section.option)\n"
" 2. the name of a local variable in buffer\n"
" 3. a hdata name/variable (the value is automatically "
diff --git a/src/core/wee-config-file.h b/src/core/wee-config-file.h
index 1c99af42a..9be9956ca 100644
--- a/src/core/wee-config-file.h
+++ b/src/core/wee-config-file.h
@@ -44,7 +44,7 @@ struct t_config_option;
struct t_config_file
{
struct t_weechat_plugin *plugin; /* plugin which created this cfg */
- char *name; /* name (exemple: "weechat") */
+ char *name; /* name (example: "weechat") */
char *filename; /* filename (without path) */
/* (example: "weechat.conf") */
FILE *file; /* file pointer */
@@ -123,7 +123,7 @@ struct t_config_option
void *value; /* value */
int null_value_allowed; /* null value allowed ? */
int (*callback_check_value) /* called to check value before */
- (void *data, /* assiging new value */
+ (void *data, /* assigning new value */
struct t_config_option *option,
const char *value);
void *callback_check_value_data; /* data sent to check callback */
diff --git a/src/core/wee-debug.c b/src/core/wee-debug.c
index 33e0c7722..6d3cb05e0 100644
--- a/src/core/wee-debug.c
+++ b/src/core/wee-debug.c
@@ -64,7 +64,7 @@ int debug_dump_active = 0;
void
debug_dump (int crash)
{
- /* prevent reentrance */
+ /* prevent reentrancy */
if (debug_dump_active)
exit (EXIT_FAILURE);
@@ -473,7 +473,7 @@ debug_infolists ()
gui_chat_printf (NULL, "");
gui_chat_printf (NULL, "%d infolists in memory (%s)", count,
(count == 0) ?
- "this is ok!" :
+ "this is OK!" :
"WARNING: this is probably a memory leak in WeeChat or "
"plugins/scripts!");
diff --git a/src/core/wee-eval.c b/src/core/wee-eval.c
index 1f2c23c32..ccdcf8d44 100644
--- a/src/core/wee-eval.c
+++ b/src/core/wee-eval.c
@@ -518,7 +518,7 @@ eval_expression_internal (const char *expr, struct t_hashtable *pointers,
}
pos++;
}
- /* closing parenthese not found */
+ /* closing parenthesis not found */
if (pos[0] != ')')
goto end;
sub_expr = string_strndup (expr2 + 1, pos - expr2 - 1);
diff --git a/src/core/wee-hook.c b/src/core/wee-hook.c
index 40101abee..f40338d18 100644
--- a/src/core/wee-hook.c
+++ b/src/core/wee-hook.c
@@ -522,7 +522,7 @@ hook_command_build_completion (struct t_hook_command *hook_command)
}
/*
- * build strings with concatentaion of items from different templates
+ * build strings with concatenation of items from different templates
* for each argument: these strings will be used when completing argument
* if we can't find which template to use (for example for first argument)
*/
@@ -546,7 +546,7 @@ hook_command_build_completion (struct t_hook_command *hook_command)
hook_command->cplt_template_args_concat[i] = malloc (length);
if (hook_command->cplt_template_args_concat[i])
{
- /* concatene items with "|" as separator */
+ /* concatenate items with "|" as separator */
weelist_remove_all (list);
hook_command->cplt_template_args_concat[i][0] = '\0';
for (j = 0; j < hook_command->cplt_num_templates; j++)
@@ -1476,7 +1476,7 @@ hook_process_child (struct t_hook *hook_process)
if (HOOK_PROCESS(hook_process, options))
{
/*
- * count number of arguments given in the hashable options,
+ * count number of arguments given in the hashtable options,
* keys are: "arg1", "arg2", ...
*/
while (1)
@@ -1539,7 +1539,7 @@ hook_process_child (struct t_hook *hook_process)
execvp (exec_args[0], exec_args);
}
- /* should not be executed if execvp was ok */
+ /* should not be executed if execvp was OK */
if (exec_args)
string_free_split (exec_args);
fprintf (stderr, "Error with command '%s'\n",
diff --git a/src/core/wee-hook.h b/src/core/wee-hook.h
index 8f77d6250..330be0dd3 100644
--- a/src/core/wee-hook.h
+++ b/src/core/wee-hook.h
@@ -157,8 +157,8 @@ struct t_hook_command
char ***cplt_template_args; /* arguments for each template */
/* concatenation of arg N for each template */
- int cplt_template_num_args_concat; /* number of concatened arguments */
- char **cplt_template_args_concat; /* concatened arguments */
+ int cplt_template_num_args_concat; /* number of concatenated arguments */
+ char **cplt_template_args_concat; /* concatenated arguments */
};
/* hook command run */
diff --git a/src/core/wee-network.c b/src/core/wee-network.c
index a6244730e..b1dcf7731 100644
--- a/src/core/wee-network.c
+++ b/src/core/wee-network.c
@@ -236,7 +236,7 @@ network_pass_httpproxy (struct t_proxy *proxy, int sock, const char *address,
if (CONFIG_STRING(proxy->options[PROXY_OPTION_USERNAME])
&& CONFIG_STRING(proxy->options[PROXY_OPTION_USERNAME])[0])
{
- /* authentification */
+ /* authentication */
snprintf (authbuf, sizeof (authbuf), "%s:%s",
CONFIG_STRING(proxy->options[PROXY_OPTION_USERNAME]),
(CONFIG_STRING(proxy->options[PROXY_OPTION_PASSWORD])) ?
@@ -249,7 +249,7 @@ network_pass_httpproxy (struct t_proxy *proxy, int sock, const char *address,
}
else
{
- /* no authentification */
+ /* no authentication */
length = snprintf (buffer, sizeof (buffer),
"CONNECT %s:%d HTTP/1.0\r\n\r\n", address, port);
}
@@ -264,7 +264,7 @@ network_pass_httpproxy (struct t_proxy *proxy, int sock, const char *address,
if (memcmp (buffer, "HTTP/", 5) || memcmp (buffer + 9, "200", 3))
return 0;
- /* connection ok */
+ /* connection OK */
return 1;
}
@@ -309,7 +309,7 @@ network_resolve (const char *hostname, char *ip, int *version)
freeaddrinfo (res);
- /* resolution ok */
+ /* resolution OK */
return 1;
}
@@ -350,7 +350,7 @@ network_pass_socks4proxy (struct t_proxy *proxy, int sock, const char *address,
if (network_recv_with_retry (sock, buffer, sizeof (buffer), 0) < 2)
return 0;
- /* connection ok */
+ /* connection OK */
if ((buffer[0] == 0) && (buffer[1] == 90))
return 1;
@@ -511,7 +511,7 @@ network_pass_socks5proxy (struct t_proxy *proxy, int sock, const char *address,
return 0;
}
- /* connection ok */
+ /* connection OK */
return 1;
}
@@ -579,7 +579,7 @@ network_connect (int sock, const struct sockaddr *addr, socklen_t addrlen)
/* for non-blocking sockets, the connect() may fail with EINPROGRESS,
* if this happens, we wait for writability on socket and check
- * the option SO_ERROR, which is 0 if connect is ok (see man connect)
+ * the option SO_ERROR, which is 0 if connect is OK (see man connect)
*/
while (1)
{
@@ -962,7 +962,7 @@ network_connect_child (struct t_hook *hook_connect)
status_str[0] = '0' + WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND;
- /* try all IP addresses found, stop when connection is ok */
+ /* try all IP addresses found, stop when connection is OK */
sock = -1;
for (i = 0; i < num_hosts; i++)
{
@@ -1327,7 +1327,7 @@ network_connect_child_read_cb (void *arg_hook_connect, int fd)
{
if (buffer[0] - '0' == WEECHAT_HOOK_CONNECT_OK)
{
- /* connection ok, read IP address */
+ /* connection OK, read IP address */
buf_size[5] = '\0';
num_read = read (HOOK_CONNECT(hook_connect, child_read),
buf_size, 5);
diff --git a/src/core/wee-string.c b/src/core/wee-string.c
index 443f22f02..94402b52c 100644
--- a/src/core/wee-string.c
+++ b/src/core/wee-string.c
@@ -1491,7 +1491,7 @@ string_split_command (const char *command, char separator)
buffer[str_idx] = '\0';
str_idx = -1;
p = buffer;
- /* strip white spaces a the begining of the line */
+ /* strip white spaces a the beginning of the line */
while (*p == ' ') p++;
if (p && p[0])
array[arr_idx++] = strdup (p);
diff --git a/src/core/wee-version.c b/src/core/wee-version.c
index 69a5f0792..4a94b7f40 100644
--- a/src/core/wee-version.c
+++ b/src/core/wee-version.c
@@ -82,7 +82,7 @@ version_get_git ()
}
/*
- * Returns the WeeCht version + the git version (between brackets, and only if
+ * Returns the WeeChat version + the git version (between brackets, and only if
* it is not empty).
*
* Examples:
diff --git a/src/core/weechat.c b/src/core/weechat.c
index fa6f8ff4f..39b18c501 100644
--- a/src/core/weechat.c
+++ b/src/core/weechat.c
@@ -262,7 +262,7 @@ weechat_parse_args (int argc, char *argv[])
{
/*
* Electric-fence is not working fine when gnutls loads
- * certificates and valgrind reports many memory errors with gnutls.
+ * certificates and Valgrind reports many memory errors with gnutls.
* This option disables the init/deinit of gnutls,
* it must NOT be used for other purposes!
*/
@@ -482,7 +482,7 @@ main (int argc, char *argv[])
hdata_init (); /* initialize hdata */
hook_init (); /* initialize hooks */
debug_init (); /* hook signals for debug */
- gui_main_pre_init (&argc, &argv); /* pre-initiliaze interface */
+ gui_main_pre_init (&argc, &argv); /* pre-initialize interface */
command_init (); /* initialize WeeChat commands */
completion_init (); /* add core completion hooks */
gui_key_init (); /* init keys */
diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c
index ff7c74f05..68bb3975d 100644
--- a/src/gui/curses/gui-curses-chat.c
+++ b/src/gui/curses/gui-curses-chat.c
@@ -464,7 +464,7 @@ gui_chat_display_word (struct t_gui_window *window,
length_align = gui_line_get_align (window->buffer, line, 0, 0);
if ((window->win_chat_cursor_x == 0)
&& (*lines_displayed > 0)
- /* FIXME: modify arbitraty value for non aligning messages on time/nick? */
+ /* FIXME: modify arbitrary value for non aligning messages on time/nick? */
&& (length_align < (window->win_chat_width - 5)))
{
if (!simulate)
@@ -1108,7 +1108,7 @@ gui_chat_display_line (struct t_gui_window *window, struct t_gui_line *line,
if ((window->win_chat_cursor_x + word_length_with_spaces > gui_chat_get_real_width (window))
&& (word_length <= gui_chat_get_real_width (window) - line_align))
{
- /* spaces + word too long for current line but ok for next line */
+ /* spaces + word too long for current line but OK for next line */
gui_chat_display_new_line (window, num_lines, count,
&lines_displayed, simulate);
/* apply styles before jumping to start of word */
diff --git a/src/gui/curses/gui-curses-key.c b/src/gui/curses/gui-curses-key.c
index 15b0bb843..9cde635f9 100644
--- a/src/gui/curses/gui-curses-key.c
+++ b/src/gui/curses/gui-curses-key.c
@@ -551,7 +551,7 @@ gui_key_read_cb (void *data, int fd)
{
if (accept_paste)
{
- /* user is ok for pasting text, let's paste! */
+ /* user is OK for pasting text, let's paste! */
gui_key_paste_accept ();
}
else if (cancel_paste)
diff --git a/src/gui/curses/gui-curses-main.c b/src/gui/curses/gui-curses-main.c
index a10d726dd..22f224117 100644
--- a/src/gui/curses/gui-curses-main.c
+++ b/src/gui/curses/gui-curses-main.c
@@ -346,7 +346,7 @@ gui_main_loop ()
while (!weechat_quit)
{
- /* reload config, if SIGHUP reveived */
+ /* reload config, if SIGHUP received */
if (gui_reload_config)
{
gui_reload_config = 0;
diff --git a/src/gui/curses/gui-curses-window.c b/src/gui/curses/gui-curses-window.c
index 40e0e84fd..d8ba1aa5f 100644
--- a/src/gui/curses/gui-curses-window.c
+++ b/src/gui/curses/gui-curses-window.c
@@ -2245,7 +2245,7 @@ gui_window_set_title (const char *title)
{
printf ("\033&f0k%dD%s", (int)(strlen(title) + 1), title);
}
- /* the following term supports the xterm excapes */
+ /* the following terminals support the xterm escape codes */
else if ((strncmp (envterm, "xterm", 5) == 0)
|| (strncmp (envterm, "rxvt", 4) == 0)
|| (strcmp (envterm, "Eterm") == 0)
@@ -2272,7 +2272,7 @@ gui_window_set_title (const char *title)
{
printf ("\033&f0k%dD%s", (int)strlen("Terminal"), "Terminal");
}
- /* the following term supports the xterm excapes */
+ /* the following terminals support the xterm escape codes */
else if ((strncmp (envterm, "xterm", 5) == 0)
|| (strncmp (envterm, "rxvt", 4) == 0)
|| (strcmp (envterm, "Eterm") == 0)
diff --git a/src/gui/gui-bar.c b/src/gui/gui-bar.c
index 725afba60..e30c03b5b 100644
--- a/src/gui/gui-bar.c
+++ b/src/gui/gui-bar.c
@@ -245,7 +245,7 @@ gui_bar_get_min_height (struct t_gui_bar *bar)
}
/*
- * Checks if "add_size" is ok for bar.
+ * Checks if "add_size" is OK for bar.
*
* Returns:
* 1: new size is OK
@@ -287,7 +287,7 @@ gui_bar_check_size_add (struct t_gui_bar *bar, int add_size)
}
}
- /* new size ok */
+ /* new size OK */
return 1;
}
diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c
index 967881d64..d133f8c94 100644
--- a/src/gui/gui-buffer.c
+++ b/src/gui/gui-buffer.c
@@ -1871,7 +1871,7 @@ gui_buffer_search_by_partial_name (const char *plugin, const char *name)
if (!name || !name[0])
return gui_current_window->buffer;
- /* 0: mathces beginning of buffer name, 1: in the middle, 2: the end */
+ /* 0: matches beginning of buffer name, 1: in the middle, 2: the end */
buffer_partial_match[0] = NULL;
buffer_partial_match[1] = NULL;
buffer_partial_match[2] = NULL;
@@ -2416,7 +2416,7 @@ gui_buffer_move_to_number (struct t_gui_buffer *buffer, int number)
if (number < 1)
number = 1;
- /* buffer number is already ok ? */
+ /* buffer number is already OK ? */
if (number == buffer->number)
return;
diff --git a/src/gui/gui-completion.c b/src/gui/gui-completion.c
index 2d75cae4b..642f49f91 100644
--- a/src/gui/gui-completion.c
+++ b/src/gui/gui-completion.c
@@ -494,7 +494,7 @@ gui_completion_get_matching_template (struct t_gui_completion *completion,
* template, for example with these templates (command /set):
* %(config_options) %(config_option_values)
* diff %(config_options)|%*
- * if first argument is "diff", the match is ok (second template)
+ * if first argument is "diff", the match is OK (second template)
* if first argument is not "diff", we will fallback on the first
* template containing "%" (here first template)
*/
@@ -1068,7 +1068,7 @@ gui_completion_complete (struct t_gui_completion *completion)
}
/*
- * if we was on last completion in list, then recomplete, starting from
+ * if we was on last completion in list, then complete again, starting from
* first matching item
*/
if (completion->word_found && (completion->position >= 0))
diff --git a/src/gui/gui-completion.h b/src/gui/gui-completion.h
index 2d9fc3367..6c2b88fdd 100644
--- a/src/gui/gui-completion.h
+++ b/src/gui/gui-completion.h
@@ -41,7 +41,7 @@ struct t_gui_completion
char *base_command; /* cmd with arg to complete (can be NULL) */
int base_command_arg_index; /* # arg to complete (if context=cmd arg) */
char *base_word; /* word to complete (when Tab was pressed) */
- int base_word_pos; /* beggining of base word */
+ int base_word_pos; /* beginning of base word */
int position; /* position where Tab was pressed */
char *args; /* command line args (including base word) */
int direction; /* +1=search next word, -1=previous word */
diff --git a/src/gui/gui-focus.h b/src/gui/gui-focus.h
index d80d7cc19..f658c54f8 100644
--- a/src/gui/gui-focus.h
+++ b/src/gui/gui-focus.h
@@ -30,7 +30,7 @@ struct t_gui_focus_info
struct t_gui_line *chat_line; /* line in chat area */
int chat_line_x; /* x in line */
char *chat_word; /* word at (x,y) */
- char *chat_bol; /* beginnong of line until (x,y) */
+ char *chat_bol; /* beginning of line until (x,y) */
char *chat_eol; /* (x,y) until end of line */
struct t_gui_bar_window *bar_window; /* bar window found */
char *bar_item; /* bar item found */
diff --git a/src/gui/gui-hotlist.c b/src/gui/gui-hotlist.c
index 47d2320ca..090f49de4 100644
--- a/src/gui/gui-hotlist.c
+++ b/src/gui/gui-hotlist.c
@@ -46,7 +46,7 @@ struct t_gui_hotlist *gui_hotlist = NULL;
struct t_gui_hotlist *last_gui_hotlist = NULL;
struct t_gui_buffer *gui_hotlist_initial_buffer = NULL;
-int gui_add_hotlist = 1; /* 0 is for temporarly disable */
+int gui_add_hotlist = 1; /* 0 is for temporarily disable */
/* hotlist add for all buffers */
@@ -308,7 +308,7 @@ gui_hotlist_add (struct t_gui_buffer *buffer,
if (priority > GUI_HOTLIST_MAX)
priority = GUI_HOTLIST_MAX;
- /* check if priority is ok according to buffer notify level value */
+ /* check if priority is OK according to buffer notify level value */
if (!gui_hotlist_check_buffer_notify (buffer, priority))
return NULL;
diff --git a/src/gui/gui-line.c b/src/gui/gui-line.c
index 31094ccc0..6636fc745 100644
--- a/src/gui/gui-line.c
+++ b/src/gui/gui-line.c
@@ -1124,7 +1124,7 @@ gui_line_add (struct t_gui_buffer *buffer, time_t date,
WEECHAT_HOOK_SIGNAL_POINTER, buffer);
}
- /* add mixed line, if buffer is attched to at least one other buffer */
+ /* add mixed line, if buffer is attached to at least one other buffer */
if (buffer->mixed_lines)
{
gui_line_mixed_add (buffer->mixed_lines, new_line->data);
diff --git a/src/plugins/aspell/weechat-aspell.c b/src/plugins/aspell/weechat-aspell.c
index df50ffd92..b2f6ca839 100644
--- a/src/plugins/aspell/weechat-aspell.c
+++ b/src/plugins/aspell/weechat-aspell.c
@@ -395,7 +395,7 @@ weechat_aspell_check_word (struct t_gui_buffer *buffer,
buffer_type = weechat_buffer_get_string (buffer, "localvar_type");
if (buffer_type && (strcmp (buffer_type, "private") == 0))
{
- /* check seld nick */
+ /* check self nick */
buffer_nick = weechat_buffer_get_string (buffer, "localvar_nick");
if (buffer_nick && (weechat_strcasecmp (buffer_nick, word) == 0))
return 1;
@@ -664,7 +664,7 @@ weechat_aspell_modifier_cb (void *data, const char *modifier,
if (weechat_aspell_string_is_url (ptr_string))
{
/*
- * word is an URL, then it is ok, and search for next space
+ * word is an URL, then it is OK, and search for next space
* (will be end of word)
*/
word_ok = 1;
diff --git a/src/plugins/fifo/fifo.c b/src/plugins/fifo/fifo.c
index 399f99fe5..c1b44eef6 100644
--- a/src/plugins/fifo/fifo.c
+++ b/src/plugins/fifo/fifo.c
@@ -154,7 +154,7 @@ fifo_create ()
/* create FIFO pipe, writable for user only */
if (mkfifo (fifo_filename, 0600) == 0)
{
- /* open FIFO pipe in read-only, non blockingmode */
+ /* open FIFO pipe in read-only, non-blocking mode */
if ((fifo_fd = open (fifo_filename,
O_RDONLY | O_NONBLOCK)) != -1)
{
diff --git a/src/plugins/guile/weechat-guile-api.c b/src/plugins/guile/weechat-guile-api.c
index 9a55c03eb..92ccd561c 100644
--- a/src/plugins/guile/weechat-guile-api.c
+++ b/src/plugins/guile/weechat-guile-api.c
@@ -131,7 +131,7 @@ weechat_guile_api_scm_to_string (SCM str,
}
/*
- * Frees all alloacated strings in "guile_strings".
+ * Frees all allocated strings in "guile_strings".
*/
void
diff --git a/src/plugins/guile/weechat-guile.c b/src/plugins/guile/weechat-guile.c
index ba4a13373..246ee4600 100644
--- a/src/plugins/guile/weechat-guile.c
+++ b/src/plugins/guile/weechat-guile.c
@@ -969,7 +969,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
plugin_script_display_short_list (weechat_guile_plugin,
guile_scripts);
- /* init ok */
+ /* init OK */
return WEECHAT_RC_OK;
}
diff --git a/src/plugins/irc/irc-channel.c b/src/plugins/irc/irc-channel.c
index 520711ea2..8e18bee04 100644
--- a/src/plugins/irc/irc-channel.c
+++ b/src/plugins/irc/irc-channel.c
@@ -350,7 +350,7 @@ irc_channel_new (struct t_irc_server *server, int channel_type,
"irc_channel_opened" : "irc_pv_opened",
WEECHAT_HOOK_SIGNAL_POINTER, new_buffer);
- /* all is ok, return address of new channel */
+ /* all is OK, return address of new channel */
return new_channel;
}
diff --git a/src/plugins/irc/irc-channel.h b/src/plugins/irc/irc-channel.h
index ada35adfd..3a8d39096 100644
--- a/src/plugins/irc/irc-channel.h
+++ b/src/plugins/irc/irc-channel.h
@@ -42,7 +42,7 @@ struct t_irc_channel_speaking
struct t_irc_channel
{
int type; /* channel type */
- char *name; /* name of channel (exemple: "#abc") */
+ char *name; /* name of channel (example: "#abc") */
char *topic; /* topic of channel (host for pv) */
char *modes; /* channel modes */
int limit; /* user limit (0 is limit not set) */
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index 5b9b9c736..3436b85fa 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -783,7 +783,7 @@ irc_command_connect_one_server (struct t_irc_server *server,
server->reconnect_join = (server->channels) ? 1 : 0;
}
- /* connect ok */
+ /* connect OK */
return 1;
}
@@ -1483,7 +1483,7 @@ irc_command_disconnect_one_server (struct t_irc_server *server,
/* ask refresh for "away" item */
weechat_bar_item_update ("away");
- /* disconnect ok */
+ /* disconnect OK */
return 1;
}
@@ -3719,7 +3719,7 @@ irc_command_reconnect_one_server (struct t_irc_server *server,
server->reconnect_join = (server->channels) ? 1 : 0;
}
- /* reconnect ok */
+ /* reconnect OK */
return 1;
}
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index 95bbf318f..97dd98214 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -2120,7 +2120,7 @@ irc_config_init ()
"nick_color_force", "string",
N_("force color for some nicks: hash computed with nickname "
"to find color will not be used for these nicks (format is: "
- "\"nick1:color1;nick2:color2\"); lookup for nicks is with "
+ "\"nick1:color1;nick2:color2\"); look up for nicks is with "
"exact case then lower case, so it's possible to use only lower "
"case for nicks in this option"),
NULL, 0, 0, "", NULL, 0, NULL, NULL,
@@ -2350,7 +2350,7 @@ irc_config_init ()
irc_config_file, ptr_section,
"smart_filter_join_unmask", "integer",
N_("delay for unmasking a join message that was filtered with tag "
- "\"irc_smart_filter\" (in minutes): if a nick jas joined max N "
+ "\"irc_smart_filter\" (in minutes): if a nick has joined max N "
"minutes ago and then says something on channel (message, notice or "
"update on topic), the join is unmasked, as well as nick changes "
"after this join (0 = disable: never unmask a join)"),
diff --git a/src/plugins/irc/irc-info.c b/src/plugins/irc/irc-info.c
index 14e35e908..509913bd7 100644
--- a/src/plugins/irc/irc-info.c
+++ b/src/plugins/irc/irc-info.c
@@ -540,7 +540,7 @@ irc_info_get_infolist_cb (void *data, const char *infolist_name,
}
else
{
- /* build list with notify list of all servers matchin arguments */
+ /* build list with notify list of all servers matching arguments */
for (ptr_server = irc_servers; ptr_server;
ptr_server = ptr_server->next_server)
{
diff --git a/src/plugins/irc/irc-mode.c b/src/plugins/irc/irc-mode.c
index 59f85c489..a3179de91 100644
--- a/src/plugins/irc/irc-mode.c
+++ b/src/plugins/irc/irc-mode.c
@@ -163,7 +163,7 @@ irc_mode_channel_update (struct t_irc_server *server,
{
case 'A': /* always argument */
case 'B': /* always argument */
- case 'C': /* argumment if set */
+ case 'C': /* argument if set */
ptr_arg = (current_arg < argc) ?
argv[current_arg] : NULL;
break;
@@ -334,7 +334,7 @@ irc_mode_channel_set (struct t_irc_server *server,
ptr_arg = (current_arg < argc) ?
argv[current_arg] : NULL;
break;
- case 'C': /* argumment if set */
+ case 'C': /* argument if set */
ptr_arg = ((set_flag == '+') && (current_arg < argc)) ?
argv[current_arg] : NULL;
break;
diff --git a/src/plugins/irc/irc-nick.c b/src/plugins/irc/irc-nick.c
index 562185eb5..a3573fb80 100644
--- a/src/plugins/irc/irc-nick.c
+++ b/src/plugins/irc/irc-nick.c
@@ -671,7 +671,7 @@ irc_nick_new (struct t_irc_server *server, struct t_irc_channel *channel,
/* add nick to buffer nicklist */
irc_nick_nicklist_add (server, channel, new_nick);
- /* all is ok, return address of new nick */
+ /* all is OK, return address of new nick */
return new_nick;
}
@@ -801,7 +801,7 @@ irc_nick_free_all (struct t_irc_server *server, struct t_irc_channel *channel)
irc_nick_free (server, channel, channel->nicks);
}
- /* sould be zero, but prevent any bug :D */
+ /* should be zero, but prevent any bug :D */
channel->nicks_count = 0;
}
diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index 260aa74f2..2b2d11dd2 100644
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -2061,7 +2061,7 @@ IRC_PROTOCOL_CALLBACK(001)
date, nick, address, host, command,
ignored, argc, argv, argv_eol);
- /* connection to IRC server is ok! */
+ /* connection to IRC server is OK! */
server->is_connected = 1;
server->reconnect_delay = 0;
if (server->hook_timer_connection)
@@ -3802,7 +3802,7 @@ IRC_PROTOCOL_CALLBACK(353)
/*
* for a channel without buffer, prepare a string that will be built
- * with nicks and colors (argc-args is the number of nicks)
+ * with nicks and colors (argc - args is the number of nicks)
*/
if (!ptr_channel)
{
diff --git a/src/plugins/irc/irc-redirect.h b/src/plugins/irc/irc-redirect.h
index 39603f86d..269925d21 100644
--- a/src/plugins/irc/irc-redirect.h
+++ b/src/plugins/irc/irc-redirect.h
@@ -56,7 +56,7 @@ struct t_irc_redirect
/* redirected */
int assigned_to_command; /* 1 if assigned to a command */
time_t start_time; /* time when command is sent to server */
- /* (this is begining of this redirect) */
+ /* (this is beginning of this redirect) */
struct t_hashtable *cmd_start; /* command(s) starting redirection */
/* (can be NULL or empty) */
struct t_hashtable *cmd_stop; /* command(s) stopping redirection */
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index ddf31a395..eb024e4fe 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -2650,7 +2650,7 @@ irc_server_timer_connection_cb (void *data, int remaining_calls)
/*
* Callback for SASL authentication timer: it is called if there is a timeout
- * with SASL authentication (if SASL authentication is ok or failed, then hook
+ * with SASL authentication (if SASL authentication is OK or failed, then hook
* timer is removed before this callback is called).
*/
diff --git a/src/plugins/irc/irc-server.h b/src/plugins/irc/irc-server.h
index cb1124dfe..5a5e1bd74 100644
--- a/src/plugins/irc/irc-server.h
+++ b/src/plugins/irc/irc-server.h
@@ -173,7 +173,7 @@ struct t_irc_server
char *isupport; /* copy of message 005 (ISUPPORT) */
char *prefix_modes; /* prefix modes from msg 005 (eg "ohv") */
char *prefix_chars; /* prefix chars from msg 005 (eg "@%+") */
- int nick_max_length; /* max lenth of nick (from msg 005) */
+ int nick_max_length; /* max length of nick (from msg 005) */
int casemapping; /* casemapping from msg 005 */
char *chantypes; /* chantypes from msg 005 (eg "&#") */
char *chanmodes; /* chanmodes from msg 005 */
diff --git a/src/plugins/lua/weechat-lua.c b/src/plugins/lua/weechat-lua.c
index ccc57fd63..f71cab326 100644
--- a/src/plugins/lua/weechat-lua.c
+++ b/src/plugins/lua/weechat-lua.c
@@ -860,7 +860,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
plugin_script_display_short_list (weechat_lua_plugin,
lua_scripts);
- /* init ok */
+ /* init OK */
return WEECHAT_RC_OK;
}
diff --git a/src/plugins/perl/weechat-perl.c b/src/plugins/perl/weechat-perl.c
index 9c61950a1..bbc0b6483 100644
--- a/src/plugins/perl/weechat-perl.c
+++ b/src/plugins/perl/weechat-perl.c
@@ -990,7 +990,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
weechat_hook_signal ("quit", &weechat_perl_signal_quit_upgrade_cb, NULL);
weechat_hook_signal ("upgrade", &weechat_perl_signal_quit_upgrade_cb, NULL);
- /* init ok */
+ /* init OK */
return WEECHAT_RC_OK;
}
@@ -1007,7 +1007,7 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
perl_quiet = 0;
#ifndef MULTIPLICITY
- /* free perl intepreter */
+ /* free perl interpreter */
if (perl_main)
{
perl_destruct (perl_main);
diff --git a/src/plugins/python/weechat-python.c b/src/plugins/python/weechat-python.c
index 72304b4a7..7c8c09cb0 100644
--- a/src/plugins/python/weechat-python.c
+++ b/src/plugins/python/weechat-python.c
@@ -1297,7 +1297,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
plugin_script_display_short_list (weechat_python_plugin,
python_scripts);
- /* init ok */
+ /* init OK */
return WEECHAT_RC_OK;
}
diff --git a/src/plugins/relay/irc/relay-irc.c b/src/plugins/relay/irc/relay-irc.c
index a33bd9aa4..6e77038c0 100644
--- a/src/plugins/relay/irc/relay-irc.c
+++ b/src/plugins/relay/irc/relay-irc.c
@@ -1391,7 +1391,7 @@ relay_irc_recv (struct t_relay_client *client, const char *data)
goto end;
}
- /* check if connection to server is ok */
+ /* check if connection to server is OK */
infolist_server = weechat_infolist_get ("irc_server", NULL,
client->protocol_args);
if (infolist_server)
diff --git a/src/plugins/relay/irc/relay-irc.h b/src/plugins/relay/irc/relay-irc.h
index 3c7e87a0e..6971ebc5b 100644
--- a/src/plugins/relay/irc/relay-irc.h
+++ b/src/plugins/relay/irc/relay-irc.h
@@ -29,7 +29,7 @@ struct t_relay_irc_data
{
char *address; /* client address (used when sending */
/* data to client) */
- int password_ok; /* password received and ok? */
+ int password_ok; /* password received and OK? */
char *nick; /* nick for client */
int user_received; /* command "USER" received */
int connected; /* 1 if client is connected as IRC */
diff --git a/src/plugins/relay/relay-client.c b/src/plugins/relay/relay-client.c
index 9ca857878..688afcf64 100644
--- a/src/plugins/relay/relay-client.c
+++ b/src/plugins/relay/relay-client.c
@@ -174,7 +174,7 @@ relay_client_handshake_timer_cb (void *data, int remaining_calls)
if (rc == GNUTLS_E_SUCCESS)
{
- /* handshake ok, set status to "connected" */
+ /* handshake OK, set status to "connected" */
weechat_unhook (client->hook_timer_handshake);
client->hook_timer_handshake = NULL;
relay_client_set_status (client, RELAY_STATUS_CONNECTED);
diff --git a/src/plugins/relay/weechat/relay-weechat-protocol.c b/src/plugins/relay/weechat/relay-weechat-protocol.c
index b693e8b94..a2cf81dd1 100644
--- a/src/plugins/relay/weechat/relay-weechat-protocol.c
+++ b/src/plugins/relay/weechat/relay-weechat-protocol.c
@@ -148,7 +148,7 @@ relay_weechat_protocol_is_sync (struct t_relay_client *ptr_client,
return ((*ptr_flags) & flags) ? 1 : 0;
/*
- * buffer not found at all in hashtable (neither name, neitner "*")
+ * buffer not found at all in hashtable (neither name, neither "*")
* => it is NOT synchronized
*/
return 0;
diff --git a/src/plugins/relay/weechat/relay-weechat.h b/src/plugins/relay/weechat/relay-weechat.h
index 0cc98a54e..2e0719775 100644
--- a/src/plugins/relay/weechat/relay-weechat.h
+++ b/src/plugins/relay/weechat/relay-weechat.h
@@ -35,7 +35,7 @@ enum t_relay_weechat_compression
struct t_relay_weechat_data
{
- int password_ok; /* password received and ok? */
+ int password_ok; /* password received and OK? */
int compression; /* compression type */
int nicklist_diff; /* (TEMPORARY) nicklist diff enabled?*/
diff --git a/src/plugins/ruby/weechat-ruby.c b/src/plugins/ruby/weechat-ruby.c
index 0e2ec75e1..4e6d45c85 100644
--- a/src/plugins/ruby/weechat-ruby.c
+++ b/src/plugins/ruby/weechat-ruby.c
@@ -1174,7 +1174,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
plugin_script_display_short_list (weechat_ruby_plugin,
ruby_scripts);
- /* init ok */
+ /* init OK */
return WEECHAT_RC_OK;
}
diff --git a/src/plugins/script/script-action.c b/src/plugins/script/script-action.c
index 8c5a7c323..9791d4fc8 100644
--- a/src/plugins/script/script-action.c
+++ b/src/plugins/script/script-action.c
@@ -1361,7 +1361,7 @@ script_action_run ()
ptr_script = ptr_script->next_script)
{
/*
- * if script is intalled, with new version available,
+ * if script is installed, with new version available,
* and not held, then upgrade it
*/
if ((ptr_script->status & SCRIPT_STATUS_INSTALLED)
diff --git a/src/plugins/tcl/weechat-tcl.c b/src/plugins/tcl/weechat-tcl.c
index 733af1c45..82090b327 100644
--- a/src/plugins/tcl/weechat-tcl.c
+++ b/src/plugins/tcl/weechat-tcl.c
@@ -339,7 +339,7 @@ weechat_tcl_load (const char *filename)
"parsing file \"%s\": %s"),
weechat_prefix ("error"), TCL_PLUGIN_NAME, filename,
Tcl_GetStringFromObj (Tcl_GetObjResult (interp), &i));
- /* this ok, maybe "register" was called, so not return */
+ /* this OK, maybe "register" was called, so not return */
/* return 0; */
}
@@ -817,7 +817,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
plugin_script_display_short_list (weechat_tcl_plugin,
tcl_scripts);
- /* init ok */
+ /* init OK */
return WEECHAT_RC_OK;
}
diff --git a/src/plugins/xfer/xfer-dcc.c b/src/plugins/xfer/xfer-dcc.c
index acc95ea12..0e0142a4c 100644
--- a/src/plugins/xfer/xfer-dcc.c
+++ b/src/plugins/xfer/xfer-dcc.c
@@ -83,7 +83,7 @@ xfer_dcc_send_file_child (struct t_xfer *xfer)
recv (xfer->sock, (char *) &ack, 4, 0);
xfer->ack = ntohl (ack);
- /* DCC send ok? */
+ /* DCC send OK? */
if ((xfer->pos >= xfer->size)
&& (xfer->ack >= xfer->size))
{
@@ -161,8 +161,8 @@ xfer_dcc_send_file_child (struct t_xfer *xfer)
}
/*
- * if send if ok since 2 seconds or more, and that no ack was received,
- * then consider it's ok
+ * if send if OK since 2 seconds or more, and that no ACK was received,
+ * then consider it's OK
*/
if ((sent_ok != 0) && (new_time > sent_ok + 2))
{
diff --git a/src/plugins/xfer/xfer.c b/src/plugins/xfer/xfer.c
index c27e52ecc..194fce09d 100644
--- a/src/plugins/xfer/xfer.c
+++ b/src/plugins/xfer/xfer.c
@@ -324,7 +324,7 @@ xfer_close (struct t_xfer *xfer, enum t_xfer_status status)
}
}
- /* remove empty file if received file failed and nothing was transfered */
+ /* remove empty file if received file failed and nothing was transferred */
if (((xfer->status == XFER_STATUS_FAILED)
|| (xfer->status == XFER_STATUS_ABORTED))
&& XFER_IS_FILE(xfer->type)
diff --git a/src/plugins/xfer/xfer.h b/src/plugins/xfer/xfer.h
index a0773ed24..bef8938b3 100644
--- a/src/plugins/xfer/xfer.h
+++ b/src/plugins/xfer/xfer.h
@@ -56,7 +56,7 @@ enum t_xfer_status
XFER_STATUS_ACTIVE, /* sending/receiving data */
XFER_STATUS_DONE, /* transfer done */
XFER_STATUS_FAILED, /* transfer failed */
- XFER_STATUS_ABORTED, /* transfer aborded by user */
+ XFER_STATUS_ABORTED, /* transfer aborted by user */
/* number of xfer status */
XFER_NUM_STATUS,
};
@@ -65,7 +65,7 @@ enum t_xfer_status
enum t_xfer_error
{
- XFER_NO_ERROR = 0, /* no error to report, all ok! */
+ XFER_NO_ERROR = 0, /* no error to report, all OK! */
/* errors for sender: */
XFER_ERROR_READ_LOCAL, /* unable to read local file */
XFER_ERROR_SEND_BLOCK, /* unable to send block to receiver */
@@ -79,10 +79,10 @@ enum t_xfer_error
XFER_NUM_ERRORS,
};
-/* xfer blocksize */
+/* xfer block size */
-#define XFER_BLOCKSIZE_MIN 1024 /* min blocksize */
-#define XFER_BLOCKSIZE_MAX 102400 /* max blocksize */
+#define XFER_BLOCKSIZE_MIN 1024 /* min block size */
+#define XFER_BLOCKSIZE_MAX 102400 /* max block size */
/* separator in filenames */
@@ -140,7 +140,7 @@ struct t_xfer
int child_read; /* to read into child pipe */
int child_write; /* to write into child pipe */
struct t_hook *hook_fd; /* hook for socket or child pipe */
- struct t_hook *hook_timer; /* timeout for recever accept */
+ struct t_hook *hook_timer; /* timeout for receiver accept */
char *unterminated_message; /* beginning of a message */
int file; /* local file (read or write) */
char *local_filename; /* local filename (with path) */