From: Keith Packard Date: Sat, 24 Aug 2002 20:08:53 +0000 (+0000) Subject: Add const to a bunch of string APIs X-Git-Tag: fcpackage_rc3~1 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=0f9a306e710b3c03cd82b8234ae840558d4b886f;p=fontconfig.git Add const to a bunch of string APIs --- diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h index c2ab09b..73b949e 100644 --- a/fontconfig/fontconfig.h +++ b/fontconfig/fontconfig.h @@ -689,15 +689,15 @@ int FcStrCmp (const FcChar8 *s1, const FcChar8 *s2); int -FcUtf8ToUcs4 (FcChar8 *src_orig, - FcChar32 *dst, - int len); +FcUtf8ToUcs4 (const FcChar8 *src_orig, + FcChar32 *dst, + int len); FcBool -FcUtf8Len (FcChar8 *string, - int len, - int *nchar, - int *wchar); +FcUtf8Len (const FcChar8 *string, + int len, + int *nchar, + int *wchar); #define FC_UTF8_MAX_LEN 6 @@ -706,17 +706,17 @@ FcUcs4ToUtf8 (FcChar32 ucs4, FcChar8 dest[FC_UTF8_MAX_LEN]); int -FcUtf16ToUcs4 (FcChar8 *src_orig, - FcEndian endian, - FcChar32 *dst, - int len); /* in bytes */ +FcUtf16ToUcs4 (const FcChar8 *src_orig, + FcEndian endian, + FcChar32 *dst, + int len); /* in bytes */ FcBool -FcUtf16Len (FcChar8 *string, - FcEndian endian, - int len, /* in bytes */ - int *nchar, - int *wchar); +FcUtf16Len (const FcChar8 *string, + FcEndian endian, + int len, /* in bytes */ + int *nchar, + int *wchar); FcChar8 * FcStrDirname (const FcChar8 *file); diff --git a/src/fcstr.c b/src/fcstr.c index 940bf49..fadc1de 100644 --- a/src/fcstr.c +++ b/src/fcstr.c @@ -125,14 +125,14 @@ FcStrCmp (const FcChar8 *s1, const FcChar8 *s2) } int -FcUtf8ToUcs4 (FcChar8 *src_orig, - FcChar32 *dst, - int len) +FcUtf8ToUcs4 (const FcChar8 *src_orig, + FcChar32 *dst, + int len) { - FcChar8 *src = src_orig; - FcChar8 s; - int extra; - FcChar32 result; + const FcChar8 *src = src_orig; + FcChar8 s; + int extra; + FcChar32 result; if (len == 0) return 0; @@ -196,10 +196,10 @@ FcUtf8ToUcs4 (FcChar8 *src_orig, } FcBool -FcUtf8Len (FcChar8 *string, - int len, - int *nchar, - int *wchar) +FcUtf8Len (const FcChar8 *string, + int len, + int *nchar, + int *wchar) { int n; int clen; @@ -255,14 +255,14 @@ FcUcs4ToUtf8 (FcChar32 ucs4, (FcChar16) ((src)[endian == FcEndianBig ? 1 : 0])) int -FcUtf16ToUcs4 (FcChar8 *src_orig, - FcEndian endian, - FcChar32 *dst, - int len) /* in bytes */ +FcUtf16ToUcs4 (const FcChar8 *src_orig, + FcEndian endian, + FcChar32 *dst, + int len) /* in bytes */ { - FcChar8 *src = src_orig; - FcChar16 a, b; - FcChar32 result; + const FcChar8 *src = src_orig; + FcChar16 a, b; + FcChar32 result; if (len < 2) return 0; @@ -292,11 +292,11 @@ FcUtf16ToUcs4 (FcChar8 *src_orig, } FcBool -FcUtf16Len (FcChar8 *string, - FcEndian endian, - int len, /* in bytes */ - int *nchar, - int *wchar) +FcUtf16Len (const FcChar8 *string, + FcEndian endian, + int len, /* in bytes */ + int *nchar, + int *wchar) { int n; int clen;