diff options
| author | Sébastien Helleu <flashcode@flashtux.org> | 2016-05-27 20:13:35 +0200 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2016-05-27 20:13:35 +0200 |
| commit | 7342a47de00b310dcc3d1f5babb99bdecb9382aa (patch) | |
| tree | afe9a927d9c61fc8479d5133af2e9eb4315d1849 /src/core | |
| parent | 7b053b7c40939c999b979531c567291788cb0233 (diff) | |
| download | weechat-7342a47de00b310dcc3d1f5babb99bdecb9382aa.zip | |
core, irc, xfer: display more information in memory allocation errors (issue #573)
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/wee-command.c | 20 | ||||
| -rw-r--r-- | src/core/wee-network.c | 8 |
2 files changed, 16 insertions, 12 deletions
diff --git a/src/core/wee-command.c b/src/core/wee-command.c index ac6bd6ce6..a55aa0055 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -239,8 +239,9 @@ COMMAND_CALLBACK(bar) if (!str_type) { gui_chat_printf (NULL, - _("%sNot enough memory"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); + _("%sNot enough memory (%s)"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], + "/bar"); return WEECHAT_RC_OK; } type = gui_bar_search_type (str_type); @@ -5081,8 +5082,9 @@ COMMAND_CALLBACK(repeat) if (!repeat_args) { gui_chat_printf (NULL, - _("%sNot enough memory"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); + _("%sNot enough memory (%s)"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], + "/repeat"); return WEECHAT_RC_OK; } repeat_args[0] = strdup (buffer->full_name); @@ -6040,8 +6042,9 @@ COMMAND_CALLBACK(upgrade) if (!ptr_binary && !quit) { gui_chat_printf (NULL, - _("%sNot enough memory"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); + _("%sNot enough memory (%s)"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], + "/upgrade"); return WEECHAT_RC_OK; } @@ -6400,8 +6403,9 @@ COMMAND_CALLBACK(wait) if (!timer_args) { gui_chat_printf (NULL, - _("%sNot enough memory"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); + _("%sNot enough memory (%s)"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], + "/wait"); return WEECHAT_RC_OK; } timer_args[0] = strdup (buffer->full_name); diff --git a/src/core/wee-network.c b/src/core/wee-network.c index fd1474236..cb2fa52d2 100644 --- a/src/core/wee-network.c +++ b/src/core/wee-network.c @@ -1609,7 +1609,7 @@ network_connect_child_read_cb (const void *pointer, void *data, int fd) (hook_connect->callback_pointer, hook_connect->callback_data, WEECHAT_HOOK_CONNECT_MEMORY_ERROR, - 0, sock, cb_error, cb_ip_address); + 0, sock, "child_read_cb", NULL); unhook (hook_connect); } @@ -1695,7 +1695,7 @@ network_connect_with_fork (struct t_hook *hook_connect) (hook_connect->callback_pointer, hook_connect->callback_data, WEECHAT_HOOK_CONNECT_MEMORY_ERROR, - 0, -1, NULL, NULL); + 0, -1, "pipe", NULL); unhook (hook_connect); return; } @@ -1710,7 +1710,7 @@ network_connect_with_fork (struct t_hook *hook_connect) (hook_connect->callback_pointer, hook_connect->callback_data, WEECHAT_HOOK_CONNECT_MEMORY_ERROR, - 0, -1, NULL, NULL); + 0, -1, "socketpair", NULL); unhook (hook_connect); return; } @@ -1732,7 +1732,7 @@ network_connect_with_fork (struct t_hook *hook_connect) (hook_connect->callback_pointer, hook_connect->callback_data, WEECHAT_HOOK_CONNECT_MEMORY_ERROR, - 0, -1, NULL, NULL); + 0, -1, "fork", NULL); unhook (hook_connect); return; /* child process */ |