Sql: Rollback should return void

[vlc] / include / vlc_services_discovery.h

diff --git a/include/vlc_services_discovery.h b/include/vlc_services_discovery.h
index 49cf7be7af56b171f5dc355e74db1b452f322ee0..d647b61543c515f125304d7ef3a57a20187d90e2 100644 (file)
--- a/include/vlc_services_discovery.h
+++ b/include/vlc_services_discovery.h
@@ -43,7 +43,6 @@ extern "C" {
 struct services_discovery_t
 {
     VLC_COMMON_MEMBERS
-    char *              psz_module;
     module_t *          p_module;
 
     vlc_event_manager_t event_manager;      /* Accessed through Setters for non class function */
@@ -57,19 +56,22 @@ struct services_discovery_t
 
 /* Get the services discovery modules names to use in Create(), in a null
  * terminated string array. Array and string must be freed after use. */
-VLC_EXPORT( char **, __services_discovery_GetServicesNames, ( vlc_object_t * p_super, char ***pppsz_longnames ) );
-#define services_discovery_GetServicesNames(a,b) \
-        __services_discovery_GetServicesNames(VLC_OBJECT(a),b)
+VLC_EXPORT( char **, vlc_sd_GetNames, ( char ***pppsz_longnames ) );
 
 /* Creation of a service_discovery object */
-VLC_EXPORT( services_discovery_t *, services_discovery_Create, ( vlc_object_t * p_super, const char * psz_service_name ) );
-VLC_EXPORT( bool,                   services_discovery_Start, ( services_discovery_t * p_this ) );
-VLC_EXPORT( void,                   services_discovery_Stop, ( services_discovery_t * p_this ) );
+VLC_EXPORT( services_discovery_t *, vlc_sd_Create, ( vlc_object_t * ) );
+VLC_EXPORT( bool, vlc_sd_Start, ( services_discovery_t *, const char * ) );
+VLC_EXPORT( void, vlc_sd_Stop, ( services_discovery_t * ) );
 
-static inline void services_discovery_StopAndRelease( services_discovery_t * p_this )
+static inline void vlc_sd_Destroy( services_discovery_t *p_sd )
 {
-    services_discovery_Stop( p_this );
-    vlc_object_release( p_this );
+    vlc_object_release( VLC_OBJECT(p_sd) );
+}
+
+static inline void vlc_sd_StopAndDestroy( services_discovery_t * p_this )
+{
+    vlc_sd_Stop( p_this );
+    vlc_sd_Destroy( p_this );
 }
 
 /* Read info from discovery object */