comparison src/exif.c @ 855:0c3f6ef17d18

Tidy up.

854:a0cdc9d066ae

static gint map_file(const gchar *path, void **mapping, int *size)
{
	int fd;
	struct stat fs;

	if ((fd = open(path, O_RDONLY)) == -1)
		{
		perror(path);
		return -1;
		}

		return -1;
		}

	*size = fs.st_size;

	if ((*mapping = mmap(0, *size, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0)) == MAP_FAILED)
		{
		perror(path);
		close(fd);
		return -1;
		}

	exif = g_new0(ExifData, 1);
	exif->items = NULL;
	exif->current = NULL;

	if ((res = exif_jpeg_parse(exif, (unsigned char *)f, size,
				   ExifKnownMarkersList)) == -2)
		{
		res = exif_tiff_parse(exif, (unsigned char *)f, size, ExifKnownMarkersList);
		}

	if (res != 0)

855:0c3f6ef17d18

static gint map_file(const gchar *path, void **mapping, int *size)
{
	int fd;
	struct stat fs;

	fd = open(path, O_RDONLY);
	if (fd == -1)
		{
		perror(path);
		return -1;
		}

		return -1;
		}

	*size = fs.st_size;

	*mapping = mmap(0, *size, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
	if (*mapping == MAP_FAILED)
		{
		perror(path);
		close(fd);
		return -1;
		}

	exif = g_new0(ExifData, 1);
	exif->items = NULL;
	exif->current = NULL;

	res = exif_jpeg_parse(exif, (unsigned char *)f, size, ExifKnownMarkersList);
	if (res == -2)
		{
		res = exif_tiff_parse(exif, (unsigned char *)f, size, ExifKnownMarkersList);
		}

	if (res != 0)