Module Name: src
Committed By: martin
Date: Thu Jul 25 13:16:35 UTC 2019
Modified Files:
src/usr.sbin/sysinst: gpt.c mbr.c
Log Message:
Fix a few calloc() calls with wrong arg order (harmless, but for consistency)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/gpt.c
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/sysinst/mbr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/gpt.c
diff -u src/usr.sbin/sysinst/gpt.c:1.2 src/usr.sbin/sysinst/gpt.c:1.3
--- src/usr.sbin/sysinst/gpt.c:1.2 Sun Jun 23 11:47:08 2019
+++ src/usr.sbin/sysinst/gpt.c Thu Jul 25 13:16:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gpt.c,v 1.2 2019/06/23 11:47:08 martin Exp $ */
+/* $NetBSD: gpt.c,v 1.3 2019/07/25 13:16:35 martin Exp $ */
/*
* Copyright 2018 The NetBSD Foundation, Inc.
@@ -394,7 +394,7 @@ gpt_create_new(const char *disk, daddr_t
return NULL;
}
- parts = calloc(sizeof(*parts), 1);
+ parts = calloc(1, sizeof(*parts));
if (!parts)
return NULL;
Index: src/usr.sbin/sysinst/mbr.c
diff -u src/usr.sbin/sysinst/mbr.c:1.16 src/usr.sbin/sysinst/mbr.c:1.17
--- src/usr.sbin/sysinst/mbr.c:1.16 Fri Jul 12 18:23:06 2019
+++ src/usr.sbin/sysinst/mbr.c Thu Jul 25 13:16:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mbr.c,v 1.16 2019/07/12 18:23:06 martin Exp $ */
+/* $NetBSD: mbr.c,v 1.17 2019/07/25 13:16:35 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -570,7 +570,7 @@ read_mbr(const char *disk, mbr_info_t *m
ext_base = next_ext;
next_ext = 0;
}
- ext = calloc(sizeof *ext, 1);
+ ext = calloc(1, sizeof *ext);
if (!ext)
break;
mbrs = &ext->mbr;
@@ -829,7 +829,7 @@ mbr_create_new(const char *disk, daddr_t
if (start != 0)
return NULL;
- parts = calloc(sizeof(*parts), 1);
+ parts = calloc(1, sizeof(*parts));
if (!parts)
return NULL;
@@ -892,7 +892,7 @@ mbr_read_from_disk(const char *disk, dad
if (start != 0)
return NULL;
- parts = calloc(sizeof(*parts), 1);
+ parts = calloc(1, sizeof(*parts));
if (!parts)
return NULL;
