| Message ID | 1494266456-2251-1-git-send-email-jcmvbkbc@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 05/08/2017 03:00 PM, Max Filippov wrote: > Replace malloc/free/sprintf with g_string/g_string_printf/g_string_free. > Replace g_malloc with g_new when allocating the MemoryRegion to get more > type safety. > > Suggested-by: Alex Bennée <alex.bennee@linaro.org> > Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/xtensa/sim.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c > index d2d1d3a..b27e28d 100644 > --- a/hw/xtensa/sim.c > +++ b/hw/xtensa/sim.c > @@ -41,21 +41,21 @@ static void xtensa_create_memory_regions(const XtensaMemory *memory, > const char *name) > { > unsigned i; > - char *num_name = malloc(strlen(name) + sizeof(i) * 3 + 1); > + GString *num_name = g_string_new(NULL); > > for (i = 0; i < memory->num; ++i) { > MemoryRegion *m; > > - sprintf(num_name, "%s%u", name, i); > - m = g_malloc(sizeof(*m)); > - memory_region_init_ram(m, NULL, num_name, > + g_string_printf(num_name, "%s%u", name, i); > + m = g_new(MemoryRegion, 1); > + memory_region_init_ram(m, NULL, num_name->str, > memory->location[i].size, > &error_fatal); > vmstate_register_ram_global(m); > memory_region_add_subregion(get_system_memory(), > memory->location[i].addr, m); > } > - free(num_name); > + g_string_free(num_name, true); > } > > static uint64_t translate_phys_addr(void *opaque, uint64_t addr) >
Max Filippov <jcmvbkbc@gmail.com> writes: > Replace malloc/free/sprintf with g_string/g_string_printf/g_string_free. > Replace g_malloc with g_new when allocating the MemoryRegion to get more > type safety. > > Suggested-by: Alex Bennée <alex.bennee@linaro.org> > Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> > --- > hw/xtensa/sim.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c > index d2d1d3a..b27e28d 100644 > --- a/hw/xtensa/sim.c > +++ b/hw/xtensa/sim.c > @@ -41,21 +41,21 @@ static void xtensa_create_memory_regions(const XtensaMemory *memory, > const char *name) > { > unsigned i; > - char *num_name = malloc(strlen(name) + sizeof(i) * 3 + 1); > + GString *num_name = g_string_new(NULL); > > for (i = 0; i < memory->num; ++i) { > MemoryRegion *m; > > - sprintf(num_name, "%s%u", name, i); > - m = g_malloc(sizeof(*m)); > - memory_region_init_ram(m, NULL, num_name, > + g_string_printf(num_name, "%s%u", name, i); I'd make that num_name = g_strdup_printf("%s%u, name, i); for less churn. Have to free(num_name) in the loop, of course. > + m = g_new(MemoryRegion, 1); > + memory_region_init_ram(m, NULL, num_name->str, > memory->location[i].size, > &error_fatal); > vmstate_register_ram_global(m); > memory_region_add_subregion(get_system_memory(), > memory->location[i].addr, m); > } > - free(num_name); > + g_string_free(num_name, true); > } > > static uint64_t translate_phys_addr(void *opaque, uint64_t addr)
Applied to -trivial, thanks! /mjt
diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c index d2d1d3a..b27e28d 100644 --- a/hw/xtensa/sim.c +++ b/hw/xtensa/sim.c @@ -41,21 +41,21 @@ static void xtensa_create_memory_regions(const XtensaMemory *memory, const char *name) { unsigned i; - char *num_name = malloc(strlen(name) + sizeof(i) * 3 + 1); + GString *num_name = g_string_new(NULL); for (i = 0; i < memory->num; ++i) { MemoryRegion *m; - sprintf(num_name, "%s%u", name, i); - m = g_malloc(sizeof(*m)); - memory_region_init_ram(m, NULL, num_name, + g_string_printf(num_name, "%s%u", name, i); + m = g_new(MemoryRegion, 1); + memory_region_init_ram(m, NULL, num_name->str, memory->location[i].size, &error_fatal); vmstate_register_ram_global(m); memory_region_add_subregion(get_system_memory(), memory->location[i].addr, m); } - free(num_name); + g_string_free(num_name, true); } static uint64_t translate_phys_addr(void *opaque, uint64_t addr)
Replace malloc/free/sprintf with g_string/g_string_printf/g_string_free. Replace g_malloc with g_new when allocating the MemoryRegion to get more type safety. Suggested-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> --- hw/xtensa/sim.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)