Fix type mismatches for malloc(3) and Co.
This is rather pedantic, as for most architectures it holds that sizeof(type *) == sizeof(type **) Found by: clang static analyzer Reviewed by: ed Differential Revision: https://reviews.freebsd.org/D4722
This commit is contained in:
parent
d4f2c120c0
commit
11e0dd6c90
@ -244,7 +244,7 @@ maketbl(void)
|
||||
p = NULL)
|
||||
if (++coloff == maxcols) {
|
||||
if (!(cols = realloc(cols, ((u_int)maxcols +
|
||||
DEFCOLS) * sizeof(char *))) ||
|
||||
DEFCOLS) * sizeof(wchar_t *))) ||
|
||||
!(lens = realloc(lens,
|
||||
((u_int)maxcols + DEFCOLS) * sizeof(int))))
|
||||
err(1, NULL);
|
||||
|
@ -93,7 +93,7 @@ colon(dbv, path, dot)
|
||||
char **pv;
|
||||
|
||||
if (dbv == NULL) {
|
||||
if ((dbv = malloc(sizeof(char **))) == NULL)
|
||||
if ((dbv = malloc(sizeof(char *))) == NULL)
|
||||
err(1, "malloc");
|
||||
*dbv = NULL;
|
||||
}
|
||||
@ -123,7 +123,7 @@ colon(dbv, path, dot)
|
||||
*(p + slen) = '\0';
|
||||
}
|
||||
/* increase dbv with element p */
|
||||
if ((dbv = realloc(dbv, sizeof(char **) * (vlen + 2)))
|
||||
if ((dbv = realloc(dbv, sizeof(char *) * (vlen + 2)))
|
||||
== NULL)
|
||||
err(1, "realloc");
|
||||
*(dbv + vlen) = p;
|
||||
|
@ -234,7 +234,7 @@ main(int argc, char *argv[])
|
||||
* NULL.
|
||||
*/
|
||||
linelen = 1 + argc + nargs + 1;
|
||||
if ((av = bxp = malloc(linelen * sizeof(char **))) == NULL)
|
||||
if ((av = bxp = malloc(linelen * sizeof(char *))) == NULL)
|
||||
errx(1, "malloc failed");
|
||||
|
||||
/*
|
||||
@ -471,7 +471,7 @@ prerun(int argc, char *argv[])
|
||||
* Allocate memory to hold the argument list, and
|
||||
* a NULL at the tail.
|
||||
*/
|
||||
tmp = malloc((argc + 1) * sizeof(char**));
|
||||
tmp = malloc((argc + 1) * sizeof(char *));
|
||||
if (tmp == NULL) {
|
||||
warnx("malloc failed");
|
||||
xexit(*argv, 1);
|
||||
|
@ -422,7 +422,7 @@ main(int argc, char **argv)
|
||||
* list.
|
||||
*/
|
||||
if (nhosts == 0) {
|
||||
hosts = malloc(sizeof(char**));
|
||||
hosts = malloc(sizeof(char *));
|
||||
if (hosts == NULL)
|
||||
out_of_mem();
|
||||
hosts[0] = "*";
|
||||
|
@ -486,7 +486,7 @@ mps_firmware_get(int fd, unsigned char **firmware, bool bios)
|
||||
}
|
||||
|
||||
size = reply.ActualImageSize;
|
||||
*firmware = calloc(1, sizeof(char) * size);
|
||||
*firmware = calloc(1, sizeof(unsigned char) * size);
|
||||
if (*firmware == NULL) {
|
||||
warn("calloc");
|
||||
return (-1);
|
||||
|
@ -220,7 +220,7 @@ main(int argc, char **argv)
|
||||
* list.
|
||||
*/
|
||||
if (nhosts == 0) {
|
||||
hosts = malloc(sizeof(char**));
|
||||
hosts = malloc(sizeof(char *));
|
||||
if (hosts == NULL)
|
||||
out_of_mem();
|
||||
|
||||
|
@ -150,7 +150,7 @@ main(int argc, char **argv)
|
||||
* list.
|
||||
*/
|
||||
if (nhosts == 0) {
|
||||
hosts = malloc(sizeof(char**));
|
||||
hosts = malloc(sizeof(char *));
|
||||
if (hosts == NULL)
|
||||
out_of_mem();
|
||||
|
||||
|
@ -888,7 +888,7 @@ autoifprobe(void)
|
||||
warnmsg(LOG_WARNING, __func__,
|
||||
"multiple interfaces found");
|
||||
|
||||
a = (char **)realloc(argv, (n + 1) * sizeof(char **));
|
||||
a = realloc(argv, (n + 1) * sizeof(char *));
|
||||
if (a == NULL) {
|
||||
warnmsg(LOG_ERR, __func__, "realloc");
|
||||
exit(1);
|
||||
@ -903,7 +903,7 @@ autoifprobe(void)
|
||||
}
|
||||
|
||||
if (n) {
|
||||
a = (char **)realloc(argv, (n + 1) * sizeof(char **));
|
||||
a = realloc(argv, (n + 1) * sizeof(char *));
|
||||
if (a == NULL) {
|
||||
warnmsg(LOG_ERR, __func__, "realloc");
|
||||
exit(1);
|
||||
|
Loading…
Reference in New Issue
Block a user