Commit be5f797f5b36542bccfc5664e2a2b293e0eb3084
2007-01-06T07:51:48
* src/cff/cffload.c (cff_index_init): Remove unused variable. (cff_index_read_offset): s/perror/errorp/ to avoid global shadowing.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44
diff --git a/ChangeLog b/ChangeLog
index 087d5dc..4055424 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-06 Werner Lemberg <wl@gnu.org>
+
+ * src/cff/cffload.c (cff_index_init): Remove unused variable.
+ (cff_index_read_offset): s/perror/errorp/ to avoid global shadowing.
+
2007-01-04 David Turner <david@freetype.org>
* src/pfr/pfrobjs.c (pfr_face_init): Detect non-scalable fonts
diff --git a/src/cff/cffload.c b/src/cff/cffload.c
index cbd4fc3..b07e903 100644
--- a/src/cff/cffload.c
+++ b/src/cff/cffload.c
@@ -197,7 +197,7 @@
/* read an offset from the index's stream current position */
static FT_ULong
cff_index_read_offset( CFF_Index idx,
- FT_Error *perror )
+ FT_Error *errorp )
{
FT_Error error;
FT_Stream stream = idx->stream;
@@ -214,7 +214,7 @@
result = ( result << 8 ) | tmp[nn];
}
- *perror = error;
+ *errorp = error;
return result;
}
@@ -237,7 +237,7 @@
count > 0 )
{
FT_Byte offsize;
- FT_ULong size, last_offset;
+ FT_ULong size;
/* there is at least one element; read the offset size, */