Don't compile some unused functions in gio/xdgmime/

This commit is contained in:
Matthias Clasen 2010-08-08 20:49:59 -04:00
parent 7acdaf6f1d
commit 14e0ad7c53
15 changed files with 75 additions and 9 deletions

View File

@ -480,6 +480,8 @@ xdg_mime_get_mime_type_for_data (const void *data,
return XDG_MIME_TYPE_UNKNOWN;
}
#ifdef NOT_USED_IN_GIO
const char *
xdg_mime_get_mime_type_for_file (const char *file_name,
struct stat *statbuf)
@ -575,6 +577,8 @@ xdg_mime_get_mime_type_from_file_name (const char *file_name)
return XDG_MIME_TYPE_UNKNOWN;
}
#endif
int
xdg_mime_get_mime_types_from_file_name (const char *file_name,
const char *mime_types[],
@ -588,6 +592,8 @@ xdg_mime_get_mime_types_from_file_name (const char *file_name,
return _xdg_glob_hash_lookup_file_name (global_hash, file_name, mime_types, n_mime_types);
}
#ifdef NOT_USED_IN_GIO
int
xdg_mime_is_valid_mime_type (const char *mime_type)
{
@ -596,6 +602,8 @@ xdg_mime_is_valid_mime_type (const char *mime_type)
return _xdg_utf8_validate (mime_type);
}
#endif
void
xdg_mime_shutdown (void)
{
@ -801,14 +809,19 @@ xdg_mime_mime_type_subclass (const char *mime,
char **
xdg_mime_list_mime_parents (const char *mime)
{
const char *umime;
const char **parents;
char **result;
int i, n;
xdg_mime_init ();
if (_caches)
return _xdg_mime_cache_list_mime_parents (mime);
parents = xdg_mime_get_mime_parents (mime);
umime = _xdg_mime_unalias_mime_type (mime);
parents = _xdg_mime_parent_list_lookup (parent_list, umime);
if (!parents)
return NULL;
@ -822,6 +835,8 @@ xdg_mime_list_mime_parents (const char *mime)
return result;
}
#ifdef NOT_USED_IN_GIO
const char **
xdg_mime_get_mime_parents (const char *mime)
{
@ -851,6 +866,7 @@ xdg_mime_dump (void)
_xdg_mime_cache_glob_dump ();
}
#endif
/* Registers a function to be called every time the mime database reloads its files
*/
@ -878,6 +894,8 @@ xdg_mime_register_reload_callback (XdgMimeCallback callback,
return callback_id - 1;
}
#ifdef NOT_USED_IN_GIO
void
xdg_mime_remove_callback (int callback_id)
{
@ -903,6 +921,8 @@ xdg_mime_remove_callback (int callback_id)
}
}
#endif
const char *
xdg_mime_get_icon (const char *mime)
{

View File

@ -71,9 +71,9 @@ typedef void (*XdgMimeDestroy) (void *user_data);
#define xdg_mime_get_icon XDG_ENTRY(get_icon)
#define xdg_mime_get_generic_icon XDG_ENTRY(get_generic_icon)
#define _xdg_mime_mime_type_equal XDG_RESERVED_ENTRY(mime_type_equal)
#define _xdg_mime_mime_type_subclass XDG_RESERVED_ENTRY(mime_type_subclass)
#define _xdg_mime_unalias_mime_type XDG_RESERVED_ENTRY(unalias_mime_type)
#define _xdg_mime_mime_type_equal XDG_RESERVED_ENTRY(mime_type_equal)
#define _xdg_mime_unalias_mime_type XDG_RESERVED_ENTRY(unalias_mime_type)
#endif
extern const char xdg_mime_type_unknown[];
@ -82,13 +82,17 @@ extern const char xdg_mime_type_unknown[];
const char *xdg_mime_get_mime_type_for_data (const void *data,
size_t len,
int *result_prio);
#ifdef NOT_USED_IN_GIO
const char *xdg_mime_get_mime_type_for_file (const char *file_name,
struct stat *statbuf);
const char *xdg_mime_get_mime_type_from_file_name (const char *file_name);
#endif
int xdg_mime_get_mime_types_from_file_name(const char *file_name,
const char *mime_types[],
int n_mime_types);
#ifdef NOT_USED_IN_GIO
int xdg_mime_is_valid_mime_type (const char *mime_type);
#endif
int xdg_mime_mime_type_equal (const char *mime_a,
const char *mime_b);
int xdg_mime_media_type_equal (const char *mime_a,
@ -100,18 +104,24 @@ int xdg_mime_mime_type_subclass (const char *mime_a,
* instead, but notice that that function expects you to free
* the array it returns.
*/
#ifdef NOT_USED_IN_GIO
const char **xdg_mime_get_mime_parents (const char *mime);
#endif
char ** xdg_mime_list_mime_parents (const char *mime);
const char *xdg_mime_unalias_mime_type (const char *mime);
const char *xdg_mime_get_icon (const char *mime);
const char *xdg_mime_get_generic_icon (const char *mime);
int xdg_mime_get_max_buffer_extents (void);
void xdg_mime_shutdown (void);
#ifdef NOT_USED_IN_GIO
void xdg_mime_dump (void);
#endif
int xdg_mime_register_reload_callback (XdgMimeCallback callback,
void *data,
XdgMimeDestroy destroy);
#ifdef NOT_USED_IN_GIO
void xdg_mime_remove_callback (int callback_id);
#endif
/* Private versions of functions that don't call xdg_mime_init () */
int _xdg_mime_mime_type_equal (const char *mime_a,

View File

@ -165,6 +165,8 @@ _xdg_mime_alias_read_from_file (XdgAliasList *list,
}
#ifdef NOT_USED_IN_GIO
void
_xdg_mime_alias_list_dump (XdgAliasList *list)
{
@ -181,4 +183,4 @@ _xdg_mime_alias_list_dump (XdgAliasList *list)
}
}
#endif

View File

@ -46,6 +46,7 @@ XdgAliasList *_xdg_mime_alias_list_new (void);
void _xdg_mime_alias_list_free (XdgAliasList *list);
const char *_xdg_mime_alias_list_lookup (XdgAliasList *list,
const char *alias);
#ifdef NOT_USED_IN_GIO
void _xdg_mime_alias_list_dump (XdgAliasList *list);
#endif
#endif /* __XDG_MIME_ALIAS_H__ */

View File

@ -740,6 +740,8 @@ _xdg_mime_cache_get_mime_type_for_data (const void *data,
return cache_get_mime_type_for_data (data, len, result_prio, NULL, 0);
}
#ifdef NOT_USED_IN_GIO
const char *
_xdg_mime_cache_get_mime_type_for_file (const char *file_name,
struct stat *statbuf)
@ -820,6 +822,8 @@ _xdg_mime_cache_get_mime_type_from_file_name (const char *file_name)
return XDG_MIME_TYPE_UNKNOWN;
}
#endif
int
_xdg_mime_cache_get_mime_types_from_file_name (const char *file_name,
const char *mime_types[],
@ -1036,6 +1040,8 @@ _xdg_mime_cache_get_icon (const char *mime)
return cache_lookup_icon (mime, 32);
}
#ifdef NOT_USED_IN_GIO
static void
dump_glob_node (XdgMimeCache *cache,
xdg_uint32_t offset,
@ -1082,4 +1088,4 @@ _xdg_mime_cache_glob_dump (void)
}
}
#endif

View File

@ -58,12 +58,16 @@ void _xdg_mime_cache_unref (XdgMimeCache *cache);
const char *_xdg_mime_cache_get_mime_type_for_data (const void *data,
size_t len,
int *result_prio);
#ifdef NOT_USED_IN_GIO
const char *_xdg_mime_cache_get_mime_type_for_file (const char *file_name,
struct stat *statbuf);
#endif
int _xdg_mime_cache_get_mime_types_from_file_name (const char *file_name,
const char *mime_types[],
int n_mime_types);
#ifdef NOT_USED_IN_GIO
const char *_xdg_mime_cache_get_mime_type_from_file_name (const char *file_name);
#endif
int _xdg_mime_cache_is_valid_mime_type (const char *mime_type);
int _xdg_mime_cache_mime_type_equal (const char *mime_a,
const char *mime_b);
@ -76,6 +80,8 @@ const char *_xdg_mime_cache_unalias_mime_type (const char *mime);
int _xdg_mime_cache_get_max_buffer_extents (void);
const char *_xdg_mime_cache_get_icon (const char *mime);
const char *_xdg_mime_cache_get_generic_icon (const char *mime);
#ifdef NOT_USED_IN_GIO
void _xdg_mime_cache_glob_dump (void);
#endif
#endif /* __XDG_MIME_CACHE_H__ */

View File

@ -162,6 +162,8 @@ _xdg_glob_hash_node_new (void)
return glob_hash_node;
}
#ifdef NOT_USED_IN_GIO
static void
_xdg_glob_hash_node_dump (XdgGlobHashNode *glob_hash_node,
int depth)
@ -181,6 +183,8 @@ _xdg_glob_hash_node_dump (XdgGlobHashNode *glob_hash_node,
_xdg_glob_hash_node_dump (glob_hash_node->next, depth);
}
#endif
static XdgGlobHashNode *
_xdg_glob_hash_insert_ucs4 (XdgGlobHashNode *glob_hash_node,
xdg_unichar_t *text,
@ -603,6 +607,8 @@ _xdg_glob_hash_append_glob (XdgGlobHash *glob_hash,
}
}
#ifdef NOT_USED_IN_GIO
void
_xdg_glob_hash_dump (XdgGlobHash *glob_hash)
{
@ -639,6 +645,7 @@ _xdg_glob_hash_dump (XdgGlobHash *glob_hash)
}
}
#endif
void
_xdg_mime_glob_read_from_file (XdgGlobHash *glob_hash,

View File

@ -65,6 +65,8 @@ void _xdg_glob_hash_append_glob (XdgGlobHash *glob_hash,
int weight,
int case_sensitive);
XdgGlobType _xdg_glob_determine_type (const char *glob);
#ifdef NOT_USED_IN_GIO
void _xdg_glob_hash_dump (XdgGlobHash *glob_hash);
#endif
#endif /* __XDG_MIME_GLOB_H__ */

View File

@ -163,6 +163,7 @@ _xdg_mime_icon_read_from_file (XdgIconList *list,
sizeof (XdgIcon), icon_entry_cmp);
}
#ifdef NOT_USED_IN_GIO
void
_xdg_mime_icon_list_dump (XdgIconList *list)
@ -180,4 +181,5 @@ _xdg_mime_icon_list_dump (XdgIconList *list)
}
}
#endif

