walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[lazy] Rename free()

This commit is contained in:
Behdad Esfahbod 2018-08-12 17:19:55 -07:00
parent a3b97db910
commit 7bd508a0c4
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hb-ft.cc
View File

@ -454,7 +454,7 @@ static struct hb_ft_font_funcs_lazy_loader_t : hb_font_funcs_lazy_loader_t<hb_ft
static static
void free_static_ft_funcs (void) void free_static_ft_funcs (void)
{ {
static_ft_funcs.free (); static_ft_funcs.free_instance ();
} }
#endif #endif
@ -714,7 +714,7 @@ static struct hb_ft_library_lazy_loader_t : hb_lazy_loader_t<hb_remove_ptr_t<FT_
static static
void free_static_ft_library (void) void free_static_ft_library (void)
{ {
static_ft_library.free (); static_ft_library.free_instance ();
} }
#endif #endif

2
src/hb-glib.cc
View File

@ -394,7 +394,7 @@ static struct hb_glib_unicode_funcs_lazy_loader_t : hb_unicode_funcs_lazy_loader
static static
void free_static_glib_funcs (void) void free_static_glib_funcs (void)
{ {
static_glib_funcs.free (); static_glib_funcs.free_instance ();
} }
#endif #endif

2
src/hb-icu.cc
View File

@ -383,7 +383,7 @@ static struct hb_icu_unicode_funcs_lazy_loader_t : hb_unicode_funcs_lazy_loader_
static static
void free_static_icu_funcs (void) void free_static_icu_funcs (void)
{ {
static_icu_funcs.free (); static_icu_funcs.free_instance ();
} }
#endif #endif

4
src/hb-machinery-private.hh
View File

@ -637,7 +637,7 @@ struct hb_lazy_loader_t : hb_data_wrapper_t<Data, WheresData>
{ {
do_destroy (instance.get ()); do_destroy (instance.get ());
} }
inline void free (void) inline void free_instance (void)
{ {
retry: retry:
Stored *p = instance.get (); Stored *p = instance.get ();
@ -720,7 +720,7 @@ struct hb_lazy_loader_t : hb_data_wrapper_t<Data, WheresData>
static inline void destroy (Stored *p) static inline void destroy (Stored *p)
{ {
p->fini (); p->fini ();
::free (p); free (p);
} }
private: private:

2
src/hb-ot-font.cc
View File

@ -264,7 +264,7 @@ static struct hb_ot_font_funcs_lazy_loader_t : hb_font_funcs_lazy_loader_t<hb_ot
static static
void free_static_ot_funcs (void) void free_static_ot_funcs (void)
{ {
static_ot_funcs.free (); static_ot_funcs.free_instance ();
} }
#endif #endif

6
src/hb-shape.cc
View File

@ -50,7 +50,7 @@
static void free_static_shaper_list (void); static void free_static_shaper_list (void);
static struct hb_shaper_list_lazy_loader_t : hb_lazy_loader_t<const char *, static struct hb_shaper_list_lazy_loader_t : hb_lazy_loader_t<const char *,
hb_shaper_list_lazy_loader_t> hb_shaper_list_lazy_loader_t>
{ {
static inline const char ** create (void) static inline const char ** create (void)
{ {
@ -72,7 +72,7 @@ static struct hb_shaper_list_lazy_loader_t : hb_lazy_loader_t<const char *,
} }
static inline void destroy (const char **l) static inline void destroy (const char **l)
{ {
::free (l); free (l);
} }
static inline const char ** get_null (void) static inline const char ** get_null (void)
{ {
@ -85,7 +85,7 @@ static struct hb_shaper_list_lazy_loader_t : hb_lazy_loader_t<const char *,
static static
void free_static_shaper_list (void) void free_static_shaper_list (void)
{ {
static_shaper_list.free (); static_shaper_list.free_instance ();
} }
#endif #endif

2
src/hb-ucdn.cc
View File

@ -267,7 +267,7 @@ static struct hb_ucdn_unicode_funcs_lazy_loader_t : hb_unicode_funcs_lazy_loader
static static
void free_static_ucdn_funcs (void) void free_static_ucdn_funcs (void)
{ {
static_ucdn_funcs.free (); static_ucdn_funcs.free_instance ();
} }
#endif #endif