picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

use more appropriate alternatives to malloc()

Browse source 
Use calloc to request cleared memory instead.
Kernel and libc conspire to make this more efficient.

Also, replace one malloc() + strcpy() with strdup().

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
This commit is contained in:
Alan Jenkins 2008-10-21 11:10:32 +01:00 committed by Kay Sievers
parent a8a8930072
commit b29a5e4ab9
10 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
extras/collect/collect.c
View file

@ -171,8 +171,7 @@ static int checkout(int fd)
if (debug)
fprintf(stderr, "Found word %s\n", word);
him = malloc(sizeof (struct _mate));
him->name = malloc(strlen(word) + 1);
strcpy(him->name, word);
him->name = strdup(word);
him->state = STATE_OLD;
udev_list_node_append(&him->node, &bunch);
word = NULL;

3
extras/volume_id/lib/volume_id.c
View file

@ -483,10 +483,9 @@ struct volume_id *volume_id_open_fd(int fd)
{
struct volume_id *id;
id = malloc(sizeof(struct volume_id));
id = calloc(1, sizeof(struct volume_id));
if (id == NULL)
return NULL;
memset(id, 0x00, sizeof(struct volume_id));
id->fd = fd;

6
udev/lib/libudev-ctrl.c
View file

@ -72,10 +72,9 @@ struct udev_ctrl *udev_ctrl_new_from_socket(struct udev *udev, const char *socke
{
struct udev_ctrl *uctrl;
uctrl = malloc(sizeof(struct udev_ctrl));
uctrl = calloc(1, sizeof(struct udev_ctrl));
if (uctrl == NULL)
return NULL;
memset(uctrl, 0x00, sizeof(struct udev_ctrl));
uctrl->refcount = 1;
uctrl->udev = udev;
@ -213,10 +212,9 @@ struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl *uctrl)
struct ucred *cred;
char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
uctrl_msg = malloc(sizeof(struct udev_ctrl_msg));
uctrl_msg = calloc(1, sizeof(struct udev_ctrl_msg));
if (uctrl_msg == NULL)
return NULL;
memset(uctrl_msg, 0x00, sizeof(struct udev_ctrl_msg));
uctrl_msg->refcount = 1;
uctrl_msg->uctrl = uctrl;

3
udev/lib/libudev-device.c
View file

@ -236,10 +236,9 @@ struct udev_device *device_new(struct udev *udev)
if (udev == NULL)
return NULL;
udev_device = malloc(sizeof(struct udev_device));
udev_device = calloc(1, sizeof(struct udev_device));
if (udev_device == NULL)
return NULL;
memset(udev_device, 0x00, sizeof(struct udev_device));
udev_device->refcount = 1;
udev_device->udev = udev;
udev_list_init(&udev_device->devlinks_list);

3
udev/lib/libudev-enumerate.c
View file

@ -53,10 +53,9 @@ struct udev_enumerate *udev_enumerate_new(struct udev *udev)
{
struct udev_enumerate *udev_enumerate;
udev_enumerate = malloc(sizeof(struct udev_enumerate));
udev_enumerate = calloc(1, sizeof(struct udev_enumerate));
if (udev_enumerate == NULL)
return NULL;
memset(udev_enumerate, 0x00, (sizeof(struct udev_enumerate)));
udev_enumerate->refcount = 1;
udev_enumerate->udev = udev;
udev_list_init(&udev_enumerate->devices_list);

6
udev/lib/libudev-monitor.c
View file

@ -67,10 +67,9 @@ struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char
return NULL;
if (socket_path == NULL)
return NULL;
udev_monitor = malloc(sizeof(struct udev_monitor));
udev_monitor = calloc(1, sizeof(struct udev_monitor));
if (udev_monitor == NULL)
return NULL;
memset(udev_monitor, 0x00, sizeof(struct udev_monitor));
udev_monitor->refcount = 1;
udev_monitor->udev = udev;
@ -105,10 +104,9 @@ struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev)
if (udev == NULL)
return NULL;
udev_monitor = malloc(sizeof(struct udev_monitor));
udev_monitor = calloc(1, sizeof(struct udev_monitor));
if (udev_monitor == NULL)
return NULL;
memset(udev_monitor, 0x00, sizeof(struct udev_monitor));
udev_monitor->refcount = 1;
udev_monitor->udev = udev;

3
udev/lib/libudev-queue.c
View file

@ -45,10 +45,9 @@ struct udev_queue *udev_queue_new(struct udev *udev)
if (udev == NULL)
return NULL;
udev_queue = malloc(sizeof(struct udev_queue));
udev_queue = calloc(1, sizeof(struct udev_queue));
if (udev_queue == NULL)
return NULL;
memset(udev_queue, 0x00, sizeof(struct udev_queue));
udev_queue->refcount = 1;
udev_queue->udev = udev;
udev_list_init(&udev_queue->queue_list);

3
udev/lib/libudev.c
View file

@ -96,10 +96,9 @@ struct udev *udev_new(void)
char *config_file;
FILE *f;
udev = malloc(sizeof(struct udev));
udev = calloc(1, sizeof(struct udev));
if (udev == NULL)
return NULL;
memset(udev, 0x00, (sizeof(struct udev)));
udev->refcount = 1;
udev->log_fn = log_stderr;
udev->log_priority = LOG_ERR;

3
udev/udev-event.c
View file

@ -34,10 +34,9 @@ struct udev_event *udev_event_new(struct udev_device *dev)
{
struct udev_event *event;
event = malloc(sizeof(struct udev_event));
event = calloc(1, sizeof(struct udev_event));
if (event == NULL)
return NULL;
memset(event, 0x00, sizeof(struct udev_event));
event->dev = dev;
event->udev = udev_device_get_udev(dev);

3
udev/udev-rules.c
View file

@ -1772,10 +1772,9 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
struct udev_list_node file_list;
struct udev_list_entry *file_loop, *file_tmp;
rules = malloc(sizeof(struct udev_rules));
rules = calloc(1, sizeof(struct udev_rules));
if (rules == NULL)
return rules;
memset(rules, 0x00, sizeof(struct udev_rules));
rules->udev = udev;
rules->resolve_names = resolve_names;
udev_list_init(&file_list);