pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-06 17:53:13 +02:00
Code Activity

Removed sizeof(char) and useless type casts from void* to another pointer type (patch from Leonid Evdokimov)

Browse Source
This commit is contained in:
Sebastien Helleu
2008-03-23 23:00:04 +01:00
parent 14feea7ab8
commit 57323fa71e
64 changed files with 273 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/irc/irc-channel.c
+2 -2
View File
@@ -47,7 +47,7 @@ irc_channel_new (struct t_irc_server *server, int channel_type,
struct t_gui_buffer *new_buffer;
/* alloc memory for new channel */
if ((new_channel = (struct t_irc_channel *)malloc (sizeof (struct t_irc_channel))) == NULL)
if ((new_channel = malloc (sizeof (*new_channel))) == NULL)
{
weechat_printf (NULL,
_("%s%s: cannot allocate new channel"),
@@ -411,7 +411,7 @@ irc_channel_get_notify_level (struct t_irc_server *server,
&& (server_default_notify == 1))
server_default_notify = 2;
name = (char *)malloc ((strlen (channel->name) + 2) * sizeof (char));
name = malloc (strlen (channel->name) + 2);
strcpy (name, channel->name);
strcat (name, ":");
pos = strstr (server->notify_levels, name);
src/plugins/irc/irc-color.c
+3 -3
View File
@@ -52,7 +52,7 @@ irc_color_decode (unsigned char *string, int keep_irc_colors,
return NULL;
/*out_length = (strlen ((char *)string) * 2) + 1;
out = (unsigned char *)malloc (out_length * sizeof (unsigned char));
out = malloc (out_length);
if (!out)
return NULL;
@@ -209,7 +209,7 @@ irc_color_decode_for_user_entry (unsigned char *string)
return NULL;
/*out_length = (strlen ((char *)string) * 2) + 1;
out = (unsigned char *)malloc (out_length * sizeof (unsigned char));
out = malloc (out_length);
if (!out)
return NULL;
@@ -278,7 +278,7 @@ irc_color_encode (unsigned char *string, int keep_colors)
return NULL;
/*out_length = (strlen ((char *)string) * 2) + 1;
out = (unsigned char *)malloc (out_length * sizeof (unsigned char));
out = malloc (out_length);
if (!out)
return NULL;
src/plugins/irc/irc-command.c
+3 -3
View File
@@ -119,7 +119,7 @@ irc_command_mode_nicks (struct t_irc_server *server, char *channel,
for (i = 1; i < argc; i++)
length += strlen (argv[i]) + 1;
length += strlen (channel) + (argc * strlen (mode)) + 32;
command = (char *)malloc (length * sizeof (char));
command = malloc (length);
if (command)
{
snprintf (command, length, "MODE %s %s", channel, set);
@@ -258,7 +258,7 @@ irc_command_away_server (struct t_irc_server *server, char *arguments)
{
if (server->away_message)
free (server->away_message);
server->away_message = (char *)malloc ((strlen (arguments) + 1) * sizeof (char));
server->away_message = malloc (strlen (arguments) + 1);
if (server->away_message)
strcpy (server->away_message, arguments);
@@ -1566,7 +1566,7 @@ irc_command_list (void *data, struct t_gui_buffer *buffer, int argc,
if (argc > 1)
{
ptr_server->cmd_list_regexp = (regex_t *)malloc (sizeof (regex_t));
ptr_server->cmd_list_regexp = malloc (sizeof (*ptr_server->cmd_list_regexp));
if (ptr_server->cmd_list_regexp)
{
if ((ret = regcomp (ptr_server->cmd_list_regexp,
src/plugins/irc/irc-completion.c
+1 -1
View File
@@ -232,7 +232,7 @@ irc_completion_channel_nicks_hosts_cb (void *data, char *completion,
{
length = strlen (ptr_nick->name) + 1 +
strlen (ptr_nick->host) + 1;
buf = (char *)malloc (length * sizeof (char));
buf = malloc (length);
if (buf)
{
snprintf (buf, length, "%s!%s",
src/plugins/irc/irc-dcc.c
+8 -9
View File
@@ -169,9 +169,9 @@ irc_dcc_find_filename (struct t_irc_dcc *ptr_dcc)
return;
}
ptr_dcc->local_filename = (char *)malloc ((strlen (dir2) +
strlen (ptr_dcc->nick) +
strlen (ptr_dcc->filename) + 4) * sizeof (char));
ptr_dcc->local_filename = malloc (strlen (dir2) +
strlen (ptr_dcc->nick) +
strlen (ptr_dcc->filename) + 4);
if (!ptr_dcc->local_filename)
return;
@@ -203,7 +203,7 @@ irc_dcc_find_filename (struct t_irc_dcc *ptr_dcc)
return;
}
filename2 = (char *)malloc ((strlen (ptr_dcc->local_filename) + 16) * sizeof (char));
filename2 = malloc (strlen (ptr_dcc->local_filename) + 16);
if (!filename2)
{
irc_dcc_close (ptr_dcc, IRC_DCC_FAILED);
@@ -722,7 +722,7 @@ irc_dcc_alloc ()
struct t_irc_dcc *new_dcc;
/* create new DCC struct */
if ((new_dcc = (struct t_irc_dcc *)malloc (sizeof (struct t_irc_dcc))) == NULL)
if ((new_dcc = malloc (sizeof (*new_dcc))) == NULL)
return NULL;
/* default values */
@@ -979,8 +979,7 @@ irc_dcc_send_request (struct t_irc_server *server, int type, char *nick,
free (dir1);
return;
}
filename2 = (char *)malloc ((strlen (dir2) +
strlen (filename) + 4) * sizeof (char));
filename2 = malloc (strlen (dir2) + strlen (filename) + 4);
if (!filename2)
{
gui_chat_printf_error (server->buffer,
@@ -1258,8 +1257,8 @@ irc_dcc_chat_recv (struct t_irc_dcc *dcc)
ptr_buf = buffer;
if (dcc->unterminated_message)
{
buf2 = (char *)malloc ((strlen (dcc->unterminated_message) +
strlen (buffer) + 1) * sizeof (char));
buf2 = malloc (strlen (dcc->unterminated_message) +
strlen (buffer) + 1);
if (buf2)
{
strcpy (buf2, dcc->unterminated_message);
src/plugins/irc/irc-mode.c
+4 -5
View File
@@ -224,8 +224,8 @@ irc_mode_user_add (struct t_irc_server *server, char mode)
{
if (!strchr (server->nick_modes, mode))
{
server->nick_modes = (char *)realloc (server->nick_modes,
(strlen (server->nick_modes) + 1 + 1) * sizeof (char));
server->nick_modes = realloc (server->nick_modes,
strlen (server->nick_modes) + 1 + 1);
strcat (server->nick_modes, str_mode);
//gui_status_draw (gui_current_window->buffer, 1);
//gui_input_draw (gui_current_window->buffer, 1);
@@ -233,7 +233,7 @@ irc_mode_user_add (struct t_irc_server *server, char mode)
}
else
{
server->nick_modes = (char *)malloc (2 * sizeof (char));
server->nick_modes = malloc (2);
strcpy (server->nick_modes, str_mode);
//gui_status_draw (gui_current_window->buffer, 1);
//gui_input_draw (gui_current_window->buffer, 1);
@@ -257,8 +257,7 @@ irc_mode_user_remove (struct t_irc_server *server, char mode)
{
new_size = strlen (server->nick_modes);
memmove (pos, pos + 1, strlen (pos + 1) + 1);
server->nick_modes = (char *)realloc (server->nick_modes,
new_size * sizeof (char));
server->nick_modes = realloc (server->nick_modes, new_size);
//gui_status_draw (gui_current_window->buffer, 1);
//gui_input_draw (gui_current_window->buffer, 1);
}
src/plugins/irc/irc-nick.c
+1 -1
View File
@@ -175,7 +175,7 @@ irc_nick_new (struct t_irc_server *server, struct t_irc_channel *channel,
}
/* alloc memory for new nick */
if ((new_nick = (struct t_irc_nick *)malloc (sizeof (struct t_irc_nick))) == NULL)
if ((new_nick = malloc (sizeof (*new_nick))) == NULL)
return NULL;
/* initialize new nick */
src/plugins/irc/irc-protocol.c
+2 -2
View File
@@ -1162,7 +1162,7 @@ irc_protocol_cmd_part (struct t_irc_server *server, char *command,
{
join_length = strlen (ptr_channel->name) + 1 +
strlen (ptr_channel->key) + 1;
join_string = (char *)malloc (join_length * sizeof (char));
join_string = malloc (join_length);
if (join_string)
{
snprintf (join_string, join_length, "%s %s",
@@ -3826,7 +3826,7 @@ irc_protocol_cmd_352 (struct t_irc_server *server, char *command,
if (ptr_nick->host)
free (ptr_nick->host);
length = strlen (argv[4]) + 1 + strlen (argv[5]) + 1;
ptr_nick->host = (char *)malloc (length * sizeof (char));
ptr_nick->host = malloc (length);
if (ptr_nick->host)
snprintf (ptr_nick->host, length, "%s@%s", argv[4], argv[5]);
if (pos_attr)
src/plugins/irc/irc-server.c
+13 -14
View File
@@ -239,7 +239,7 @@ irc_server_init_with_url (struct t_irc_server *server, char *irc_url)
server->autojoin = strdup (pos_channel);
else
{
server->autojoin = (char *)malloc ((strlen (pos_channel) + 2) * sizeof (char));
server->autojoin = malloc (strlen (pos_channel) + 2);
strcpy (server->autojoin, "#");
strcat (server->autojoin, pos_channel);
}
@@ -253,10 +253,10 @@ irc_server_init_with_url (struct t_irc_server *server, char *irc_url)
// some default values
if (server->port < 0)
server->port = IRC_SERVER_DEFAULT_PORT;
server->nick2 = (char *)malloc ((strlen (server->nick1) + 2) * sizeof (char));
server->nick2 = malloc (strlen (server->nick1) + 2);
strcpy (server->nick2, server->nick1);
server->nick2 = strcat (server->nick2, "1");
server->nick3 = (char *)malloc ((strlen (server->nick1) + 2) * sizeof (char));
server->nick3 = malloc (strlen (server->nick1) + 2);
strcpy (server->nick3, server->nick1);
server->nick3 = strcat (server->nick3, "2");
@@ -300,8 +300,7 @@ irc_server_set_addresses (struct t_irc_server *server, char *addresses)
server->addresses_array = weechat_string_explode (server->addresses,
",", 0, 0,
&server->addresses_count);
server->ports_array = (int *)malloc (server->addresses_count *
sizeof (int *));
server->ports_array = malloc (server->addresses_count * sizeof (server->ports_array[0]));
for (i = 0; i < server->addresses_count; i++)
{
pos = strchr (server->addresses_array[i], '/');
@@ -572,7 +571,7 @@ irc_server_alloc ()
struct t_irc_server *new_server;
/* alloc memory for new server */
if ((new_server = (struct t_irc_server *)malloc (sizeof (struct t_irc_server))) == NULL)
if ((new_server = malloc (sizeof (*new_server))) == NULL)
{
weechat_printf (NULL,
_("%s%s: error when allocating new server"),
@@ -606,7 +605,7 @@ irc_server_outqueue_add (struct t_irc_server *server, char *msg1, char *msg2,
{
struct t_irc_outqueue *new_outqueue;
new_outqueue = (struct t_irc_outqueue *)malloc (sizeof (struct t_irc_outqueue));
new_outqueue = malloc (sizeof (*new_outqueue));
if (new_outqueue)
{
new_outqueue->message_before_mod = (msg1) ? strdup (msg1) : NULL;
@@ -1288,7 +1287,7 @@ irc_server_msgq_add_msg (struct t_irc_server *server, char *msg)
if (!server->unterminated_message && !msg[0])
return;
message = (struct t_irc_message *)malloc (sizeof (struct t_irc_message));
message = malloc (sizeof (*message));
if (!message)
{
weechat_printf (server->buffer,
@@ -1300,8 +1299,8 @@ irc_server_msgq_add_msg (struct t_irc_server *server, char *msg)
message->server = server;
if (server->unterminated_message)
{
message->data = (char *)malloc ((strlen (server->unterminated_message) +
strlen (msg) + 1) * sizeof (char));
message->data = malloc (strlen (server->unterminated_message) +
strlen (msg) + 1);
if (!message->data)
{
weechat_printf (server->buffer,
@@ -1346,9 +1345,9 @@ irc_server_msgq_add_unterminated (struct t_irc_server *server, char *string)
if (server->unterminated_message)
{
server->unterminated_message =
(char *)realloc (server->unterminated_message,
(strlen (server->unterminated_message) +
strlen (string) + 1) * sizeof (char));
realloc (server->unterminated_message,
(strlen (server->unterminated_message) +
strlen (string) + 1));
if (!server->unterminated_message)
{
weechat_printf (server->buffer,
@@ -2210,7 +2209,7 @@ irc_server_pass_socks5proxy (int sock, char *address, int port)
/* authentication successful then giving address/port to connect */
addr_len = strlen(address);
addr_buffer_len = 4 + 1 + addr_len + 2;
addr_buffer = (unsigned char *)malloc (addr_buffer_len * sizeof(*addr_buffer));
addr_buffer = malloc (addr_buffer_len * sizeof(*addr_buffer));
if (!addr_buffer)
return 1;
addr_buffer[0] = 5; /* version 5 */