View File

@ -45,6 +45,8 @@ XdgIconList *_xdg_mime_icon_list_new (void);
void _xdg_mime_icon_list_free (XdgIconList *list);
const char *_xdg_mime_icon_list_lookup (XdgIconList *list,
const char *mime);
#ifdef NOT_USED_IN_GIO
void _xdg_mime_icon_list_dump (XdgIconList *list);
#endif
#endif /* __XDG_MIME_ICON_H__ */

View File

@ -199,6 +199,7 @@ _xdg_mime_parent_read_from_file (XdgParentList *list,
sizeof (XdgMimeParents), &parent_entry_cmp);
}
#ifdef NOT_USED_IN_GIO
void
_xdg_mime_parent_list_dump (XdgParentList *list)
@ -216,4 +217,5 @@ _xdg_mime_parent_list_dump (XdgParentList *list)
}
}
#endif

View File

@ -46,6 +46,8 @@ XdgParentList *_xdg_mime_parent_list_new (void);
void _xdg_mime_parent_list_free (XdgParentList *list);
const char **_xdg_mime_parent_list_lookup (XdgParentList *list,
const char *mime);
#ifdef NOT_USED_IN_GIO
void _xdg_mime_parent_list_dump (XdgParentList *list);
#endif
#endif /* __XDG_MIME_PARENT_H__ */

