Fix "discards 'const' qualifier from pointer target type" warnings

The resources pointed to have been acquired by the backend.  It is safe
to cast away the 'const' qualifier when releasing these resources.
merge-requests/1/head
Olaf Meeuwissen 2015-11-11 22:28:17 +09:00
rodzic 497d591806
commit e65fd1b4cb
4 zmienionych plików z 10 dodań i 10 usunięć

Wyświetl plik

@ -4576,13 +4576,13 @@ destroy(struct scanner *s)
teardown_buffers(s);
if(s->sane.name){
free(s->sane.name);
free((void *) s->sane.name);
}
if(s->sane.vendor){
free(s->sane.vendor);
free((void *) s->sane.vendor);
}
if(s->sane.model){
free(s->sane.model);
free((void *) s->sane.model);
}
free(s);

Wyświetl plik

@ -2437,7 +2437,7 @@ sane_exit (void)
}
if (device->dev.name)
{
free (device->dev.name);
free ((void *) device->dev.name);
}
free (device);
}

Wyświetl plik

@ -2233,11 +2233,11 @@ sane_close (SANE_Handle handle)
if (session->dev->model->gamma != session->val[OPT_GAMMA_VECTOR_B].wa)
free (session->val[OPT_GAMMA_VECTOR_B].wa);
free (session->val[OPT_MODE].s);
free (session->opt[OPT_RESOLUTION].constraint.word_list);
free ((void *) session->opt[OPT_RESOLUTION].constraint.word_list);
for (i = OPT_BUTTON_1; i <= OPT_BUTTON_11; i++)
{
free (session->opt[i].name);
free (session->opt[i].title);
free ((void *) session->opt[i].name);
free ((void *) session->opt[i].title);
}
free (session);

Wyświetl plik

@ -1001,9 +1001,9 @@ sane_exit (void)
for (i = 0; i < num_devices; i++)
{
free (devlist[i].port);
free (devlist[i].sane.name);
free (devlist[i].sane.model);
free (devlist[i].sane.vendor);
free ((void *) devlist[i].sane.name);
free ((void *) devlist[i].sane.model);
free ((void *) devlist[i].sane.vendor);
}
if (devlist != NULL)