From f989d397529cc86c25dfd8992e865ddd76ecf1dd Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Tue, 3 Mar 2009 13:57:09 +0000 Subject: Remove size_t cast in setting s->priv_data directly to the (integer) file descriptor returned by open(). This removes some dubious doublecasts such as priv_data = (void *) (size_t) some_integer, and is always safe on systems we care about because sizeof(int)<=sizeof(void*). See comments from Mans and Michael in "[RFC] rtsp.c EOF support" thread. Originally committed as revision 17768 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/file.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libavformat/file.c') diff --git a/libavformat/file.c b/libavformat/file.c index 88ac4db8d4..cdf0b08d5b 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -53,32 +53,32 @@ static int file_open(URLContext *h, const char *filename, int flags) fd = open(filename, access, 0666); if (fd < 0) return AVERROR(ENOENT); - h->priv_data = (void *)(size_t)fd; + h->priv_data = (void *) fd; return 0; } static int file_read(URLContext *h, unsigned char *buf, int size) { - int fd = (size_t)h->priv_data; + int fd = (int) h->priv_data; return read(fd, buf, size); } static int file_write(URLContext *h, unsigned char *buf, int size) { - int fd = (size_t)h->priv_data; + int fd = (int) h->priv_data; return write(fd, buf, size); } /* XXX: use llseek */ static int64_t file_seek(URLContext *h, int64_t pos, int whence) { - int fd = (size_t)h->priv_data; + int fd = (int) h->priv_data; return lseek(fd, pos, whence); } static int file_close(URLContext *h) { - int fd = (size_t)h->priv_data; + int fd = (int) h->priv_data; return close(fd); } @@ -110,7 +110,7 @@ static int pipe_open(URLContext *h, const char *filename, int flags) #if HAVE_SETMODE setmode(fd, O_BINARY); #endif - h->priv_data = (void *)(size_t)fd; + h->priv_data = (void *) fd; h->is_streamed = 1; return 0; } -- cgit v1.2.3