diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dhcp-client.c | 2 | ||||
| -rw-r--r-- | lib/dpif-netdev.c | 4 | ||||
| -rw-r--r-- | lib/learning-switch.c | 2 | ||||
| -rw-r--r-- | lib/netdev-linux.c | 2 | ||||
| -rw-r--r-- | lib/poll-loop.c | 2 | ||||
| -rw-r--r-- | lib/process.c | 2 | ||||
| -rw-r--r-- | lib/rconn.c | 2 | ||||
| -rw-r--r-- | lib/stp.c | 2 | ||||
| -rw-r--r-- | lib/util.c | 6 | ||||
| -rw-r--r-- | lib/util.h | 1 |
10 files changed, 16 insertions, 9 deletions
diff --git a/lib/dhcp-client.c b/lib/dhcp-client.c index 4f9078133..720cd2fad 100644 --- a/lib/dhcp-client.c +++ b/lib/dhcp-client.c @@ -172,7 +172,7 @@ dhclient_create(const char *netdev_name, return error; } - cli = xcalloc(1, sizeof *cli); + cli = xzalloc(sizeof *cli); cli->modify_request = modify_request; cli->validate_offer = validate_offer; cli->aux = aux; diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 4c25f1393..8bd9648de 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -219,7 +219,7 @@ create_dp_netdev(const char *name, int dp_idx, struct dpif **dpifp) } /* Create datapath. */ - dp_netdevs[dp_idx] = dp = xcalloc(1, sizeof *dp); + dp_netdevs[dp_idx] = dp = xzalloc(sizeof *dp); list_push_back(&dp_netdev_list, &dp->node); dp->dp_idx = dp_idx; dp->open_cnt = 0; @@ -788,7 +788,7 @@ add_flow(struct dpif *dpif, struct odp_flow *odp_flow) struct dp_netdev_flow *flow; int error; - flow = xcalloc(1, sizeof *flow); + flow = xzalloc(sizeof *flow); flow->key = odp_flow->key; flow->key.reserved = 0; diff --git a/lib/learning-switch.c b/lib/learning-switch.c index 73464c688..99d5ee4c0 100644 --- a/lib/learning-switch.c +++ b/lib/learning-switch.c @@ -110,7 +110,7 @@ lswitch_create(struct rconn *rconn, bool learn_macs, int max_idle) struct lswitch *sw; size_t i; - sw = xcalloc(1, sizeof *sw); + sw = xzalloc(sizeof *sw); sw->max_idle = max_idle; sw->datapath_id = 0; sw->last_features_request = time_now() - 1; diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c index 73247030d..c33405fd3 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -203,7 +203,7 @@ netdev_linux_open(const char *name, char *suffix, int ethertype, int error; /* Allocate network device. */ - netdev = xcalloc(1, sizeof *netdev); + netdev = xzalloc(sizeof *netdev); netdev_init(&netdev->netdev, suffix, &netdev_linux_class); netdev->netdev_fd = -1; netdev->tap_fd = -1; diff --git a/lib/poll-loop.c b/lib/poll-loop.c index aff2c335c..26a17e83f 100644 --- a/lib/poll-loop.c +++ b/lib/poll-loop.c @@ -253,7 +253,7 @@ poll_cancel(struct poll_waiter *pw) static struct poll_waiter * new_waiter(int fd, short int events) { - struct poll_waiter *waiter = xcalloc(1, sizeof *waiter); + struct poll_waiter *waiter = xzalloc(sizeof *waiter); assert(fd >= 0); waiter->fd = fd; waiter->events = events; diff --git a/lib/process.c b/lib/process.c index 1fe3c1235..0c7f424fc 100644 --- a/lib/process.c +++ b/lib/process.c @@ -161,7 +161,7 @@ process_register(const char *name, pid_t pid) assert(sigchld_is_blocked()); - p = xcalloc(1, sizeof *p); + p = xzalloc(sizeof *p); p->pid = pid; slash = strrchr(name, '/'); p->name = xstrdup(slash ? slash + 1 : name); diff --git a/lib/rconn.c b/lib/rconn.c index 2cbe43e98..b6e958eed 100644 --- a/lib/rconn.c +++ b/lib/rconn.c @@ -176,7 +176,7 @@ rconn_new_from_vconn(const char *name, struct vconn *vconn) struct rconn * rconn_create(int probe_interval, int max_backoff) { - struct rconn *rc = xcalloc(1, sizeof *rc); + struct rconn *rc = xzalloc(sizeof *rc); rc->state = S_VOID; rc->state_entered = time_now(); @@ -214,7 +214,7 @@ stp_create(const char *name, stp_identifier bridge_id, struct stp *stp; struct stp_port *p; - stp = xcalloc(1, sizeof *stp); + stp = xzalloc(sizeof *stp); stp->name = xstrdup(name); stp->bridge_id = bridge_id; if (!(stp->bridge_id >> 48)) { diff --git a/lib/util.c b/lib/util.c index f766d59e3..cecd58253 100644 --- a/lib/util.c +++ b/lib/util.c @@ -43,6 +43,12 @@ xcalloc(size_t count, size_t size) } void * +xzalloc(size_t size) +{ + return xcalloc(1, size); +} + +void * xmalloc(size_t size) { void *p = malloc(size ? size : 1); diff --git a/lib/util.h b/lib/util.h index 962bad2f3..1290d33ee 100644 --- a/lib/util.h +++ b/lib/util.h @@ -98,6 +98,7 @@ void ovs_print_version(char *date, char *time, void out_of_memory(void) NO_RETURN; void *xmalloc(size_t) MALLOC_LIKE; void *xcalloc(size_t, size_t) MALLOC_LIKE; +void *xzalloc(size_t) MALLOC_LIKE; void *xrealloc(void *, size_t); void *xmemdup(const void *, size_t) MALLOC_LIKE; char *xmemdup0(const char *, size_t) MALLOC_LIKE; |