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

FcName{,Get}Constant: constify string input 

These funcs don't modify the incoming string, so add const markings.
This is the "right thing", shouldn't change the ABI, and fixes some
gcc warnings:

fccfg.c: In function 'FcConfigEvaluate':
fccfg.c:916:2: warning: passing argument 1 of 'IA__FcNameConstant'
	discards 'const' qualifier from pointer target type [enabled by default]
fcalias.h:253:34: note: expected 'FcChar8 *' but
	argument is of type 'const FcChar8 *'

fcxml.c: In function 'FcTypecheckExpr':
fcxml.c:604:2: warning: passing argument 1 of 'IA__FcNameGetConstant'
	discards 'const' qualifier from pointer target type [enabled by default]
fcalias.h:251:37: note: expected 'FcChar8 *' but
	argument is of type 'const FcChar8 *'

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2011-11-07 15:26:52 -05:00
parent da763aa77d
commit 123d344f45
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fontconfig/fontconfig.h
View File

@ -739,10 +739,10 @@ FcPublic FcBool
FcNameUnregisterConstants (const FcConstant *consts, int nconsts); FcNameUnregisterConstants (const FcConstant *consts, int nconsts);
FcPublic const FcConstant * FcPublic const FcConstant *
FcNameGetConstant (FcChar8 *string); FcNameGetConstant (const FcChar8 *string);
FcPublic FcBool FcPublic FcBool
FcNameConstant (FcChar8 *string, int *result); FcNameConstant (const FcChar8 *string, int *result);
FcPublic FcPattern * FcPublic FcPattern *
FcNameParse (const FcChar8 *name); FcNameParse (const FcChar8 *name);

4
src/fcname.c
View File

@ -511,7 +511,7 @@ FcNameUnregisterConstants (const FcConstant *consts, int nconsts)
} }
const FcConstant * const FcConstant *
FcNameGetConstant (FcChar8 *string) FcNameGetConstant (const FcChar8 *string)
{ {
const FcConstantList *l; const FcConstantList *l;
int i; int i;
@ -526,7 +526,7 @@ FcNameGetConstant (FcChar8 *string)
} }
FcBool FcBool
FcNameConstant (FcChar8 *string, int *result) FcNameConstant (const FcChar8 *string, int *result)
{ {
const FcConstant *c; const FcConstant *c;