No need to cast malloc() return value.

diff --git a/lib/util/alloc.c b/lib/util/alloc.c
index 5f2208d52179bb29307b56757bea82c58b7fb359..77164c9cdd462f62bd0c12c310c3e70a8d00a936 100644 (file)
--- a/lib/util/alloc.c
+++ b/lib/util/alloc.c
@@ -197,7 +197,7 @@ sudo_estrdup_v1(const char *src)
 
     if (src != NULL) {
        len = strlen(src);
-       dst = (char *) sudo_emalloc(len + 1);
+       dst = sudo_emalloc(len + 1);
        (void) memcpy(dst, src, len);
        dst[len] = '\0';
     }
@@ -219,7 +219,7 @@ sudo_estrndup_v1(const char *src, size_t maxlen)
            len++;
            maxlen--;
        }
-       dst = (char *) sudo_emalloc(len + 1);
+       dst = sudo_emalloc(len + 1);
        (void) memcpy(dst, src, len);
        dst[len] = '\0';
     }

diff --git a/lib/util/snprintf.c b/lib/util/snprintf.c
index 5cda8e2b66de1ff3acb94194b1063e7286da4b4f..25b53e68995248912debcbb79bd8fcbfb0fa17d7 100644 (file)
--- a/lib/util/snprintf.c
+++ b/lib/util/snprintf.c
@@ -370,7 +370,7 @@ xxxprintf(char **strp, size_t strsize, int alloc, const char *fmt0, va_list ap)
                if (alloc && str >= estr) { \
                        char *t; \
                        strsize = (strsize << 1) + 1; \
-                       if (!(t = (char *)realloc(*strp, strsize))) { \
+                       if (!(t = realloc(*strp, strsize))) { \
                                free(str); \
                                *strp = NULL; \
                                ret = -1; \

diff --git a/plugins/sample/sample_plugin.c b/plugins/sample/sample_plugin.c
index 423ab3f3fe81b4e000d6eade2a6814ada970963c..32a3f5da951f95f762d612511048bc83351af2ce 100644 (file)
--- a/plugins/sample/sample_plugin.c
+++ b/plugins/sample/sample_plugin.c
@@ -286,7 +286,7 @@ find_editor(int nfiles, char * const files[], char **argv_out[])
     }
     if (editor_path != editor)
        free(editor);
-    nargv = (char **) malloc((nargc + 1 + nfiles + 1) * sizeof(char *));
+    nargv = malloc((nargc + 1 + nfiles + 1) * sizeof(char *));
     if (nargv == NULL) {
        sudo_log(SUDO_CONV_ERROR_MSG, "unable to allocate memory\n");
        free(editor_path);

diff --git a/plugins/sudoers/auth/rfc1938.c b/plugins/sudoers/auth/rfc1938.c
index 0831d014d3c06c038172743ecfc0315526b4e74a..ca6f1e64d68ba28b3ab48f3a0ff64c333926b4f2 100644 (file)
--- a/plugins/sudoers/auth/rfc1938.c
+++ b/plugins/sudoers/auth/rfc1938.c
@@ -110,7 +110,7 @@ sudo_rfc1938_setup(struct passwd *pw, char **promptp, sudo_auth *auth)
     /* Get space for new prompt with embedded challenge */
     if (np_size < op_len + strlen(challenge) + 7) {
        np_size = op_len + strlen(challenge) + 7;
-       new_prompt = (char *) sudo_erealloc(new_prompt, np_size);
+       new_prompt = sudo_erealloc(new_prompt, np_size);
     }
 
     if (def_long_otp_prompt)

diff --git a/plugins/sudoers/redblack.c b/plugins/sudoers/redblack.c
index 548e2189fb35775b1527a1756d3cd4ee886770f8..96a1165be225b6853028e27f4ef6281091c2dc77 100644 (file)
--- a/plugins/sudoers/redblack.c
+++ b/plugins/sudoers/redblack.c
@@ -90,7 +90,7 @@ rbcreate(int (*compar)(const void *, const void*))
     struct rbtree *tree;
     debug_decl(rbcreate, SUDOERS_DEBUG_RBTREE)
 
-    tree = (struct rbtree *) sudo_emalloc(sizeof(*tree));
+    tree = sudo_emalloc(sizeof(*tree));
     tree->compar = compar;
 
     /*
@@ -185,7 +185,7 @@ rbinsert(struct rbtree *tree, void *data)
        node = res < 0 ? node->left : node->right;
     }
 
-    node = (struct rbnode *) sudo_emalloc(sizeof(*node));
+    node = sudo_emalloc(sizeof(*node));
     node->data = data;
     node->left = node->right = rbnil(tree);
     node->parent = parent;

diff --git a/plugins/sudoers/testsudoers.c b/plugins/sudoers/testsudoers.c
index 7c93e96016d58fcec81c9149a7311ff73701fec1..482c24a90570ffb8bc8d4af9ea1104e53831217b 100644 (file)
--- a/plugins/sudoers/testsudoers.c
+++ b/plugins/sudoers/testsudoers.c
@@ -236,7 +236,7 @@ main(int argc, char *argv[])
        for (size = 0, from = argv; *from; from++)
            size += strlen(*from) + 1;
 
-       user_args = (char *) sudo_emalloc(size);
+       user_args = sudo_emalloc(size);
        for (to = user_args, from = argv; *from; from++) {
            n = strlcpy(to, *from, size - (to - user_args));
            if (n >= size - (to - user_args))

diff --git a/plugins/sudoers/toke_util.c b/plugins/sudoers/toke_util.c
index 47e5c1680c7f6846d4a50bddc797241a5d11fa8e..5c9bf7f2784e206759474b242d4c34410c6a0f37 100644 (file)
--- a/plugins/sudoers/toke_util.c
+++ b/plugins/sudoers/toke_util.c
@@ -116,7 +116,7 @@ fill_cmnd(const char *src, int len)
 
     arg_len = arg_size = 0;
 
-    dst = sudoerslval.command.cmnd = (char *) malloc(len + 1);
+    dst = sudoerslval.command.cmnd = malloc(len + 1);
     if (sudoerslval.command.cmnd == NULL) {
        sudo_warn(NULL);
        sudoerserror(NULL);
@@ -155,8 +155,7 @@ fill_args(const char *s, int len, int addspace)
            ;
 
        p = sudoerslval.command.args ?
-           (char *) realloc(sudoerslval.command.args, arg_size) :
-           (char *) malloc(arg_size);
+           realloc(sudoerslval.command.args, arg_size) : malloc(arg_size);
        if (p == NULL) {
            sudo_efree(sudoerslval.command.args);
            sudo_warn(NULL);