Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Coverity CID 2460,2459,2458,2457: Don't allocate smaller chunks, it is not 

worth it, and it makes coverity mad. Also check the return of malloc, and
allocate using variables instead of types as the sizeof arg.
This commit is contained in:
christos 2006-05-24 22:07:42 +00:00
parent 10dfada83b
commit 675ee2be81
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
usr.sbin/fwctl/fwcontrol.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fwcontrol.c,v 1.3 2005/08/23 19:19:51 kiyohara Exp $ */ /* $NetBSD: fwcontrol.c,v 1.4 2006/05/24 22:07:42 christos Exp $ */
/* /*
* Copyright (C) 2002 * Copyright (C) 2002
* Hidetoshi Shimokawa. All rights reserved. * Hidetoshi Shimokawa. All rights reserved.
@ -108,7 +108,7 @@ get_dev(int fd)
{ {
struct fw_devlstreq *data; struct fw_devlstreq *data;
data = (struct fw_devlstreq *)malloc(sizeof(struct fw_devlstreq)); data = malloc(sizeof(*data));
if (data == NULL) if (data == NULL)
err(1, "malloc"); err(1, "malloc");
if( ioctl(fd, FW_GDEVLST, data) < 0) { if( ioctl(fd, FW_GDEVLST, data) < 0) {
@ -191,7 +191,9 @@ read_write_quad(int fd, struct fw_eui64 eui, u_int32_t addr_lo, int readmode, u_
struct fw_asyreq *asyreq; struct fw_asyreq *asyreq;
u_int32_t *qld, res; u_int32_t *qld, res;
asyreq = (struct fw_asyreq *)malloc(sizeof(struct fw_asyreq_t) + 16); asyreq = malloc(sizeof(*asyreq));
if (asyreq == NULL)
err(1, "malloc");
asyreq->req.len = 16; asyreq->req.len = 16;
#if 0 #if 0
asyreq->req.type = FWASREQNODE; asyreq->req.type = FWASREQNODE;
@ -229,7 +231,9 @@ send_phy_config(int fd, int root_node, int gap_count)
{ {
struct fw_asyreq *asyreq; struct fw_asyreq *asyreq;
asyreq = (struct fw_asyreq *)malloc(sizeof(struct fw_asyreq_t) + 12); asyreq = malloc(sizeof(*asyreq));
if (asyreq == NULL)
err(1, "malloc");
asyreq->req.len = 12; asyreq->req.len = 12;
asyreq->req.type = FWASREQNODE; asyreq->req.type = FWASREQNODE;
asyreq->pkt.mode.ld[0] = 0; asyreq->pkt.mode.ld[0] = 0;
@ -254,7 +258,9 @@ send_link_on(int fd, int node)
{ {
struct fw_asyreq *asyreq; struct fw_asyreq *asyreq;
asyreq = (struct fw_asyreq *)malloc(sizeof(struct fw_asyreq_t) + 12); asyreq = malloc(sizeof(*asyreq));
if (asyreq == NULL)
err(1, "malloc");
asyreq->req.len = 12; asyreq->req.len = 12;
asyreq->req.type = FWASREQNODE; asyreq->req.type = FWASREQNODE;
asyreq->pkt.mode.common.tcode = FWTCODE_PHY; asyreq->pkt.mode.common.tcode = FWTCODE_PHY;
@ -271,7 +277,9 @@ reset_start(int fd, int node)
{ {
struct fw_asyreq *asyreq; struct fw_asyreq *asyreq;
asyreq = (struct fw_asyreq *)malloc(sizeof(struct fw_asyreq_t) + 16); asyreq = malloc(sizeof(*asyreq));
if (asyreq == NULL)
err(1, "malloc");
asyreq->req.len = 16; asyreq->req.len = 16;
asyreq->req.type = FWASREQNODE; asyreq->req.type = FWASREQNODE;
asyreq->pkt.mode.wreqq.dst = FWLOCALBUS | (node & 0x3f); asyreq->pkt.mode.wreqq.dst = FWLOCALBUS | (node & 0x3f);
@ -475,9 +483,9 @@ show_topology_map(int fd)
static const char *pwr_class[] = {" 0W", "15W", "30W", "45W", static const char *pwr_class[] = {" 0W", "15W", "30W", "45W",
"-1W", "-2W", "-5W", "-9W"}; "-1W", "-2W", "-5W", "-9W"};
static const char *speed[] = {"S100", "S200", "S400", "S800"}; static const char *speed[] = {"S100", "S200", "S400", "S800"};
tmap = malloc(sizeof(struct fw_topology_map)); tmap = malloc(sizeof(*tmap));
if (tmap == NULL) if (tmap == NULL)
return; err(1, "malloc");
if (ioctl(fd, FW_GTPMAP, tmap) < 0) { if (ioctl(fd, FW_GTPMAP, tmap) < 0) {
err(1, "ioctl"); err(1, "ioctl");
} }