From 4f2ae2af08a73d2cbdbd0443d42f13458d7d087a Mon Sep 17 00:00:00 2001
From: Antoine Cellerier <dionoea@videolan.org>
Date: Wed, 7 Nov 2007 19:36:02 +0000
Subject: [PATCH] Return the p_sys pointer in the httpd_{Handler,File}Delete
functions (in case you need it to clean up stuff).
---
include/vlc_httpd.h | 4 ++--
src/network/httpd.c | 10 ++++++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/include/vlc_httpd.h b/include/vlc_httpd.h
index bf4456e68e8e..3b3d094849db 100644
--- a/include/vlc_httpd.h
+++ b/include/vlc_httpd.h
@@ -121,11 +121,11 @@ VLC_EXPORT( char*, httpd_ServerIP, ( const httpd_client_t *cl, char *ps
/* High level */
VLC_EXPORT( httpd_file_t *, httpd_FileNew, ( httpd_host_t *, const char *psz_url, const char *psz_mime, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_file_callback_t pf_fill, httpd_file_sys_t * ) );
-VLC_EXPORT( void, httpd_FileDelete, ( httpd_file_t * ) );
+VLC_EXPORT( httpd_file_sys_t *, httpd_FileDelete, ( httpd_file_t * ) );
VLC_EXPORT( httpd_handler_t *, httpd_HandlerNew, ( httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_handler_callback_t pf_fill, httpd_handler_sys_t * ) );
-VLC_EXPORT( void, httpd_HandlerDelete, ( httpd_handler_t * ) );
+VLC_EXPORT( httpd_handler_sys_t *, httpd_HandlerDelete, ( httpd_handler_t * ) );
VLC_EXPORT( httpd_redirect_t *, httpd_RedirectNew, ( httpd_host_t *, const char *psz_url_dst, const char *psz_url_src ) );
diff --git a/src/network/httpd.c b/src/network/httpd.c
index fd402d301f59..74aa003d1b82 100644
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -484,14 +484,18 @@ httpd_file_t *httpd_FileNew( httpd_host_t *host,
return file;
}
-void httpd_FileDelete( httpd_file_t *file )
+httpd_file_sys_t *httpd_FileDelete( httpd_file_t *file )
{
+ httpd_file_sys_t *p_sys = file->p_sys;
+
httpd_UrlDelete( file->url );
free( file->psz_url );
free( file->psz_mime );
free( file );
+
+ return p_sys;
}
/*****************************************************************************
@@ -618,10 +622,12 @@ httpd_handler_t *httpd_HandlerNew( httpd_host_t *host, const char *psz_url,
return handler;
}
-void httpd_HandlerDelete( httpd_handler_t *handler )
+httpd_handler_sys_t *httpd_HandlerDelete( httpd_handler_t *handler )
{
+ httpd_handler_sys_t *p_sys = handler->p_sys;
httpd_UrlDelete( handler->url );
free( handler );
+ return p_sys;
}
/*****************************************************************************
--
GitLab