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

1 files changed, 11 insertions, 11 deletions

diff --git a/src/plugins/scripts/script.c b/src/plugins/scripts/script.c
index 53f9dc425..c7c5d507f 100644
--- a/src/plugins/scripts/script.c
+++ b/src/plugins/scripts/script.c
@@ -101,7 +101,7 @@ script_init (struct t_weechat_plugin *weechat_plugin,
     
     /* add hook for config option */
     length = strlen (weechat_plugin->name) + 32;
-    string = (char *)malloc (length * sizeof (char));
+    string = malloc (length);
     if (string)
     {
         snprintf (string, length, "%s.%s",
@@ -114,7 +114,7 @@ script_init (struct t_weechat_plugin *weechat_plugin,
     /* create directories in WeeChat home */
     weechat_mkdir_home (weechat_plugin->name, 0755);
     length = strlen (weechat_plugin->name) + strlen ("/autoload") + 1;
-    string = (char *)malloc (length * sizeof (char));
+    string = malloc (length);
     if (string)
     {
         snprintf (string, length, "%s/autoload", weechat_plugin->name);
@@ -124,7 +124,7 @@ script_init (struct t_weechat_plugin *weechat_plugin,
     
     /* add command */
     length = strlen (completion) + strlen (weechat_plugin->name) + 16;
-    string = (char *)malloc (length * sizeof (char));
+    string = malloc (length);
     if (string)
     {
         snprintf (string, length, "%s|%%(%s_script)",
@@ -146,7 +146,7 @@ script_init (struct t_weechat_plugin *weechat_plugin,
 
     /* add completion */
     length = strlen (weechat_plugin->name) + 16;
-    string = (char *)malloc (length * sizeof (char));
+    string = malloc (length);
     if (string)
     {
         snprintf (string, length, "%s_script", weechat_plugin->name);
@@ -214,7 +214,7 @@ script_auto_load (struct t_weechat_plugin *weechat_plugin,
     if (!dir_home)
         return;
     dir_length = strlen (dir_home) + strlen (weechat_plugin->name) + 16;
-    dir_name = (char *)malloc (dir_length * sizeof (char));
+    dir_name = malloc (dir_length);
     if (!dir_name)
         return;
     
@@ -264,7 +264,7 @@ script_search_full_name (struct t_weechat_plugin *weechat_plugin,
         if (!dir_home)
             return NULL;
         length = strlen (dir_home) + strlen (filename + 1) + 1;
-        final_name = (char *)malloc (length * sizeof (char));
+        final_name = malloc (length);
         if (final_name)
         {
             snprintf (final_name, length, "%s%s", dir_home, filename + 1);
@@ -279,7 +279,7 @@ script_search_full_name (struct t_weechat_plugin *weechat_plugin,
         /* try WeeChat user's autoload dir */
         length = strlen (dir_home) + strlen (weechat_plugin->name) + 8 +
             strlen (filename) + 16;
-        final_name = (char *)malloc (length * sizeof (char));
+        final_name = malloc (length);
         if (final_name)
         {
             snprintf (final_name, length,
@@ -293,7 +293,7 @@ script_search_full_name (struct t_weechat_plugin *weechat_plugin,
         /* try WeeChat language user's dir */
         length = strlen (dir_home) + strlen (weechat_plugin->name) +
             strlen (filename) + 16;
-        final_name = (char *)malloc (length * sizeof (char));
+        final_name = malloc (length);
         if (final_name)
         {
             snprintf (final_name, length,
@@ -305,7 +305,7 @@ script_search_full_name (struct t_weechat_plugin *weechat_plugin,
         
         /* try WeeChat user's dir */
         length = strlen (dir_home) + strlen (filename) + 16;
-        final_name = (char *)malloc (length * sizeof (char));
+        final_name = malloc (length);
         if (final_name)
         {
             snprintf (final_name, length,
@@ -322,7 +322,7 @@ script_search_full_name (struct t_weechat_plugin *weechat_plugin,
     {
         length = strlen (dir_system) + strlen (weechat_plugin->name) +
             strlen (filename) + 16;
-        final_name = (char *)malloc (length * sizeof (char));
+        final_name = malloc (length);
         if (final_name)
         {
             snprintf (final_name,length,
@@ -369,7 +369,7 @@ script_add (struct t_weechat_plugin *weechat_plugin,
                         license, name, weechat_plugin->license);
     }
     
-    new_script = (struct t_plugin_script *)malloc (sizeof (struct t_plugin_script));
+    new_script = malloc (sizeof (*new_script));
     if (new_script)
     {
         new_script->filename = strdup (filename);