Behdad Esfahbod
2011-Mar-15 15:46 UTC
[Fontconfig] fontconfig: Branch ''master'' - 5 commits
doc/fcconfig.fncs | 4 ++--
doc/fcinit.fncs | 2 +-
doc/fcmatrix.fncs | 4 ++--
doc/fcobjectset.fncs | 2 +-
fc-lang/fc-lang.c | 2 +-
src/fcatomic.c | 2 +-
src/fccache.c | 13 +++++++++++--
src/fccfg.c | 2 +-
src/fcdir.c | 4 ++--
src/fcformat.c | 2 +-
src/fcint.h | 8 ++------
11 files changed, 25 insertions(+), 20 deletions(-)
New commits:
commit f0ee5761e1ab63d848f980a767dd8475986f1342
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Mon Mar 14 18:58:13 2011 -0300
Fix warning
diff --git a/fc-lang/fc-lang.c b/fc-lang/fc-lang.c
index a13d1bf..51717f9 100644
--- a/fc-lang/fc-lang.c
+++ b/fc-lang/fc-lang.c
@@ -192,7 +192,7 @@ scan (FILE *f, char *file, FcCharSetFreezer *freezer)
fatal (file, lineno, "out of memory");
}
}
- n = FcCharSetFreeze (freezer, c);
+ n = (FcCharSet *) FcCharSetFreeze (freezer, c);
FcCharSetDestroy (c);
return n;
}
commit c21fb9ac27ca89f3b581c58b1a08372f8273a262
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Mon Mar 14 18:49:21 2011 -0300
Always define FcStat as a function
Such that first arg is const char *. We also need to make more changes
in that function as part of some other bug.
diff --git a/src/fcatomic.c b/src/fcatomic.c
index 81b5f6a..33c1cc6 100644
--- a/src/fcatomic.c
+++ b/src/fcatomic.c
@@ -142,7 +142,7 @@ FcAtomicLock (FcAtomic *atomic)
* machines sharing the same filesystem will have clocks
* reasonably close to each other.
*/
- if (FcStat ((char *) atomic->lck, &lck_stat) >= 0)
+ if (FcStat (atomic->lck, &lck_stat) >= 0)
{
time_t now = time (0);
if ((long int) (now - lck_stat.st_mtime) > 10 * 60)
diff --git a/src/fccache.c b/src/fccache.c
index 1bbd799..d865266 100644
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -132,6 +132,15 @@ FcStat (const char *file, struct stat *statb)
return 0;
}
+
+#else
+
+int
+FcStat (const char *file, struct stat *statb)
+{
+ return stat ((char *) file, statb);
+}
+
#endif
static const char bin2hex[] = { ''0'', ''1'',
''2'', ''3'',
@@ -234,7 +243,7 @@ FcDirCacheProcess (FcConfig *config, const FcChar8 *dir,
struct stat file_stat, dir_stat;
FcBool ret = FcFalse;
- if (FcStat ((char *) dir, &dir_stat) < 0)
+ if (FcStat (dir, &dir_stat) < 0)
return FcFalse;
FcDirCacheBasename (dir, cache_base);
@@ -516,7 +525,7 @@ FcCacheTimeValid (FcCache *cache, struct stat *dir_stat)
if (!dir_stat)
{
- if (FcStat ((const char *) FcCacheDir (cache), &dir_static) < 0)
+ if (FcStat (FcCacheDir (cache), &dir_static) < 0)
return FcFalse;
dir_stat = &dir_static;
}
diff --git a/src/fccfg.c b/src/fccfg.c
index 6812781..4beb7d2 100644
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -131,7 +131,7 @@ FcConfigNewestFile (FcStrSet *files)
if (list)
{
while ((file = FcStrListNext (list)))
- if (FcStat ((char *) file, &statb) == 0)
+ if (FcStat (file, &statb) == 0)
if (!newest.set || statb.st_mtime - newest.time > 0)
{
newest.set = FcTrue;
diff --git a/src/fcdir.c b/src/fcdir.c
index e6b66ce..359446c 100644
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -30,7 +30,7 @@ FcFileIsDir (const FcChar8 *file)
{
struct stat statb;
- if (FcStat ((const char *) file, &statb) != 0)
+ if (FcStat (file, &statb) != 0)
return FcFalse;
return S_ISDIR(statb.st_mode);
}
@@ -243,7 +243,7 @@ FcDirCacheScan (const FcChar8 *dir, FcConfig *config)
if (FcDebug () & FC_DBG_FONTSET)
printf ("cache scan dir %s\n", dir);
- if (FcStat ((char *) dir, &dir_stat) < 0)
+ if (FcStat (dir, &dir_stat) < 0)
{
if (errno != ENOENT)
ret = FcFalse;
diff --git a/src/fcint.h b/src/fcint.h
index a2313df..83a7a43 100644
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -544,12 +544,8 @@ FcCacheFini (void);
FcPrivate void
FcDirCacheReference (FcCache *cache, int nref);
-#ifdef _WIN32
FcPrivate int
FcStat (const char *file, struct stat *statb);
-#else
-#define FcStat stat
-#endif
/* fccfg.c */
commit b5617e636cbb0bc8ef4daba6681a6f58078d7a42
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Mon Mar 14 18:23:56 2011 -0300
More doc typo fixes
diff --git a/doc/fcatomic.fncs b/doc/fcatomic.fncs
index 1653009..017756a 100644
--- a/doc/fcatomic.fncs
+++ b/doc/fcatomic.fncs
@@ -57,7 +57,7 @@ by <parameter>atomic</parameter>.
@TYPE1@ FcAtomic * @ARG1@ atomic
@PURPOSE@ return original file name
@DESC@
-Returns the file refernced by <parameter>atomic</parameter>.
+Returns the file referenced by <parameter>atomic</parameter>.
@@
@RET@ FcBool
diff --git a/doc/fcconfig.fncs b/doc/fcconfig.fncs
index 024cc21..fb55ade 100644
--- a/doc/fcconfig.fncs
+++ b/doc/fcconfig.fncs
@@ -90,7 +90,7 @@ is enabled, and NULL otherwise.
See also <function>FcConfigEnableHome</function>).
@@
- at RET@ FcBol
+ at RET@ FcBool
@FUNC@ FcConfigEnableHome
@TYPE1@ FcBool% @ARG1@ enable
@PURPOSE@ controls use of the home directory.
@@ -309,7 +309,7 @@ by the return value from multiple FcFontSort calls,
applications must not
modify these patterns. Instead, they should be passed, along with
<parameter>p</parameter> to
<function>FcFontRenderPrepare</function> which combines them into a
complete pattern.
</para><para>
-The FcFontSet returned by FcFontSort is destroyed by caling FcFontSetDestroy.
+The FcFontSet returned by FcFontSort is destroyed by calling FcFontSetDestroy.
If <parameter>config</parameter> is NULL, the current configuration
is used.
@@
diff --git a/doc/fcinit.fncs b/doc/fcinit.fncs
index 2130a55..014af0d 100644
--- a/doc/fcinit.fncs
+++ b/doc/fcinit.fncs
@@ -53,7 +53,7 @@ been loaded, this routine does nothing and returns FcTrue.
@RET@ void
@FUNC@ FcFini
@TYPE1@ void
- at PURPOSE@ finalize fonconfig library
+ at PURPOSE@ finalize fontconfig library
@DESC@
Frees all data structures allocated by previous calls to fontconfig
functions. Fontconfig returns to an uninitialized state, requiring a
diff --git a/doc/fcmatrix.fncs b/doc/fcmatrix.fncs
index 9180547..a53ade9 100644
--- a/doc/fcmatrix.fncs
+++ b/doc/fcmatrix.fncs
@@ -97,11 +97,11 @@ matrix:
@DESC@
<function>FcMatrixScale</function> multiplies
<parameter>matrix</parameter>
x values by <parameter>sx</parameter> and y values by
-<parameter>sy</parameter>. This is done by multiplying by
+<parameter>dy</parameter>. This is done by multiplying by
the matrix:
<programlisting>
sx 0
- 0 sy
+ 0 dy
</programlisting>
@@
diff --git a/doc/fcobjectset.fncs b/doc/fcobjectset.fncs
index 06cc8c4..57e1750 100644
--- a/doc/fcobjectset.fncs
+++ b/doc/fcobjectset.fncs
@@ -35,7 +35,7 @@ Creates an empty set.
@TYPE2@ const char * @ARG2@ object
@PURPOSE@ Add to an object set
@DESC@
-Adds a proprety name to the set. Returns FcFalse if the property name cannot be
+Adds a property name to the set. Returns FcFalse if the property name cannot be
inserted into the set (due to allocation failure). Otherwise returns FcTrue.
@@
commit 6c7915c10548132c3f7d0c00d08fdb268e5da6d4
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Mon Mar 14 18:21:32 2011 -0300
Mark constant strings as constant
Fixes a few compiler warnings in fcxml.c and makes it clear that they
should not be freed.
diff --git a/doc/fcatomic.fncs b/doc/fcatomic.fncs
index 017756a..1653009 100644
--- a/doc/fcatomic.fncs
+++ b/doc/fcatomic.fncs
@@ -57,7 +57,7 @@ by <parameter>atomic</parameter>.
@TYPE1@ FcAtomic * @ARG1@ atomic
@PURPOSE@ return original file name
@DESC@
-Returns the file referenced by <parameter>atomic</parameter>.
+Returns the file refernced by <parameter>atomic</parameter>.
@@
@RET@ FcBool
diff --git a/src/fcint.h b/src/fcint.h
index e662c37..a2313df 100644
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -239,13 +239,13 @@ typedef struct _FcExpr {
union {
int ival;
double dval;
- FcChar8 *sval;
+ const FcChar8 *sval;
FcMatrix *mval;
FcBool bval;
FcCharSet *cval;
FcLangSet *lval;
FcObject object;
- FcChar8 *constant;
+ const FcChar8 *constant;
struct {
struct _FcExpr *left, *right;
} tree;
commit c76ed777ddb03a70c5990ef439d8d97809d1ef92
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Mon Mar 14 18:04:59 2011 -0300
Bug 30566 - fcformat.c:interpret_enumerate() passes uninitialized idx to
FcPatternGetLangSet()
diff --git a/src/fcformat.c b/src/fcformat.c
index 5198596..1368b71 100644
--- a/src/fcformat.c
+++ b/src/fcformat.c
@@ -610,7 +610,7 @@ interpret_enumerate (FcFormatContext *c,
{
FcLangSet *langset;
if (FcResultMatch =- FcPatternGetLangSet (pat, os->objects[0], idx,
&langset))
+ FcPatternGetLangSet (pat, os->objects[0], 0, &langset))
{
FcStrSet *ss;
if (!(ss = FcLangSetGetLangs (langset)) ||