diff options
| author | Markus Armbruster <armbru@redhat.com> | 2022-03-15 15:41:56 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2022-03-21 15:44:44 +0100 |
| commit | b21e2380376c470900fcadf47507f4d5ade75e85 (patch) | |
| tree | 7fd41d348f85d6ef66d6f10ca4df241ba0e74f83 /qga/commands-win32.c | |
| parent | 1366244ab6d0c83bf0f90270e5bb608651a3cc8f (diff) | |
| download | focaccia-qemu-b21e2380376c470900fcadf47507f4d5ade75e85.tar.gz focaccia-qemu-b21e2380376c470900fcadf47507f4d5ade75e85.zip | |
Use g_new() & friends where that makes obvious sense
g_new(T, n) is neater than g_malloc(sizeof(T) * n). It's also safer,
for two reasons. One, it catches multiplication overflowing size_t.
Two, it returns T * rather than void *, which lets the compiler catch
more type errors.
This commit only touches allocations with size arguments of the form
sizeof(T).
Patch created mechanically with:
$ spatch --in-place --sp-file scripts/coccinelle/use-g_new-etc.cocci \
--macro-file scripts/cocci-macro-file.h FILES...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20220315144156.1595462-4-armbru@redhat.com>
Reviewed-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
Diffstat (limited to 'qga/commands-win32.c')
| -rw-r--r-- | qga/commands-win32.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 4fbbad793f..3c428213db 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -949,7 +949,7 @@ static GuestDiskAddressList *build_guest_disk_info(char *guid, Error **errp) } else if (last_err == ERROR_INVALID_FUNCTION) { /* Possibly CD-ROM or a shared drive. Try to pass the volume */ g_debug("volume not on disk"); - disk = g_malloc0(sizeof(GuestDiskAddress)); + disk = g_new0(GuestDiskAddress, 1); disk->has_dev = true; disk->dev = g_strdup(name); get_single_disk_info(0xffffffff, disk, &local_err); @@ -972,7 +972,7 @@ static GuestDiskAddressList *build_guest_disk_info(char *guid, Error **errp) /* Go through each extent */ for (i = 0; i < extents->NumberOfDiskExtents; i++) { - disk = g_malloc0(sizeof(GuestDiskAddress)); + disk = g_new0(GuestDiskAddress, 1); /* Disk numbers directly correspond to numbers used in UNCs * @@ -1076,7 +1076,7 @@ GuestDiskInfoList *qmp_guest_get_disks(Error **errp) sdn.DeviceNumber); g_debug(" number: %lu", sdn.DeviceNumber); - address = g_malloc0(sizeof(GuestDiskAddress)); + address = g_new0(GuestDiskAddress, 1); address->has_dev = true; address->dev = g_strdup(disk->name); get_single_disk_info(sdn.DeviceNumber, address, &local_err); @@ -1368,7 +1368,7 @@ qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **errp) continue; } - uc_path = g_malloc(sizeof(WCHAR) * char_count); + uc_path = g_new(WCHAR, char_count); if (!GetVolumePathNamesForVolumeNameW(guid, uc_path, char_count, &char_count) || !*uc_path) { /* strange, but this condition could be faced even with size == 2 */ |