Attachment 10165 Details for Bug 7074 – Proposed patch

[patch] Proposed patch

xdgmime-prefix.diff (text/plain), 11.63 KB, created by Christian - Manny Calavera - Neumair on 2007-06-03 10:51:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian - Manny Calavera - Neumair

Created: 2007-06-03 10:51:06 UTC

Size: 11.63 KB

patch

obsolete

>Index: src/xdgmime.h
>===================================================================
>RCS file: /cvs/mime/xdgmime/src/xdgmime.h,v
>retrieving revision 1.16
>diff -u -p -r1.16 xdgmime.h
>--- src/xdgmime.h	2 Jun 2007 09:12:29 -0000	1.16
>+++ src/xdgmime.h	3 Jun 2007 17:46:45 -0000
>@@ -40,6 +40,10 @@ extern "C" {
> #define XDG_ENTRY(func) _XDG_ENTRY2(XDG_PREFIX,func)
> #define _XDG_ENTRY2(prefix,func) _XDG_ENTRY3(prefix,func)
> #define _XDG_ENTRY3(prefix,func) prefix##_##func
>+
>+#define XDG_RESERVED_ENTRY(func) _XDG_RESERVED_ENTRY2(XDG_PREFIX,func)
>+#define _XDG_RESERVED_ENTRY2(prefix,func) _XDG_RESERVED_ENTRY3(prefix,func)
>+#define _XDG_RESERVED_ENTRY3(prefix,func) _##prefix##_##func
> #endif
> 
> typedef void (*XdgMimeCallback) (void *user_data);
>@@ -47,22 +51,26 @@ typedef void (*XdgMimeDestroy)  (void *u
> 
>   
> #ifdef XDG_PREFIX
>-#define xdg_mime_get_mime_type_for_data       XDG_ENTRY(get_mime_type_for_data)
>-#define xdg_mime_get_mime_type_for_file       XDG_ENTRY(get_mime_type_for_file)
>-#define xdg_mime_get_mime_type_from_file_name XDG_ENTRY(get_mime_type_from_file_name)
>-#define xdg_mime_is_valid_mime_type           XDG_ENTRY(is_valid_mime_type)
>-#define xdg_mime_mime_type_equal              XDG_ENTRY(mime_type_equal)
>-#define xdg_mime_media_type_equal             XDG_ENTRY(media_type_equal)
>-#define xdg_mime_mime_type_subclass           XDG_ENTRY(mime_type_subclass)
>-#define xdg_mime_get_mime_parents             XDG_ENTRY(get_mime_parents)
>-#define xdg_mime_list_mime_parents            XDG_ENTRY(list_mime_parents)
>-#define xdg_mime_unalias_mime_type            XDG_ENTRY(unalias_mime_type)
>-#define xdg_mime_get_max_buffer_extents       XDG_ENTRY(get_max_buffer_extents)
>-#define xdg_mime_shutdown                     XDG_ENTRY(shutdown)
>-#define xdg_mime_dump                         XDG_ENTRY(dump)
>-#define xdg_mime_register_reload_callback     XDG_ENTRY(register_reload_callback)
>-#define xdg_mime_remove_callback              XDG_ENTRY(remove_callback)
>-#define xdg_mime_type_unknown                 XDG_ENTRY(type_unknown)
>+#define xdg_mime_get_mime_type_for_data       XDG_ENTRY(mime_get_mime_type_for_data)
>+#define xdg_mime_get_mime_type_for_file       XDG_ENTRY(mime_get_mime_type_for_file)
>+#define xdg_mime_get_mime_type_from_file_name XDG_ENTRY(mime_get_mime_type_from_file_name)
>+#define xdg_mime_is_valid_mime_type           XDG_ENTRY(mime_is_valid_mime_type)
>+#define xdg_mime_mime_type_equal              XDG_ENTRY(mime_mime_type_equal)
>+#define xdg_mime_media_type_equal             XDG_ENTRY(mime_media_type_equal)
>+#define xdg_mime_mime_type_subclass           XDG_ENTRY(mime_mime_type_subclass)
>+#define xdg_mime_get_mime_parents             XDG_ENTRY(mime_get_mime_parents)
>+#define xdg_mime_list_mime_parents            XDG_ENTRY(mime_list_mime_parents)
>+#define xdg_mime_unalias_mime_type            XDG_ENTRY(mime_unalias_mime_type)
>+#define xdg_mime_get_max_buffer_extents       XDG_ENTRY(mime_get_max_buffer_extents)
>+#define xdg_mime_shutdown                     XDG_ENTRY(mime_shutdown)
>+#define xdg_mime_dump                         XDG_ENTRY(mime_dump)
>+#define xdg_mime_register_reload_callback     XDG_ENTRY(mime_register_reload_callback)
>+#define xdg_mime_remove_callback              XDG_ENTRY(mime_remove_callback)
>+#define xdg_mime_type_unknown                 XDG_ENTRY(mime_type_unknown)
>+
>+#define _xdg_mime_mime_type_equal             XDG_RESERVED_ENTRY(mime_mime_type_equal)
>+#define _xdg_mime_media_type_equal            XDG_RESERVED_ENTRY(mime_media_type_equal)
>+#define _xdg_mime_mime_type_subclass          XDG_RESERVED_ENTRY(mime_mime_type_subclass)
> #endif
> 
> extern const char xdg_mime_type_unknown[];
>Index: src/xdgmimealias.h
>===================================================================
>RCS file: /cvs/mime/xdgmime/src/xdgmimealias.h,v
>retrieving revision 1.1
>diff -u -p -r1.1 xdgmimealias.h
>--- src/xdgmimealias.h	7 Nov 2004 07:44:28 -0000	1.1
>+++ src/xdgmimealias.h	3 Jun 2007 17:46:46 -0000
>@@ -33,10 +33,11 @@
> typedef struct XdgAliasList XdgAliasList;
> 
> #ifdef XDG_PREFIX
>-#define _xdg_mime_alias_read_from_file        XDG_ENTRY(alias_read_from_file)
>-#define _xdg_mime_alias_list_new              XDG_ENTRY(alias_list_new)
>-#define _xdg_mime_alias_list_free             XDG_ENTRY(alias_list_free)
>-#define _xdg_mime_alias_list_lookup           XDG_ENTRY(alias_list_lookup)
>+#define _xdg_mime_alias_read_from_file        XDG_RESERVED_ENTRY(alias_read_from_file)
>+#define _xdg_mime_alias_list_new              XDG_RESERVED_ENTRY(alias_list_new)
>+#define _xdg_mime_alias_list_free             XDG_RESERVED_ENTRY(alias_list_free)
>+#define _xdg_mime_alias_list_lookup           XDG_RESERVED_ENTRY(alias_list_lookup)
>+#define _xdg_mime_alias_list_dump             XDG_RESERVED_ENTRY(alias_list_dump)
> #endif
> 
> void          _xdg_mime_alias_read_from_file (XdgAliasList *list,
>Index: src/xdgmimecache.h
>===================================================================
>RCS file: /cvs/mime/xdgmime/src/xdgmimecache.h,v
>retrieving revision 1.3
>diff -u -p -r1.3 xdgmimecache.h
>--- src/xdgmimecache.h	1 Dec 2005 18:37:16 -0000	1.3
>+++ src/xdgmimecache.h	3 Jun 2007 17:46:47 -0000
>@@ -32,9 +32,19 @@
> typedef struct _XdgMimeCache XdgMimeCache;
> 
> #ifdef XDG_PREFIX
>-#define _xdg_mime_cache_new_from_file        XDG_ENTRY(cache_new_from_file)
>-#define _xdg_mime_cache_ref                  XDG_ENTRY(cache_ref)
>-#define _xdg_mime_cache_unref                XDG_ENTRY(cache_unref)
>+#define _xdg_mime_cache_new_from_file                XDG_RESERVED_ENTRY(cache_new_from_file)
>+#define _xdg_mime_cache_ref                          XDG_RESERVED_ENTRY(cache_ref)
>+#define _xdg_mime_cache_unref                        XDG_RESERVED_ENTRY(cache_unref)
>+#define _xdg_mime_cache_get_mime_type_for_data       XDG_RESERVED_ENTRY(cache_get_mime_type_for_data)
>+#define _xdg_mime_cache_get_mime_type_for_file       XDG_RESERVED_ENTRY(cache_get_mime_type_for_file)
>+#define _xdg_mime_cache_get_mime_type_from_file_name XDG_RESERVED_ENTRY(cache_get_mime_type_from_file_name)
>+#define _xdg_mime_cache_is_valid_mime_type           XDG_RESERVED_ENTRY(cache_is_valid_mime_type)
>+#define _xdg_mime_cache_mime_type_equal              XDG_RESERVED_ENTRY(cache_mime_type_equal)
>+#define _xdg_mime_cache_media_type_equal             XDG_RESERVED_ENTRY(cache_media_type_equal)
>+#define _xdg_mime_cache_mime_type_subclass           XDG_RESERVED_ENTRY(cache_mime_type_subclass)
>+#define _xdg_mime_cache_list_mime_parents            XDG_RESERVED_ENTRY(cache_list_mime_parents)
>+#define _xdg_mime_cache_unalias_mime_type            XDG_RESERVED_ENTRY(cache_unalias_mime_type)
>+#define _xdg_mime_cache_get_max_buffer_extents       XDG_RESERVED_ENTRY(cache_get_max_buffer_extents)
> #endif
> 
> extern XdgMimeCache **_caches;
>Index: src/xdgmimeglob.h
>===================================================================
>RCS file: /cvs/mime/xdgmime/src/xdgmimeglob.h,v
>retrieving revision 1.5
>diff -u -p -r1.5 xdgmimeglob.h
>--- src/xdgmimeglob.h	1 Dec 2005 18:37:16 -0000	1.5
>+++ src/xdgmimeglob.h	3 Jun 2007 17:46:47 -0000
>@@ -41,13 +41,13 @@ typedef enum
> 
>   
> #ifdef XDG_PREFIX
>-#define _xdg_mime_glob_read_from_file         XDG_ENTRY(glob_read_from_file)
>-#define _xdg_glob_hash_new                    XDG_ENTRY(hash_new)
>-#define _xdg_glob_hash_free                   XDG_ENTRY(hash_free)
>-#define _xdg_glob_hash_lookup_file_name       XDG_ENTRY(hash_lookup_file_name)
>-#define _xdg_glob_hash_append_glob            XDG_ENTRY(hash_append_glob)
>-#define _xdg_glob_determine_type              XDG_ENTRY(determine_type)
>-#define _xdg_glob_hash_dump                   XDG_ENTRY(hash_dump)
>+#define _xdg_mime_glob_read_from_file         XDG_RESERVED_ENTRY(mime_glob_read_from_file)
>+#define _xdg_glob_hash_new                    XDG_RESERVED_ENTRY(hash_new)
>+#define _xdg_glob_hash_free                   XDG_RESERVED_ENTRY(hash_free)
>+#define _xdg_glob_hash_lookup_file_name       XDG_RESERVED_ENTRY(hash_lookup_file_name)
>+#define _xdg_glob_hash_append_glob            XDG_RESERVED_ENTRY(hash_append_glob)
>+#define _xdg_glob_determine_type              XDG_RESERVED_ENTRY(determine_type)
>+#define _xdg_glob_hash_dump                   XDG_RESERVED_ENTRY(hash_dump)
> #endif
> 
> void         _xdg_mime_glob_read_from_file   (XdgGlobHash *glob_hash,
>Index: src/xdgmimeint.h
>===================================================================
>RCS file: /cvs/mime/xdgmime/src/xdgmimeint.h,v
>retrieving revision 1.7
>diff -u -p -r1.7 xdgmimeint.h
>--- src/xdgmimeint.h	9 Dec 2004 17:20:40 -0000	1.7
>+++ src/xdgmimeint.h	3 Jun 2007 17:46:48 -0000
>@@ -46,11 +46,11 @@ typedef unsigned short xdg_uint16_t;
> typedef unsigned int   xdg_uint32_t;
> 
> #ifdef XDG_PREFIX
>-#define _xdg_utf8_skip   XDG_ENTRY(utf8_skip)
>-#define _xdg_utf8_to_ucs4   XDG_ENTRY(utf8_to_ucs4)
>-#define _xdg_ucs4_to_lower   XDG_ENTRY(ucs4_to_lower)
>-#define _xdg_utf8_validate   XDG_ENTRY(utf8_validate)
>-#define _xdg_get_base_name   XDG_ENTRY(get_ase_name)
>+#define _xdg_utf8_skip       XDG_RESERVED_ENTRY(utf8_skip)
>+#define _xdg_utf8_to_ucs4    XDG_RESERVED_ENTRY(utf8_to_ucs4)
>+#define _xdg_ucs4_to_lower   XDG_RESERVED_ENTRY(ucs4_to_lower)
>+#define _xdg_utf8_validate   XDG_RESERVED_ENTRY(utf8_validate)
>+#define _xdg_get_base_name   XDG_RESERVED_ENTRY(get_base_name)
> #endif
> 
> #define SWAP_BE16_TO_LE16(val) (xdg_uint16_t)(((xdg_uint16_t)(val) << 8)|((xdg_uint16_t)(val) >> 8))
>Index: src/xdgmimemagic.h
>===================================================================
>RCS file: /cvs/mime/xdgmime/src/xdgmimemagic.h,v
>retrieving revision 1.4
>diff -u -p -r1.4 xdgmimemagic.h
>--- src/xdgmimemagic.h	1 Dec 2005 18:37:16 -0000	1.4
>+++ src/xdgmimemagic.h	3 Jun 2007 17:46:48 -0000
>@@ -33,12 +33,11 @@
> typedef struct XdgMimeMagic XdgMimeMagic;
> 
> #ifdef XDG_PREFIX
>-#define _xdg_mime_glob_read_from_file             XDG_ENTRY(glob_read_from_file)
>-#define _xdg_mime_magic_new                       XDG_ENTRY(magic_new)
>-#define _xdg_mime_magic_read_from_file            XDG_ENTRY(magic_read_from_file)
>-#define _xdg_mime_magic_free                      XDG_ENTRY(magic_free)
>-#define _xdg_mime_magic_get_buffer_extents        XDG_ENTRY(magic_get_buffer_extents)
>-#define _xdg_mime_magic_lookup_data               XDG_ENTRY(magic_lookup_data)
>+#define _xdg_mime_magic_new                       XDG_RESERVED_ENTRY(magic_new)
>+#define _xdg_mime_magic_read_from_file            XDG_RESERVED_ENTRY(magic_read_from_file)
>+#define _xdg_mime_magic_free                      XDG_RESERVED_ENTRY(magic_free)
>+#define _xdg_mime_magic_get_buffer_extents        XDG_RESERVED_ENTRY(magic_get_buffer_extents)
>+#define _xdg_mime_magic_lookup_data               XDG_RESERVED_ENTRY(magic_lookup_data)
> #endif
> 
> 
>Index: src/xdgmimeparent.h
>===================================================================
>RCS file: /cvs/mime/xdgmime/src/xdgmimeparent.h,v
>retrieving revision 1.1
>diff -u -p -r1.1 xdgmimeparent.h
>--- src/xdgmimeparent.h	7 Nov 2004 07:44:28 -0000	1.1
>+++ src/xdgmimeparent.h	3 Jun 2007 17:46:48 -0000
>@@ -33,10 +33,11 @@
> typedef struct XdgParentList XdgParentList;
> 
> #ifdef XDG_PREFIX
>-#define _xdg_mime_parent_read_from_file        XDG_ENTRY(parent_read_from_file)
>-#define _xdg_mime_parent_list_new              XDG_ENTRY(parent_list_new)
>-#define _xdg_mime_parent_list_free             XDG_ENTRY(parent_list_free)
>-#define _xdg_mime_parent_list_lookup           XDG_ENTRY(parent_list_lookup)
>+#define _xdg_mime_parent_read_from_file        XDG_RESERVED_ENTRY(parent_read_from_file)
>+#define _xdg_mime_parent_list_new              XDG_RESERVED_ENTRY(parent_list_new)
>+#define _xdg_mime_parent_list_free             XDG_RESERVED_ENTRY(parent_list_free)
>+#define _xdg_mime_parent_list_lookup           XDG_RESERVED_ENTRY(parent_list_lookup)
>+#define _xdg_mime_parent_list_dump             XDG_RESERVED_ENTRY(parent_list_dump)
> #endif
> 
> void          _xdg_mime_parent_read_from_file (XdgParentList *list,

Actions: View | Splinter Review

Attachments on bug 7074: 5760 | 10157 | 10165

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.