X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fexec.c;h=4c45dc158a267951cde5a8d608fe25be905f0a61;hb=d13a04dc3645a21acecc14a4174837766ecb6a2b;hp=0445b14a91f879bdfccb2cd44024586741ce5888;hpb=73664a19a54b440056f0f346e444b1d06626f481;p=collectd.git diff --git a/src/exec.c b/src/exec.c index 0445b14a..4c45dc15 100644 --- a/src/exec.c +++ b/src/exec.c @@ -18,11 +18,12 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * * Authors: - * Florian octo Forster + * Florian octo Forster * Sebastian Harl * Peter Holik **/ +#define _DEFAULT_SOURCE #define _BSD_SOURCE /* For setgroups */ #include "collectd.h" @@ -125,7 +126,7 @@ static int exec_config_exec (oconfig_item_t *ci) /* {{{ */ return (-1); } - pl = (program_list_t *) malloc (sizeof (program_list_t)); + pl = malloc (sizeof (*pl)); if (pl == NULL) { ERROR ("exec plugin: malloc failed."); @@ -162,7 +163,7 @@ static int exec_config_exec (oconfig_item_t *ci) /* {{{ */ return (-1); } - pl->argv = (char **) malloc (ci->values_num * sizeof (char *)); + pl->argv = malloc (ci->values_num * sizeof (*pl->argv)); if (pl->argv == NULL) { ERROR ("exec plugin: malloc failed."); @@ -868,8 +869,7 @@ static int exec_notification (const notification_t *n, /* {{{ */ if (pl->pid != 0) continue; - pln = (program_list_and_notification_t *) malloc (sizeof - (program_list_and_notification_t)); + pln = malloc (sizeof (*pln)); if (pln == NULL) { ERROR ("exec plugin: malloc failed.");