Message ID | 20210708054601.9484-1-akihiko.odaki@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | ui/cocoa: Do not perform unsafe cast of argv | expand |
On Thu, 8 Jul 2021 at 06:46, Akihiko Odaki <akihiko.odaki@gmail.com> wrote: > > Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com> > --- > ui/cocoa.m | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/ui/cocoa.m b/ui/cocoa.m > index 9f72844b079..68a6302184a 100644 > --- a/ui/cocoa.m > +++ b/ui/cocoa.m > @@ -1888,12 +1888,12 @@ static void cocoa_clipboard_request(QemuClipboardInfo *info, > exit(status); > } > > -int main (int argc, const char * argv[]) { > +int main (int argc, char **argv) { > QemuThread thread; > > COCOA_DEBUG("Entered main()\n"); > gArgc = argc; > - gArgv = (char **)argv; > + gArgv = argv; > > qemu_sem_init(&display_init_sem, 0); > qemu_sem_init(&app_started_sem, 0); > -- > 2.30.1 (Apple Git-130) Why do you consider this cast "unsafe" ? If it's unsafe, then all we've done is move the unsafety from the cast upwards to the function prototype. I think what we're really doing here is fixing the broken prototype of 'main', which should not have 'const' because that's not how the C standard defines it. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> for the code change; you might want to adjust the commit message. thanks -- PMM
diff --git a/ui/cocoa.m b/ui/cocoa.m index 9f72844b079..68a6302184a 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -1888,12 +1888,12 @@ static void cocoa_clipboard_request(QemuClipboardInfo *info, exit(status); } -int main (int argc, const char * argv[]) { +int main (int argc, char **argv) { QemuThread thread; COCOA_DEBUG("Entered main()\n"); gArgc = argc; - gArgv = (char **)argv; + gArgv = argv; qemu_sem_init(&display_init_sem, 0); qemu_sem_init(&app_started_sem, 0);
Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com> --- ui/cocoa.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)