RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-12 02:04:58 +00:00
Code Issues Projects Releases Wiki Activity

Remove size_t cast in setting s->priv_data directly to the (integer) file

Browse Source 
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
This commit is contained in:
Ronald S. Bultje 2009-03-03 13:57:09 +00:00
parent eafb17d140
commit f989d39752
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/file.c
View File

@ -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;
}