View File

@ -6290,13 +6290,15 @@ Returns: pointer to compiled data block, or NULL on error,
with errorptr and erroroffset set
*/
#if 0
#ifdef NOT_USED_IN_GLIB
PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION
pcre_compile(const char *pattern, int options, const char **errorptr,
int *erroroffset, const unsigned char *tables)
{
return pcre_compile2(pattern, options, NULL, errorptr, erroroffset, tables);
}
#endif
PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION

View File

@ -164,7 +164,7 @@ return PCRE_ERROR_NOSUBSTRING;
}
#if 0
#ifdef NOT_USED_IN_GLIB
/*************************************************
* Find first set of multiple named strings *

View File

@ -53,7 +53,8 @@ properties. */
/* Table to translate from particular type value to the general value. */
#if 0
#ifdef NOT_USED_IN_GLIB
static int ucp_gentype[] = {
ucp_C, ucp_C, ucp_C, ucp_C, ucp_C, /* Cc, Cf, Cn, Co, Cs */
ucp_L, ucp_L, ucp_L, ucp_L, ucp_L, /* Ll, Lu, Lm, Lo, Lt */
@ -92,6 +93,7 @@ _pcre_ucp_findprop(const unsigned int c, int *type_ptr, int *script_ptr)
*script_ptr = g_unichar_get_script(c);
return ucp_gentype[*type_ptr];
}
#endif