Mercurial > libavformat.hg
changeset 5775:7a123cc24a81 libavformat
Rename url_split to ff_url_split
Since this function isn't in the public API, it should have an ff_ prefix.
| author | mstorsjo |
|---|---|
| date | Mon, 08 Mar 2010 09:03:25 +0000 |
| parents | 66e85b4ca68a |
| children | d34f985d6e8f |
| files | avformat.h gopher.c http.c rtmpproto.c rtpproto.c rtsp.c sdp.c tcp.c udp.c utils.c |
| diffstat | 10 files changed, 17 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/avformat.h Mon Mar 08 03:46:37 2010 +0000 +++ b/avformat.h Mon Mar 08 09:03:25 2010 +0000 @@ -1343,7 +1343,7 @@ /* Deprecated, use getaddrinfo instead. */ attribute_deprecated int resolve_host(struct in_addr *sin_addr, const char *hostname); -void url_split(char *proto, int proto_size, +void ff_url_split(char *proto, int proto_size, char *authorization, int authorization_size, char *hostname, int hostname_size, int *port_ptr, @@ -1352,12 +1352,12 @@ /** * Assembles a URL string from components. This is the reverse operation - * of url_split. + * of ff_url_split. * * Note, this requires networking to be initialized, so the caller must * ensure ff_network_init has been called. * - * @see url_split + * @see ff_url_split * * @param str the buffer to fill with the url * @param size the size of the str buffer
--- a/gopher.c Mon Mar 08 03:46:37 2010 +0000 +++ b/gopher.c Mon Mar 08 09:03:25 2010 +0000 @@ -89,7 +89,7 @@ h->priv_data = s; /* needed in any case to build the host string */ - url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, + ff_url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, path, sizeof(path), uri); if (port < 0)
--- a/http.c Mon Mar 08 03:46:37 2010 +0000 +++ b/http.c Mon Mar 08 09:03:25 2010 +0000 @@ -69,12 +69,12 @@ /* fill the dest addr */ redo: /* needed in any case to build the host string */ - url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, + ff_url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, path1, sizeof(path1), s->location); ff_url_join(hoststr, sizeof(hoststr), NULL, NULL, hostname, port, NULL); if (use_proxy) { - url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, + ff_url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, NULL, 0, proxy_path); path = s->location; } else {
--- a/rtmpproto.c Mon Mar 08 03:46:37 2010 +0000 +++ b/rtmpproto.c Mon Mar 08 09:03:25 2010 +0000 @@ -812,7 +812,7 @@ s->priv_data = rt; rt->is_input = !(flags & URL_WRONLY); - url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname), &port, + ff_url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname), &port, path, sizeof(path), s->filename); if (port < 0)
--- a/rtpproto.c Mon Mar 08 03:46:37 2010 +0000 +++ b/rtpproto.c Mon Mar 08 09:03:25 2010 +0000 @@ -64,7 +64,7 @@ char buf[1024]; char path[1024]; - url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, + ff_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, path, sizeof(path), uri); ff_url_join(buf, sizeof(buf), "udp", NULL, hostname, port, "%s", path); @@ -134,7 +134,7 @@ return AVERROR(ENOMEM); h->priv_data = s; - url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, + ff_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, path, sizeof(path), uri); /* extract parameters */ ttl = -1;
--- a/rtsp.c Mon Mar 08 03:46:37 2010 +0000 +++ b/rtsp.c Mon Mar 08 09:03:25 2010 +0000 @@ -446,7 +446,7 @@ rtsp_st = st->priv_data; /* XXX: may need to add full url resolution */ - url_split(proto, sizeof(proto), NULL, 0, NULL, 0, + ff_url_split(proto, sizeof(proto), NULL, 0, NULL, 0, NULL, NULL, 0, p); if (proto[0] == '\0') { /* relative control URL */ @@ -1390,7 +1390,7 @@ return AVERROR(EIO); redirect: /* extract hostname and port */ - url_split(NULL, 0, auth, sizeof(auth), + ff_url_split(NULL, 0, auth, sizeof(auth), host, sizeof(host), &port, path, sizeof(path), s->filename); if (*auth) { int auth_len = strlen(auth), b64_len = ((auth_len + 2) / 3) * 4 + 1;
--- a/sdp.c Mon Mar 08 03:46:37 2010 +0000 +++ b/sdp.c Mon Mar 08 09:03:25 2010 +0000 @@ -109,7 +109,7 @@ const char *p; char proto[32]; - url_split(proto, sizeof(proto), NULL, 0, dest_addr, size, &port, NULL, 0, url); + ff_url_split(proto, sizeof(proto), NULL, 0, dest_addr, size, &port, NULL, 0, url); *ttl = 0;
--- a/tcp.c Mon Mar 08 03:46:37 2010 +0000 +++ b/tcp.c Mon Mar 08 09:03:25 2010 +0000 @@ -44,7 +44,7 @@ char hostname[1024],proto[1024],path[1024]; char portstr[10]; - url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname), + ff_url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname), &port, path, sizeof(path), uri); if (strcmp(proto,"tcp") || port <= 0 || port >= 65536) return AVERROR(EINVAL);
--- a/udp.c Mon Mar 08 03:46:37 2010 +0000 +++ b/udp.c Mon Mar 08 09:03:25 2010 +0000 @@ -265,7 +265,7 @@ char hostname[256]; int port; - url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, NULL, 0, uri); + ff_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, NULL, 0, uri); /* set the destination address */ s->dest_addr_len = udp_set_url(&s->dest_addr, hostname, port); @@ -346,9 +346,9 @@ } /* fill the dest addr */ - url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, NULL, 0, uri); + ff_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, NULL, 0, uri); - /* XXX: fix url_split */ + /* XXX: fix ff_url_split */ if (hostname[0] == '\0' || hostname[0] == '?') { /* only accepts null hostname if input */ if (flags & URL_WRONLY)
--- a/utils.c Mon Mar 08 03:46:37 2010 +0000 +++ b/utils.c Mon Mar 08 09:03:25 2010 +0000 @@ -3365,7 +3365,7 @@ pkt_dump_internal(avcl, NULL, level, pkt, dump_payload); } -void url_split(char *proto, int proto_size, +void ff_url_split(char *proto, int proto_size, char *authorization, int authorization_size, char *hostname, int hostname_size, int *port_ptr,