summaryrefslogtreecommitdiff
path: root/libavformat/gopher.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2011-12-01 11:44:21 +0200
committerMartin Storsjö <martin@martin.st>2011-12-01 13:47:26 +0200
commit7e58050590c556643869a1cc57215026ff88b0db (patch)
tree13d62d154bc9e260991985dbb94b3ae04e034ea9 /libavformat/gopher.c
parent9c6777bd9367e8680bb7ada9852f5760dc8a8594 (diff)
proto: Use .priv_data_size to allocate the private context
This simplifies the open functions by avoiding one function call that needs error checking, reducing the amount of extra bulk code. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/gopher.c')
-rw-r--r--libavformat/gopher.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/libavformat/gopher.c b/libavformat/gopher.c
index 5f8c320f10..0543878ba8 100644
--- a/libavformat/gopher.c
+++ b/libavformat/gopher.c
@@ -72,24 +72,17 @@ static int gopher_close(URLContext *h)
ffurl_close(s->hd);
s->hd = NULL;
}
- av_freep(&h->priv_data);
return 0;
}
static int gopher_open(URLContext *h, const char *uri, int flags)
{
- GopherContext *s;
+ GopherContext *s = h->priv_data;
char hostname[1024], auth[1024], path[1024], buf[1024];
int port, err;
h->is_streamed = 1;
- s = av_malloc(sizeof(GopherContext));
- if (!s) {
- return AVERROR(ENOMEM);
- }
- h->priv_data = s;
-
/* needed in any case to build the host string */
av_url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port,
path, sizeof(path), uri);
@@ -127,4 +120,5 @@ URLProtocol ff_gopher_protocol = {
.url_read = gopher_read,
.url_write = gopher_write,
.url_close = gopher_close,
+ .priv_data_size = sizeof(GopherContext),
};