Convert some sizeof(struct ...) to sizeof(variable)

Author: pcmoore

libnetlabel/mod_mgmt.c

@@ -1095,13 +1095,10 @@ int nlbl_mgmt_listall(struct nlbl_handle *hndl, struct nlbl_dommap **domains)
 				       NLMSG_ALIGN(sizeof(*genl_hdr));
 
 			/* resize the array */
-			dmns = realloc(dmns,
-				       sizeof(struct nlbl_dommap) *
-				       (dmns_count + 1));
+			dmns = realloc(dmns, sizeof(*dmns) * (dmns_count + 1));
 			if (dmns == NULL)
 				goto listall_return;
-			memset(&dmns[dmns_count], 0,
-			       sizeof(struct nlbl_dommap));
+			memset(&dmns[dmns_count], 0, sizeof(*dmns));
 
 			/* get the attribute information */
 			nla = nla_find(nla_head,

libnetlabel/mod_unlabeled.c

@@ -887,12 +887,11 @@ int nlbl_unlbl_staticlist(struct nlbl_handle *hndl,
 
 			/* resize the array */
 			addr_array = realloc(addr_array,
-					     sizeof(struct nlbl_addrmap) *
+					     sizeof(*addr_array) *
 					     (addr_count + 1));
 			if (addr_array == NULL)
 				goto staticlist_return;
-			memset(&addr_array[addr_count], 0,
-			       sizeof(struct nlbl_addrmap));
+			memset(&addr_array[addr_count], 0, sizeof(*addr_array));
 
 			/* get the attribute information */
 			nla = nla_find(nla_head,
@@ -1081,12 +1080,11 @@ int nlbl_unlbl_staticlistdef(struct nlbl_handle *hndl,
 
 			/* resize the array */
 			addr_array = realloc(addr_array,
-					     sizeof(struct nlbl_addrmap) *
+					     sizeof(*addr_array) *
 					     (addr_count + 1));
 			if (addr_array == NULL)
 				goto staticlistdef_return;
-			memset(&addr_array[addr_count], 0,
-			       sizeof(struct nlbl_addrmap));
+			memset(&addr_array[addr_count], 0, sizeof(*addr_array));
 
 			/* get the attribute information */
 			nla = nla_find(nla_head,

netlabelctl/map.c

@@ -278,10 +278,10 @@ int map_list(int argc, char *argv[])
 	count = ret_val;
 
 	/* get the default mapping */
-	mapping = realloc(mapping, sizeof(struct nlbl_dommap) * (count + 1));
+	mapping = realloc(mapping, sizeof(*mapping) * (count + 1));
 	if (mapping == NULL)
 		goto list_return;
-	memset(&mapping[count], 0, sizeof(struct nlbl_dommap));
+	memset(&mapping[count], 0, sizeof(*mapping));
 	ret_val = nlbl_mgmt_listdef(NULL, &mapping[count]);
 	if (ret_val < 0 && ret_val != -ENOENT)
 		goto list_return;