Commit 40b705ad authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove invariable (last) parameter of httpd_UrlNewPrivate()

parent a053ede0
...@@ -1198,17 +1198,14 @@ void httpd_HostDelete( httpd_host_t *host ) ...@@ -1198,17 +1198,14 @@ void httpd_HostDelete( httpd_host_t *host )
/* register a new url */ /* register a new url */
static httpd_url_t *httpd_UrlNewPrivate( httpd_host_t *host, const char *psz_url, static httpd_url_t *httpd_UrlNewPrivate( httpd_host_t *host, const char *psz_url,
const char *psz_user, const char *psz_password, const char *psz_user, const char *psz_password,
const vlc_acl_t *p_acl, bool b_check ) const vlc_acl_t *p_acl )
{ {
httpd_url_t *url; httpd_url_t *url;
int i;
assert( psz_url != NULL ); assert( psz_url != NULL );
vlc_mutex_lock( &host->lock ); vlc_mutex_lock( &host->lock );
if( b_check ) for( int i = 0; i < host->i_url; i++ )
{
for( i = 0; i < host->i_url; i++ )
{ {
if( !strcmp( psz_url, host->url[i]->psz_url ) ) if( !strcmp( psz_url, host->url[i]->psz_url ) )
{ {
...@@ -1218,7 +1215,6 @@ static httpd_url_t *httpd_UrlNewPrivate( httpd_host_t *host, const char *psz_url ...@@ -1218,7 +1215,6 @@ static httpd_url_t *httpd_UrlNewPrivate( httpd_host_t *host, const char *psz_url
return NULL; return NULL;
} }
} }
}
url = xmalloc( sizeof( httpd_url_t ) ); url = xmalloc( sizeof( httpd_url_t ) );
url->host = host; url->host = host;
...@@ -1228,7 +1224,7 @@ static httpd_url_t *httpd_UrlNewPrivate( httpd_host_t *host, const char *psz_url ...@@ -1228,7 +1224,7 @@ static httpd_url_t *httpd_UrlNewPrivate( httpd_host_t *host, const char *psz_url
url->psz_user = strdup( psz_user ? psz_user : "" ); url->psz_user = strdup( psz_user ? psz_user : "" );
url->psz_password = strdup( psz_password ? psz_password : "" ); url->psz_password = strdup( psz_password ? psz_password : "" );
url->p_acl = ACL_Duplicate( host, p_acl ); url->p_acl = ACL_Duplicate( host, p_acl );
for( i = 0; i < HTTPD_MSG_MAX; i++ ) for( int i = 0; i < HTTPD_MSG_MAX; i++ )
{ {
url->catch[i].cb = NULL; url->catch[i].cb = NULL;
url->catch[i].p_sys = NULL; url->catch[i].p_sys = NULL;
...@@ -1246,7 +1242,7 @@ httpd_url_t *httpd_UrlNewUnique( httpd_host_t *host, const char *psz_url, ...@@ -1246,7 +1242,7 @@ httpd_url_t *httpd_UrlNewUnique( httpd_host_t *host, const char *psz_url,
const vlc_acl_t *p_acl ) const vlc_acl_t *p_acl )
{ {
return httpd_UrlNewPrivate( host, psz_url, psz_user, return httpd_UrlNewPrivate( host, psz_url, psz_user,
psz_password, p_acl, true ); psz_password, p_acl );
} }
/* register callback on a url */ /* register callback on a url */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment