mirror of https://github.com/mpv-player/mpv
Consistently use NULL for pointers instead of 0.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27876 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
1ae7149c08
commit
c1c59ce8cd
|
@ -77,14 +77,14 @@ static char* _select_font(fc_instance_t* priv, const char* family, unsigned bold
|
||||||
{
|
{
|
||||||
FcBool rc;
|
FcBool rc;
|
||||||
FcResult result;
|
FcResult result;
|
||||||
FcPattern *pat = 0, *rpat = 0;
|
FcPattern *pat = NULL, *rpat = NULL;
|
||||||
int r_index, r_slant, r_weight;
|
int r_index, r_slant, r_weight;
|
||||||
FcChar8 *r_family, *r_style, *r_file, *r_fullname;
|
FcChar8 *r_family, *r_style, *r_file, *r_fullname;
|
||||||
FcBool r_outline, r_embolden;
|
FcBool r_outline, r_embolden;
|
||||||
FcCharSet* r_charset;
|
FcCharSet* r_charset;
|
||||||
FcFontSet* fset = 0;
|
FcFontSet* fset = NULL;
|
||||||
int curf;
|
int curf;
|
||||||
char* retval = 0;
|
char* retval = NULL;
|
||||||
int family_cnt;
|
int family_cnt;
|
||||||
|
|
||||||
*index = 0;
|
*index = 0;
|
||||||
|
@ -318,7 +318,7 @@ static void process_fontdata(fc_instance_t* priv, ass_library_t* library, FT_Lib
|
||||||
char* fname;
|
char* fname;
|
||||||
const char* fonts_dir = library->fonts_dir;
|
const char* fonts_dir = library->fonts_dir;
|
||||||
char buf[1000];
|
char buf[1000];
|
||||||
FILE* fp = 0;
|
FILE* fp = NULL;
|
||||||
|
|
||||||
if (!fonts_dir)
|
if (!fonts_dir)
|
||||||
return;
|
return;
|
||||||
|
@ -464,9 +464,9 @@ fc_instance_t* fontconfig_init(ass_library_t* library, FT_Library ftlibrary, con
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
priv->family_default = family ? strdup(family) : 0;
|
priv->family_default = family ? strdup(family) : NULL;
|
||||||
exit:
|
exit:
|
||||||
priv->path_default = path ? strdup(path) : 0;
|
priv->path_default = path ? strdup(path) : NULL;
|
||||||
priv->index_default = 0;
|
priv->index_default = 0;
|
||||||
|
|
||||||
return priv;
|
return priv;
|
||||||
|
|
Loading…
Reference in New Issue