Changeset 5af4cc854bcc7ec083195b41e555dac5988feabb

Timestamp:

27/05/08 21:31:06 (6 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1211916666 +0300

git-parent:

[5e15258c9ef28558fe2abc941fc1527e02b04c21]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1211916666 +0300

Message:

Do not require semi-colon after module macros

This leaves us more room to rework the macros later on

Files:

• include/vlc_plugin.h (modified) (9 diffs)

include/vlc_plugin.h

@@ -98 +98 @@
-            goto error;                                                       \
-        {                                                                     \
- /* the ; gets added */
+;
-
-#define vlc_module_end( )                                                     \
@@ -107 +107 @@
-    error:                                                                    \
-        return VLC_EGENERIC;                                                  \
-
-
-
+
-
-#define add_submodule( ) \
-
+;
-
-#define add_requirement( cap ) \
-    if (vlc_module_set (p_module, VLC_MODULE_CPU_REQUIREMENT, \
-                        (int)(CPU_CAPABILITY_##cap))) \
-
+;
-
-#define add_shortcut( shortcut ) \
-    if (vlc_module_set (p_submodule, VLC_MODULE_SHORTCUT, \
-        (const char *)(shortcut))) \
-
+;
-
-#define set_shortname( shortname ) \
-    if (vlc_module_set (p_submodule, VLC_MODULE_SHORTNAME, \
-        (const char *)(shortname))) \
-
+;
-
-#define set_description( desc ) \
-    if (vlc_module_set (p_submodule, VLC_MODULE_DESCRIPTION, \
-                        (const char *)(desc))) \
-
+;
-
-#define set_help( help ) \
-    if (vlc_module_set (p_submodule, VLC_MODULE_HELP, (const char *)(help))) \
-
+;
-
-#define set_capability( cap, score ) \
@@ -142 +140 @@
-                        (const char *)(cap)) \
-     || vlc_module_set (p_submodule, VLC_MODULE_SCORE, (int)(score))) \
-
+;
-
-#define set_callbacks( activate, deactivate ) \
-    if (vlc_module_set (p_submodule, VLC_MODULE_CB_OPEN, activate) \
-     || vlc_module_set (p_submodule, VLC_MODULE_CB_CLOSE, deactivate)) \
-
+;
-
-#define linked_with_a_crap_library_which_uses_atexit( ) \
-    if (vlc_module_set (p_submodule, VLC_MODULE_NO_UNLOAD)) \
-
+;
-
-VLC_EXPORT( module_t *, vlc_module_create, ( vlc_object_t * ) );
@@ -246 +244 @@
-
-#define add_type_inner( type ) \
-
+;
-
-#define add_typedesc_inner( type, text, longtext ) \
-;
+
-    vlc_config_set (p_config, VLC_CONFIG_DESC, \
-
+;
-
-#define add_typeadv_inner( type, text, longtext, advc ) \
-;
-
+
+;
-
-#define add_typename_inner( type, name, text, longtext, advc, cb ) \
-;
+
-    vlc_config_set (p_config, VLC_CONFIG_NAME, \
-
+;
-
-#define add_string_inner( type, name, text, longtext, advc, cb, v ) \
-;
-
+
+;
-
-#define add_int_inner( type, name, text, longtext, advc, cb, v ) \
-;
-
+
+;
-
-
-#define set_category( i_id ) \
-;
-
+
+;
-
-#define set_subcategory( i_id ) \
-;
-
+
+;
-
-#define set_section( text, longtext ) \
@@ -295 +293 @@
-
-#define add_string( name, value, p_callback, text, longtext, advc ) \
-
+
+
-
-#define add_password( name, value, p_callback, text, longtext, advc ) \
-
+
+
-
-#define add_file( name, value, p_callback, text, longtext, advc ) \
-
+
+
-
-#define add_directory( name, value, p_callback, text, longtext, advc ) \
-
+
+
-
-#define add_module( name, psz_caps, value, p_callback, text, longtext, advc ) \
-
-
+
+
+
-
-#define add_module_list( name, psz_caps, value, p_callback, text, longtext, advc ) \
-
-
+
+
+
-
-#ifndef __PLUGIN__
-#define add_module_cat( name, i_subcategory, value, p_callback, text, longtext, advc ) \
-
-
+
+
+
-
-#define add_module_list_cat( name, i_subcategory, value, p_callback, text, longtext, advc ) \
-
-
+
+
+
-#endif
-
-#define add_integer( name, value, p_callback, text, longtext, advc ) \
-
+
+
-
-#define add_key( name, value, p_callback, text, longtext, advc ) \
-
+
+
-
-#define add_integer_with_range( name, value, i_min, i_max, p_callback, text, longtext, advc ) \
-;
+
-    change_integer_range( i_min, i_max )
-
-#define add_float( name, v, p_callback, text, longtext, advc ) \
-;
-
+
+;
-
-#define add_float_with_range( name, value, f_min, f_max, p_callback, text, longtext, advc ) \
-;
+
-    change_float_range( f_min, f_max )
-
-#define add_bool( name, v, p_callback, text, longtext, advc ) \
-
-
+
+
+
-
-/* For removed option */
-#define add_obsolete_inner( name, type ) \
-;
+
-    vlc_config_set (p_config, VLC_CONFIG_NAME, \
-                    (const char *)(name), (vlc_callback_t)NULL); \
-
+;
-
-#define add_obsolete_bool( name ) \
@@ -371 +380 @@
-
-#define change_short( ch ) \
-
+;
-
-#define change_string_list( list, list_text, list_update_func ) \
@@ -378 +387 @@
-                    (const char *const *)(list), \
-                    (const char *const *)(list_text), \
-
+;
-
-#define change_integer_list( list, list_text, list_update_func ) \
@@ -385 +394 @@
-                    (const int *)(list), \
-                    (const char *const *)(list_text), \
-
+;
-
-#define change_float_list( list, list_text, list_update_func ) \
@@ -392 +401 @@
-                    (const float *)(list), \
-                    (const char *const *)(list_text), \
-
+;
-
-#define change_integer_range( minv, maxv ) \
-
+;
-
-#define change_float_range( minv, maxv ) \
-    vlc_config_set (p_config, VLC_CONFIG_RANGE, \
-
+;
-
-#define change_action_add( pf_action, text ) \
-    vlc_config_set (p_config, VLC_CONFIG_ADD_ACTION, \
-
+;
-
-#define change_internal() \
-
+;
-
-#define change_need_restart() \
-
+;
-
-#define change_autosave() \
-
+;
-
-#define change_unsaveable() \
-
-
-
+;
+
+;
-
-#define change_safe() \
-
-
-
+;
+
+