From 4d93d3a0d0f5d9b6a0a1cc27cad63f67ce085b3b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 7 Nov 2011 15:26:52 -0500 Subject: [PATCH] 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 --- fontconfig/fontconfig.h | 4 ++-- src/fcname.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h index db26b97..23ea222 100644 --- a/fontconfig/fontconfig.h +++ b/fontconfig/fontconfig.h @@ -739,10 +739,10 @@ FcPublic FcBool FcNameUnregisterConstants (const FcConstant *consts, int nconsts); FcPublic const FcConstant * -FcNameGetConstant (FcChar8 *string); +FcNameGetConstant (const FcChar8 *string); FcPublic FcBool -FcNameConstant (FcChar8 *string, int *result); +FcNameConstant (const FcChar8 *string, int *result); FcPublic FcPattern * FcNameParse (const FcChar8 *name); diff --git a/src/fcname.c b/src/fcname.c index d77eff6..864ad40 100644 --- a/src/fcname.c +++ b/src/fcname.c @@ -511,7 +511,7 @@ FcNameUnregisterConstants (const FcConstant *consts, int nconsts) } const FcConstant * -FcNameGetConstant (FcChar8 *string) +FcNameGetConstant (const FcChar8 *string) { const FcConstantList *l; int i; @@ -526,7 +526,7 @@ FcNameGetConstant (FcChar8 *string) } FcBool -FcNameConstant (FcChar8 *string, int *result) +FcNameConstant (const FcChar8 *string, int *result) { const FcConstant *c; -- 2.39.5