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

Add const to a bunch of string APIs

This commit is contained in:
Keith Packard 2002-08-24 20:08:53 +00:00
parent 47d4f9501f
commit 0f9a306e71
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fontconfig/fontconfig.h
View File

@ -689,15 +689,15 @@ int
FcStrCmp (const FcChar8 *s1, const FcChar8 *s2); FcStrCmp (const FcChar8 *s1, const FcChar8 *s2);
int int
FcUtf8ToUcs4 (FcChar8 *src_orig, FcUtf8ToUcs4 (const FcChar8 *src_orig,
FcChar32 *dst, FcChar32 *dst,
int len); int len);
FcBool FcBool
FcUtf8Len (FcChar8 *string, FcUtf8Len (const FcChar8 *string,
int len, int len,
int *nchar, int *nchar,
int *wchar); int *wchar);
#define FC_UTF8_MAX_LEN 6 #define FC_UTF8_MAX_LEN 6
@ -706,17 +706,17 @@ FcUcs4ToUtf8 (FcChar32 ucs4,
FcChar8 dest[FC_UTF8_MAX_LEN]); FcChar8 dest[FC_UTF8_MAX_LEN]);
int int
FcUtf16ToUcs4 (FcChar8 *src_orig, FcUtf16ToUcs4 (const FcChar8 *src_orig,
FcEndian endian, FcEndian endian,
FcChar32 *dst, FcChar32 *dst,
int len); /* in bytes */ int len); /* in bytes */
FcBool FcBool
FcUtf16Len (FcChar8 *string, FcUtf16Len (const FcChar8 *string,
FcEndian endian, FcEndian endian,
int len, /* in bytes */ int len, /* in bytes */
int *nchar, int *nchar,
int *wchar); int *wchar);
FcChar8 * FcChar8 *
FcStrDirname (const FcChar8 *file); FcStrDirname (const FcChar8 *file);

46
src/fcstr.c
View File

@ -125,14 +125,14 @@ FcStrCmp (const FcChar8 *s1, const FcChar8 *s2)
} }
int int
FcUtf8ToUcs4 (FcChar8 *src_orig, FcUtf8ToUcs4 (const FcChar8 *src_orig,
FcChar32 *dst, FcChar32 *dst,
int len) int len)
{ {
FcChar8 *src = src_orig; const FcChar8 *src = src_orig;
FcChar8 s; FcChar8 s;
int extra; int extra;
FcChar32 result; FcChar32 result;
if (len == 0) if (len == 0)
return 0; return 0;
@ -196,10 +196,10 @@ FcUtf8ToUcs4 (FcChar8 *src_orig,
} }
FcBool FcBool
FcUtf8Len (FcChar8 *string, FcUtf8Len (const FcChar8 *string,
int len, int len,
int *nchar, int *nchar,
int *wchar) int *wchar)
{ {
int n; int n;
int clen; int clen;
@ -255,14 +255,14 @@ FcUcs4ToUtf8 (FcChar32 ucs4,
(FcChar16) ((src)[endian == FcEndianBig ? 1 : 0])) (FcChar16) ((src)[endian == FcEndianBig ? 1 : 0]))
int int
FcUtf16ToUcs4 (FcChar8 *src_orig, FcUtf16ToUcs4 (const FcChar8 *src_orig,
FcEndian endian, FcEndian endian,
FcChar32 *dst, FcChar32 *dst,
int len) /* in bytes */ int len) /* in bytes */
{ {
FcChar8 *src = src_orig; const FcChar8 *src = src_orig;
FcChar16 a, b; FcChar16 a, b;
FcChar32 result; FcChar32 result;
if (len < 2) if (len < 2)
return 0; return 0;
@ -292,11 +292,11 @@ FcUtf16ToUcs4 (FcChar8 *src_orig,
} }
FcBool FcBool
FcUtf16Len (FcChar8 *string, FcUtf16Len (const FcChar8 *string,
FcEndian endian, FcEndian endian,
int len, /* in bytes */ int len, /* in bytes */
int *nchar, int *nchar,
int *wchar) int *wchar)
{ {
int n; int n;
int clen; int clen;