mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-18 20:10:29 +01:00
load_jpeg.c Clean code
This patch returns NULL, because the variable image is not used yet. The patch also removes three lines: - buffer[0] = NULL; /* Initialize pointer to avoid spurious free in cleanup code */ RErrorCode = RERR_BADIMAGEFILE; jpeg_destroy_decompress(&cinfo); fclose(file); - if (buffer[0]) - free(buffer[0]); buffer is a local variable. The malloc is not used yet. So: - We set the value to NULL, then check if is null to call free(). So the free() call is never used. We can remove the last too lines. - We don't need set now to NULL, because the variable is empty (the initializated (or not) value is not used, and is destroyed as local variable when we returns, just one line later. Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
This commit is contained in:
committed by
Carlos R. Mafra
parent
a2cc89dd3d
commit
49db946aa2
@@ -132,14 +132,10 @@ RImage *RLoadJPEG(const char *file_name)
|
||||
jpeg_read_header(&cinfo, TRUE);
|
||||
|
||||
if (cinfo.image_width < 1 || cinfo.image_height < 1) {
|
||||
buffer[0] = NULL; /* Initialize pointer to avoid spurious free in cleanup code */
|
||||
RErrorCode = RERR_BADIMAGEFILE;
|
||||
jpeg_destroy_decompress(&cinfo);
|
||||
fclose(file);
|
||||
if (buffer[0])
|
||||
free(buffer[0]);
|
||||
|
||||
return image;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
buffer[0] = (JSAMPROW) malloc(cinfo.image_width * cinfo.num_components);
|
||||
|
||||
Reference in New Issue
Block a user