pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-30 23:06:38 +02:00
Code Activity

Merge pull request #1012 from sim642/clion

Browse Source 
Small fixes and code cleanup for problems found by CLion inspections
This commit is contained in:
Sébastien Helleu
2017-06-04 12:36:50 +02:00
committed by GitHub
parent a195fa2af5 43451e8481
commit fc6c165c49
27 changed files with 22 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/wee-command.c
+1 -1
View File
@@ -1740,7 +1740,7 @@ COMMAND_CALLBACK(debug)
if (string_strcasecmp (argv[1], "color") == 0)
{
gui_color_dump (buffer);
gui_color_dump ();
return WEECHAT_RC_OK;
}
src/core/wee-infolist.h
+2
View File
@@ -22,6 +22,8 @@
#include <time.h>
struct t_weechat_plugin;
/* list structures */
enum t_infolist_type
src/core/wee-secure.c
-2
View File
@@ -42,8 +42,6 @@
#define SALT_SIZE 8
struct t_config_file *secure_config_file = NULL;
struct t_config_section *secure_config_section_crypt = NULL;
struct t_config_section *secure_config_section_data = NULL;
struct t_config_option *secure_config_crypt_cipher = NULL;
struct t_config_option *secure_config_crypt_hash_algo = NULL;
src/gui/gui-bar-item.c
-2
View File
@@ -81,8 +81,6 @@ char *gui_bar_items_default_for_bars[][2] =
struct t_gui_bar_item_hook *gui_bar_item_hooks = NULL;
struct t_hook *gui_bar_item_timer = NULL;
struct t_hdata *gui_bar_item_hdata_bar_item = NULL;
/*
* Checks if a bar item pointer is valid.
src/gui/gui-bar-window.h
+2 -1
View File
@@ -20,10 +20,11 @@
#ifndef WEECHAT_GUI_BAR_WINDOW_H
#define WEECHAT_GUI_BAR_WINDOW_H 1
#include "gui-bar.h"
struct t_infolist;
struct t_gui_buffer;
struct t_gui_window;
enum t_gui_bar_position;
struct t_gui_bar_window_coords
{
src/gui/gui-chat.h
-2
View File
@@ -105,7 +105,5 @@ extern const char *gui_chat_string_next_char (struct t_gui_window *window,
int apply_style_inactive,
int nick_offline);
extern void gui_chat_draw (struct t_gui_buffer *buffer, int clear_chat);
extern void gui_chat_draw_line (struct t_gui_buffer *buffer,
struct t_gui_line *line);
#endif /* WEECHAT_GUI_CHAT_H */
src/gui/gui-completion.c
-25
View File
@@ -1398,31 +1398,6 @@ gui_completion_hdata_completion_cb (const void *pointer, void *data,
return hdata;
}
/*
* Returns hdata for completion word.
*/
struct t_hdata *
gui_completion_hdata_completion_word_cb (const void *pointer, void *data,
const char *hdata_name)
{
struct t_hdata *hdata;
/* make C compiler happy */
(void) pointer;
(void) data;
hdata = hdata_new (NULL, hdata_name, "prev_item", "next_item",
0, 0, NULL, NULL);
if (hdata)
{
HDATA_VAR(struct t_gui_completion_word, word, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_completion_word, nick_completion, CHAR, 0, NULL, NULL);
HDATA_VAR(struct t_gui_completion_word, count, INTEGER, 0, NULL, NULL);
}
return hdata;
}
/*
* Prints list of completion words in WeeChat log file (usually for crash dump).
*/
src/gui/gui-completion.h
-3
View File
@@ -83,9 +83,6 @@ extern const char *gui_completion_get_string (struct t_gui_completion *completio
extern struct t_hdata *gui_completion_hdata_completion_cb (const void *pointer,
void *data,
const char *hdata_name);
extern struct t_hdata *gui_completion_hdata_completion_partial_cb (const void *pointer,
void *data,
const char *hdata_name);
extern void gui_completion_print_log (struct t_gui_completion *completion);
#endif /* WEECHAT_GUI_COMPLETION_H */
src/gui/gui-focus.h
+1 -1
View File
@@ -18,7 +18,7 @@
*/
#ifndef WEECHAT_GUI_FOCUS_H
#define WEECHAT_GUI_FOCUS 1
#define WEECHAT_GUI_FOCUS_H 1
/* focus structures */
src/gui/gui-key.c
-22
View File
@@ -1006,28 +1006,6 @@ gui_key_focus_matching (struct t_gui_key *key,
return match[0] && match[1];
}
/*
* Callback for replacing values in string with a hashtable.
*/
char *
gui_key_focus_command_replace_cb (void *data, const char *text)
{
struct t_hashtable *ptr_hashtable;
const char *ptr_value;
ptr_hashtable = (struct t_hashtable *)data;
if (ptr_hashtable)
{
ptr_value = hashtable_get (ptr_hashtable, text);
if (ptr_value)
return strdup (ptr_value);
}
return NULL;
}
/*
* Runs command according to focus.
*
src/gui/gui-key.h
+1 -1
View File
@@ -140,6 +140,6 @@ extern void gui_key_print_log (struct t_gui_buffer *buffer);
/* key functions (GUI dependent) */
extern void gui_key_default_bindings ();
extern void gui_key_default_bindings (int context);
#endif /* WEECHAT_GUI_KEY_H */
src/gui/gui-layout.h
-2
View File
@@ -129,7 +129,5 @@ extern int gui_layout_window_add_to_infolist (struct t_infolist *infolist,
extern int gui_layout_add_to_infolist (struct t_infolist *infolist,
struct t_gui_layout *layout);
extern void gui_layout_print_log ();
extern void gui_layout_init ();
extern void gui_layout_end ();
#endif /* WEECHAT_GUI_LAYOUT_H */
src/gui/gui-line.h
-1
View File
@@ -97,7 +97,6 @@ extern int gui_line_has_offline_nick (struct t_gui_line *line);
extern void gui_line_compute_buffer_max_length (struct t_gui_buffer *buffer,
struct t_gui_lines *lines);
extern void gui_line_compute_prefix_max_length (struct t_gui_lines *lines);
extern void gui_line_set_prefix_same_nick (struct t_gui_line *line);
extern void gui_line_mixed_free_buffer (struct t_gui_buffer *buffer);
extern void gui_line_mixed_free_all (struct t_gui_buffer *buffer);
extern void gui_line_free (struct t_gui_buffer *buffer,
src/plugins/buflist/buflist.h
-1
View File
@@ -33,7 +33,6 @@ extern struct t_hdata *buflist_hdata_hotlist;
extern void buflist_add_bar ();
extern void buflist_buffer_get_irc_pointers(struct t_gui_buffer *buffer,
void **irc_server, void **irc_channel);
extern struct t_gui_hotlist *buflist_search_hotlist_for_buffer (struct t_gui_buffer *buffer);
extern struct t_arraylist *buflist_sort_buffers ();
#endif /* WEECHAT_BUFLIST_H */
src/plugins/exec/exec-config.h
-1
View File
@@ -21,7 +21,6 @@
#define WEECHAT_EXEC_CONFIG_H 1
#define EXEC_CONFIG_NAME "exec"
#define EXEC_CONFIG_SECTION_EXEC "exec"
extern struct t_config_file *exec_config_file;
src/plugins/fifo/fifo.c
+1 -1
View File
@@ -54,7 +54,7 @@ char *fifo_filename = NULL;
char *fifo_unterminated = NULL;
int fifo_fd_cb ();
int fifo_fd_cb (const void *pointer, void *data, int fd);
/*
src/plugins/fifo/fifo.h
-1
View File
@@ -22,7 +22,6 @@
#define weechat_plugin weechat_fifo_plugin
#define FIFO_PLUGIN_NAME "fifo"
#define FIFO_OPTION_NAME "fifo"
extern struct t_weechat_plugin *weechat_fifo_plugin;
extern int fifo_quiet;
src/plugins/irc/irc-buffer.h
-5
View File
@@ -38,11 +38,6 @@
&ptr_channel); \
}
#define IRC_BUFFER_RAW_NAME "irc_raw"
#define IRC_BUFFER_RAW_PREFIX_RECV "-->"
#define IRC_BUFFER_RAW_PREFIX_RECV_MOD "==>"
#define IRC_BUFFER_RAW_PREFIX_SEND "<--"
#define IRC_BUFFER_RAW_PREFIX_SEND_MOD "<=="
struct t_gui_buffer;
struct t_irc_server;
src/plugins/irc/irc-msgbuffer.h
-6
View File
@@ -32,12 +32,6 @@ enum t_irc_msgbuffer_target
struct t_irc_server;
struct t_irc_msgbuffer
{
char *message; /* IRC message */
enum t_irc_msgbuffer_target target; /* target buffer */
};
extern struct t_gui_buffer *irc_msgbuffer_get_target_buffer (struct t_irc_server *server,
const char *nick,
const char *message,
src/plugins/irc/irc-server.h
+1 -1
View File
@@ -337,7 +337,7 @@ char *irc_server_fingerprint_str_sizes ();
#endif /* HAVE_GNUTLS */
extern int irc_server_connect (struct t_irc_server *server);
extern void irc_server_auto_connect (int auto_connect);
extern void irc_server_autojoin_channels ();
extern void irc_server_autojoin_channels (struct t_irc_server *server);
extern int irc_server_recv_cb (const void *pointer, void *data, int fd);
extern int irc_server_timer_sasl_cb (const void *pointer, void *data,
int remaining_calls);
src/plugins/plugin-api.h
-6
View File
@@ -22,12 +22,6 @@
#include <time.h>
struct t_plugin_api_hdata
{
char *name; /* hdata name */
struct t_hdata *(*callback_get_hdata)(); /* callback to get hdata */
};
/* strings */
extern void plugin_api_charset_set (struct t_weechat_plugin *plugin,
const char *charset);
src/plugins/relay/irc/relay-irc.c
+2 -5
View File
@@ -1773,13 +1773,12 @@ relay_irc_close_connection (struct t_relay_client *client)
void
relay_irc_alloc (struct t_relay_client *client)
{
struct t_relay_irc_data *irc_data;
char *password;
password = weechat_string_eval_expression (weechat_config_string (relay_config_network_password),
NULL, NULL, NULL);
client->protocol_data = malloc (sizeof (*irc_data));
client->protocol_data = malloc (sizeof (struct t_relay_irc_data));
if (client->protocol_data)
{
RELAY_IRC_DATA(client, address) = strdup ("weechat.relay.irc");
@@ -1810,9 +1809,7 @@ void
relay_irc_alloc_with_infolist (struct t_relay_client *client,
struct t_infolist *infolist)
{
struct t_relay_irc_data *irc_data;
client->protocol_data = malloc (sizeof (*irc_data));
client->protocol_data = malloc (sizeof (struct t_relay_irc_data));
if (client->protocol_data)
{
RELAY_IRC_DATA(client, address) = strdup (weechat_infolist_string (infolist, "address"));
src/plugins/relay/relay-config.c
+3 -1
View File
@@ -776,7 +776,9 @@ relay_config_init ()
"interfaces, use \"127.0.0.1\" to allow connections from "
"local machine only)"),
NULL, 0, 0, "", NULL, 0,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
NULL, NULL, NULL,
&relay_config_change_network_bind_address_cb, NULL, NULL,
NULL, NULL, NULL);
relay_config_network_clients_purge_delay = weechat_config_new_option (
relay_config_file, ptr_section,
"clients_purge_delay", "integer",
src/plugins/relay/weechat/relay-weechat-protocol.h
-5
View File
@@ -86,11 +86,6 @@ extern int relay_weechat_protocol_signal_buffer_cb (const void *pointer,
const char *signal,
const char *type_data,
void *signal_data);
extern int relay_weechat_protocol_signal_nicklist_cb (const void *pointer,
void *data,
const char *signal,
const char *type_data,
void *signal_data);
extern int relay_weechat_protocol_hsignal_nicklist_cb (const void *pointer,
void *data,
const char *signal,
src/plugins/relay/weechat/relay-weechat.c
+2 -4
View File
@@ -166,13 +166,12 @@ relay_weechat_free_buffers_nicklist (struct t_hashtable *hashtable,
void
relay_weechat_alloc (struct t_relay_client *client)
{
struct t_relay_weechat_data *weechat_data;
char *password;
password = weechat_string_eval_expression (weechat_config_string (relay_config_network_password),
NULL, NULL, NULL);
client->protocol_data = malloc (sizeof (*weechat_data));
client->protocol_data = malloc (sizeof (struct t_relay_weechat_data));
if (client->protocol_data)
{
RELAY_WEECHAT_DATA(client, password_ok) = (password && password[0]) ? 0 : 1;
@@ -212,12 +211,11 @@ void
relay_weechat_alloc_with_infolist (struct t_relay_client *client,
struct t_infolist *infolist)
{
struct t_relay_weechat_data *weechat_data;
int index, value;
char name[64];
const char *key;
client->protocol_data = malloc (sizeof (*weechat_data));
client->protocol_data = malloc (sizeof (struct t_relay_weechat_data));
if (client->protocol_data)
{
/* general stuff */
src/plugins/script/script-config.c
-3
View File
@@ -34,9 +34,6 @@
struct t_config_file *script_config_file = NULL;
struct t_config_section *script_config_section_look = NULL;
struct t_config_section *script_config_section_color = NULL;
struct t_config_section *script_config_section_scripts = NULL;
/* script config, look section */
src/plugins/weechat-plugin.h
+6
View File
@@ -36,14 +36,20 @@ extern "C" {
#endif /* PATH_MAX */
struct t_config_option;
struct t_config_section;
struct t_config_file;
struct t_gui_window;
struct t_gui_buffer;
struct t_gui_bar;
struct t_gui_bar_item;
struct t_gui_completion;
struct t_gui_nick;
struct t_gui_nick_group;
struct t_infolist;
struct t_infolist_item;
struct t_upgrade_file;
struct t_weelist;
struct t_weelist_item;
struct t_arraylist;
struct t_hashtable;
struct t_hdata;