Commit a82cd844fb68d14741725946aa43e31490c8468c

Werner Lemberg 2000-11-10T22:43:37

Small fixes and formatting.

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
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
diff --git a/builds/cygwin/cygwin-def.in b/builds/cygwin/cygwin-def.in
index 67d855f..8e6e90c 100644
--- a/builds/cygwin/cygwin-def.in
+++ b/builds/cygwin/cygwin-def.in
@@ -33,13 +33,13 @@ INSTALL       := @INSTALL@
 INSTALL_DATA  := @INSTALL_DATA@
 MKINSTALLDIRS := $(BUILD)/mkinstalldirs
 
-DISTCLEAN += $(BUILD)/config.cache     \
-             $(BUILD)/config.log       \
-             $(BUILD)/config.status    \
-             $(BUILD)/cygwin-def.mk    \
-             $(BUILD)/cygwin-cc.mk     \
-             $(BUILD)/ftconfig.h       \
-	     $(BUILD)/freetype-config  \
+DISTCLEAN += $(BUILD)/config.cache    \
+             $(BUILD)/config.log      \
+             $(BUILD)/config.status   \
+             $(BUILD)/cygwin-def.mk   \
+             $(BUILD)/cygwin-cc.mk    \
+             $(BUILD)/ftconfig.h      \
+             $(BUILD)/freetype-config \
              $(LIBTOOL)
 
 
@@ -70,14 +70,14 @@ endif
 
 # The directory where all library files are placed.
 #
-# By default, this is the same as $(OBJ_DIR), however, this can be changed
+# By default, this is the same as $(OBJ_DIR); however, this can be changed
 # to suit particular needs.
 #
 LIB_DIR := $(OBJ_DIR)
 
 
 # the NO_OUTPUT macro is appended to command lines in order to ignore
-# the output of some programs..
+# the output of some programs.
 #
 NO_OUTPUT := 2> /dev/null
 
diff --git a/builds/cygwin/freetype-config.in b/builds/cygwin/freetype-config.in
index 0b2f0bd..8575a07 100644
--- a/builds/cygwin/freetype-config.in
+++ b/builds/cygwin/freetype-config.in
@@ -6,7 +6,7 @@ exec_prefix_set=no
 
 usage()
 {
- cat <<EOF
+  cat <<EOF
 Usage: freetype-config [OPTIONS] [LIBRARIES]
 Options:
  [--prefix[=DIR]]
@@ -15,11 +15,11 @@ Options:
  [--libs]
  [--cflags]
 EOF
- exit $1
+  exit $1
 }
 
 if test $# -eq 0; then
- usage 1 1>&2
+  usage 1 1>&2
 fi
 
 
@@ -30,39 +30,40 @@ while test $# -gt 0; do
   esac
 
   case $1 in
-    --prefix=*)
-      prefix=$optarg
-      if test $exec_prefix_set = no ; then
-        exec_prefix=$optarg
-      fi
-      ;;
-    --prefix)
-      echo_prefix=yes
-      ;;
-    --exec-prefix=*)
-      exec_prefix=$optarg
-      exec_prefix_set=yes
-      ;;
-    --exec-prefix)
-      echo_exec_prefix=yes
-      ;;
-    --version)
-      echo @VERSION@
-      exit 0
-      ;;
-    --cflags)
-      echo_cflags=yes
-      ;;
-    --libs)
-      echo_libs=yes
-      ;;
-    *)
-      usage 1 1>&2
-      ;;
+  --prefix=*)
+    prefix=$optarg
+    ;;
+  --prefix)
+    echo_prefix=yes
+    ;;
+  --exec-prefix=*)
+    exec_prefix=$optarg
+    exec_prefix_set=yes
+    ;;
+  --exec-prefix)
+    echo_exec_prefix=yes
+    ;;
+  --version)
+    echo @VERSION@
+    exit 0
+    ;;
+  --cflags)
+    echo_cflags=yes
+    ;;
+  --libs)
+    echo_libs=yes
+    ;;
+  *)
+    usage 1 1>&2
+    ;;
   esac
   shift
 done
 
+if test "$exec_prefix_set" = "no"; then
+  exec_prefix=$prefix
+fi
+
 if test "$echo_prefix" = "yes"; then
  echo $prefix
 fi
@@ -78,4 +79,4 @@ if test "$echo_libs" = "yes"; then
  echo -L@libdir@ $libs
 fi
 
-
+# EOF
diff --git a/builds/cygwin/install.mk b/builds/cygwin/install.mk
index fc8b399..fb5e98e 100644
--- a/builds/cygwin/install.mk
+++ b/builds/cygwin/install.mk
@@ -19,7 +19,7 @@ install: $(PROJECT_LIBRARY)
                          $(includedir)/freetype2/freetype/config   \
                          $(includedir)/freetype2/freetype/internal \
                          $(includedir)/freetype2/freetype/cache    \
-			 $(bindir)
+                         $(bindir)
 	$(LIBTOOL) --mode=install $(INSTALL) $(PROJECT_LIBRARY) $(libdir)
 	-for P in $(PUBLIC_H) ; do                               \
           $(INSTALL_DATA) $$P $(includedir)/freetype2/freetype ; \
@@ -37,7 +37,7 @@ install: $(PROJECT_LIBRARY)
 
 
 uninstall:
-	-$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/lib$(PROJECT).$A
+	-$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/$(PROJECT_LIBRARY)
 	-$(DELETE) $(includedir)/freetype2/freetype/cache/*
 	-$(DELDIR) $(includedir)/freetype2/freetype/cache
 	-$(DELETE) $(includedir)/freetype2/freetype/config/*
@@ -52,12 +52,12 @@ uninstall:
 
 # Unix cleaning and distclean rules.
 #
-clean_project_unix:
+clean_project_cygwin:
 	-$(DELETE) $(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)
 	-$(DELETE) $(patsubst %.$O,%.$(SO),$(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)) \
                    $(CLEAN)
 
-distclean_project_unix: clean_project_unix
+distclean_project_cygwin: clean_project_cygwin
 	-$(DELETE) $(PROJECT_LIBRARY)
 	-$(DELETE) $(OBJ_DIR)/.libs/*
 	-$(DELDIR) $(OBJ_DIR)/.libs
diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
index 0b2f0bd..8575a07 100644
--- a/builds/unix/freetype-config.in
+++ b/builds/unix/freetype-config.in
@@ -6,7 +6,7 @@ exec_prefix_set=no
 
 usage()
 {
- cat <<EOF
+  cat <<EOF
 Usage: freetype-config [OPTIONS] [LIBRARIES]
 Options:
  [--prefix[=DIR]]
@@ -15,11 +15,11 @@ Options:
  [--libs]
  [--cflags]
 EOF
- exit $1
+  exit $1
 }
 
 if test $# -eq 0; then
- usage 1 1>&2
+  usage 1 1>&2
 fi
 
 
@@ -30,39 +30,40 @@ while test $# -gt 0; do
   esac
 
   case $1 in
-    --prefix=*)
-      prefix=$optarg
-      if test $exec_prefix_set = no ; then
-        exec_prefix=$optarg
-      fi
-      ;;
-    --prefix)
-      echo_prefix=yes
-      ;;
-    --exec-prefix=*)
-      exec_prefix=$optarg
-      exec_prefix_set=yes
-      ;;
-    --exec-prefix)
-      echo_exec_prefix=yes
-      ;;
-    --version)
-      echo @VERSION@
-      exit 0
-      ;;
-    --cflags)
-      echo_cflags=yes
-      ;;
-    --libs)
-      echo_libs=yes
-      ;;
-    *)
-      usage 1 1>&2
-      ;;
+  --prefix=*)
+    prefix=$optarg
+    ;;
+  --prefix)
+    echo_prefix=yes
+    ;;
+  --exec-prefix=*)
+    exec_prefix=$optarg
+    exec_prefix_set=yes
+    ;;
+  --exec-prefix)
+    echo_exec_prefix=yes
+    ;;
+  --version)
+    echo @VERSION@
+    exit 0
+    ;;
+  --cflags)
+    echo_cflags=yes
+    ;;
+  --libs)
+    echo_libs=yes
+    ;;
+  *)
+    usage 1 1>&2
+    ;;
   esac
   shift
 done
 
+if test "$exec_prefix_set" = "no"; then
+  exec_prefix=$prefix
+fi
+
 if test "$echo_prefix" = "yes"; then
  echo $prefix
 fi
@@ -78,4 +79,4 @@ if test "$echo_libs" = "yes"; then
  echo -L@libdir@ $libs
 fi
 
-
+# EOF
diff --git a/builds/unix/install.mk b/builds/unix/install.mk
index fc8b399..78b3dfc 100644
--- a/builds/unix/install.mk
+++ b/builds/unix/install.mk
@@ -19,7 +19,7 @@ install: $(PROJECT_LIBRARY)
                          $(includedir)/freetype2/freetype/config   \
                          $(includedir)/freetype2/freetype/internal \
                          $(includedir)/freetype2/freetype/cache    \
-			 $(bindir)
+                         $(bindir)
 	$(LIBTOOL) --mode=install $(INSTALL) $(PROJECT_LIBRARY) $(libdir)
 	-for P in $(PUBLIC_H) ; do                               \
           $(INSTALL_DATA) $$P $(includedir)/freetype2/freetype ; \
@@ -37,7 +37,7 @@ install: $(PROJECT_LIBRARY)
 
 
 uninstall:
-	-$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/lib$(PROJECT).$A
+	-$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/$(PROJECT_LIBRARY)
 	-$(DELETE) $(includedir)/freetype2/freetype/cache/*
 	-$(DELDIR) $(includedir)/freetype2/freetype/cache
 	-$(DELETE) $(includedir)/freetype2/freetype/config/*
diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in
index 18a0320..2498eb2 100644
--- a/builds/unix/unix-def.in
+++ b/builds/unix/unix-def.in
@@ -33,13 +33,13 @@ INSTALL       := @INSTALL@
 INSTALL_DATA  := @INSTALL_DATA@
 MKINSTALLDIRS := $(BUILD)/mkinstalldirs
 
-DISTCLEAN += $(BUILD)/config.cache     \
-             $(BUILD)/config.log       \
-             $(BUILD)/config.status    \
-             $(BUILD)/unix-def.mk      \
-             $(BUILD)/unix-cc.mk       \
-             $(BUILD)/ftconfig.h       \
-             $(BUILD)/freetype-config  \
+DISTCLEAN += $(BUILD)/config.cache    \
+             $(BUILD)/config.log      \
+             $(BUILD)/config.status   \
+             $(BUILD)/unix-def.mk     \
+             $(BUILD)/unix-cc.mk      \
+             $(BUILD)/ftconfig.h      \
+             $(BUILD)/freetype-config \
              $(LIBTOOL)
 
 
diff --git a/include/freetype/cache/ftcchunk.h b/include/freetype/cache/ftcchunk.h
index 0b256ff..4dfa03d 100644
--- a/include/freetype/cache/ftcchunk.h
+++ b/include/freetype/cache/ftcchunk.h
@@ -177,39 +177,32 @@
 
   /* chunk set objects */
 
-  FT_EXPORT( void )
-  FTC_ChunkNode_Destroy( FTC_ChunkNode    node );
+  FT_EXPORT( void )      FTC_ChunkNode_Destroy( FTC_ChunkNode    node );
 
 
-  FT_EXPORT( FT_Error )
-  FTC_ChunkSet_New( FTC_Chunk_Cache  cache,
-                    FT_Pointer       type,
-                    FTC_ChunkSet    *aset );
+  FT_EXPORT( FT_Error )  FTC_ChunkSet_New     ( FTC_Chunk_Cache  cache,
+                                                FT_Pointer       type,
+                                                FTC_ChunkSet    *aset );
 
 
-  FT_EXPORT( FT_Error )
-  FTC_ChunkSet_Lookup_Node( FTC_ChunkSet    cset,
-                            FT_UInt         glyph_index,
-                            FTC_ChunkNode*  anode,
-                            FT_UInt        *anindex );
+  FT_EXPORT( FT_Error )  FTC_ChunkSet_Lookup_Node(
+                           FTC_ChunkSet    cset,
+                           FT_UInt         glyph_index,
+                           FTC_ChunkNode*  anode,
+                           FT_UInt        *anindex );
 
 
   /* chunk cache objects */
 
-  FT_EXPORT( FT_Error )
-  FTC_Chunk_Cache_Init(  FTC_Chunk_Cache  cache );
+  FT_EXPORT( FT_Error )  FTC_Chunk_Cache_Init  ( FTC_Chunk_Cache  cache );
 
+  FT_EXPORT( void )      FTC_Chunk_Cache_Done  ( FTC_Chunk_Cache  cache );
 
-  FT_EXPORT( void )
-  FTC_Chunk_Cache_Done(  FTC_Chunk_Cache  cache );
-
-
-  FT_EXPORT( FT_Error )
-  FTC_Chunk_Cache_Lookup( FTC_Chunk_Cache  cache,
-                          FT_Pointer       type,
-                          FT_UInt          gindex,
-                          FTC_ChunkNode   *anode,
-                          FT_UInt         *aindex );
+  FT_EXPORT( FT_Error )  FTC_Chunk_Cache_Lookup( FTC_Chunk_Cache  cache,
+                                                 FT_Pointer       type,
+                                                 FT_UInt          gindex,
+                                                 FTC_ChunkNode   *anode,
+                                                 FT_UInt         *aindex );
 
 
 #ifdef __cplusplus
diff --git a/include/freetype/cache/ftcmanag.h b/include/freetype/cache/ftcmanag.h
index f509093..d43f505 100644
--- a/include/freetype/cache/ftcmanag.h
+++ b/include/freetype/cache/ftcmanag.h
@@ -143,7 +143,7 @@
   /*    will flush as many old cache nodes as possible (ignoring cache     */
   /*    nodes with a non-zero reference count).                            */
   /*                                                                       */
-  /* <Input>                                                               */
+  /* <InOut>                                                               */
   /*    manager :: A handle to the cache manager.                          */
   /*                                                                       */
   /* <Note>                                                                */
@@ -212,6 +212,9 @@
   /*                                                                       */
   /*    cache_data :: A generic pointer passed to the destructor.          */
   /*                                                                       */
+  /* <Return>                                                              */
+  /*    The size of a given cache node in bytes.                           */
+  /*                                                                       */
   typedef FT_ULong  (*FTC_CacheNode_SizeFunc)( FTC_CacheNode  node,
                                                FT_Pointer     cache_data );
 
@@ -254,7 +257,6 @@
   /*    the cache manager never allocates cache node directly; it          */
   /*    delegates this task to its cache objects.                          */
   /*                                                                       */
-  /*                                                                       */
   typedef struct  FTC_CacheNode_Class_
   {
     FTC_CacheNode_SizeFunc     size_node;
diff --git a/include/freetype/cache/ftlru.h b/include/freetype/cache/ftlru.h
index f7c572a..ed77fe2 100644
--- a/include/freetype/cache/ftlru.h
+++ b/include/freetype/cache/ftlru.h
@@ -79,12 +79,11 @@
   } FT_LruNodeRec, *FT_LruNode;
 
 
-
   /* forward declaration */
   typedef struct FT_LruRec_*  FT_Lru;
 
 
-  /* LRU clazz */
+  /* LRU class */
   typedef struct  FT_Lru_Class_
   {
     FT_UInt  lru_size;      /* object size in bytes */
diff --git a/src/cache/ftcchunk.c b/src/cache/ftcchunk.c
index adea14c..4689cfb 100644
--- a/src/cache/ftcchunk.c
+++ b/src/cache/ftcchunk.c
@@ -173,7 +173,7 @@
     FTC_ChunkNode*       bucket_limit = bucket + cset->num_chunks;
     FT_Memory            memory       = cache->root.memory;
 
-    FTC_ChunkSet_Class*  clazz = cset->clazz;
+    FTC_ChunkSet_Class*  clazz        = cset->clazz;
 
 
     /* for each bucket, free the list of glyph nodes */
@@ -183,7 +183,7 @@
       FT_ListNode    lrunode;
 
 
-      if (node)
+      if ( node )
       {
         lrunode = FTC_CHUNKNODE_TO_LRUNODE( node );
 
@@ -191,15 +191,15 @@
         manager->num_nodes--;
 
         FT_List_Remove( glyphs_lru, lrunode );
-   
+
         clazz->destroy_node( node );
 
         bucket[0] = 0;
       }
-   }
+    }
 
-   if ( clazz->done )
-     clazz->done( cset );
+    if ( clazz->done )
+      clazz->done( cset );
 
     FREE( cset->chunks );
     FREE( cset );
@@ -220,6 +220,7 @@
 
 
     *anode = 0;
+
     if ( glyph_index >= cset->element_max )
       error = FT_Err_Invalid_Argument;
     else
@@ -350,19 +351,19 @@
   /*************************************************************************/
 
 
-  FT_EXPORT_DEF( FT_Error )
-  FTC_Chunk_Cache_Init( FTC_Chunk_Cache  cache )
+  FT_EXPORT_DEF( FT_Error )  FTC_Chunk_Cache_Init( FTC_Chunk_Cache  cache )
   {
     FT_Memory  memory = cache->root.memory;
     FT_Error   error;
 
     FTC_Chunk_Cache_Class*  ccache_clazz;
 
+
     /* set up root node_class to be used by manager */
     cache->root.node_clazz =
       (FTC_CacheNode_Class*)&ftc_chunk_cache_node_class;
 
-    /* setup "compare" shortcut */
+    /* setup `compare' shortcut */
     ccache_clazz   = (FTC_Chunk_Cache_Class*)cache->root.clazz;
     cache->compare = ccache_clazz->cset_class->compare;
 
@@ -376,19 +377,18 @@
   }
 
 
-  FT_EXPORT_DEF( void )
-  FTC_Chunk_Cache_Done( FTC_Chunk_Cache  cache )
+  FT_EXPORT_DEF( void )  FTC_Chunk_Cache_Done( FTC_Chunk_Cache  cache )
   {
     /* discard glyph sets */
     FT_Lru_Done( cache->csets_lru );
   }
 
-  FT_EXPORT_DEF( FT_Error )
-  FTC_Chunk_Cache_Lookup( FTC_Chunk_Cache  cache,
-                          FT_Pointer       type,
-                          FT_UInt          gindex,
-                          FTC_ChunkNode   *anode,
-                          FT_UInt         *aindex )
+
+  FT_EXPORT_DEF( FT_Error )  FTC_Chunk_Cache_Lookup( FTC_Chunk_Cache  cache,
+                                                     FT_Pointer       type,
+                                                     FT_UInt          gindex,
+                                                     FTC_ChunkNode   *anode,
+                                                     FT_UInt         *aindex )
   {
     FT_Error       error;
     FTC_ChunkSet   cset;
@@ -436,4 +436,5 @@
     return error;
   }
 
+
 /* END */
diff --git a/src/cache/ftcglyph.c b/src/cache/ftcglyph.c
index 2a8b06b..a4b515b 100644
--- a/src/cache/ftcglyph.c
+++ b/src/cache/ftcglyph.c
@@ -377,19 +377,19 @@
   /*************************************************************************/
 
 
-  FT_EXPORT_DEF( FT_Error )
-  FTC_Glyph_Cache_Init( FTC_Glyph_Cache  cache )
+  FT_EXPORT_DEF( FT_Error )  FTC_Glyph_Cache_Init( FTC_Glyph_Cache  cache )
   {
     FT_Memory  memory = cache->root.memory;
     FT_Error   error;
 
     FTC_Glyph_Cache_Class*  gcache_clazz;
 
+
     /* set up root node_class to be used by manager */
     cache->root.node_clazz =
       (FTC_CacheNode_Class*)&ftc_glyph_cache_node_class;
 
-    /* setup the "compare" shortcut */
+    /* setup the `compare' shortcut */
     gcache_clazz   = (FTC_Glyph_Cache_Class*)cache->root.clazz;
     cache->compare = gcache_clazz->gset_class->compare;
 
@@ -410,32 +410,32 @@
   }
 
 
-  FT_EXPORT_DEF( void )
-  FTC_Glyph_Cache_Done( FTC_Glyph_Cache  cache )
+  FT_EXPORT_DEF( void )  FTC_Glyph_Cache_Done( FTC_Glyph_Cache  cache )
   {
     /* discard glyph sets */
     FT_Lru_Done( cache->gsets_lru );
   }
 
 
-  FT_EXPORT_DEF( FT_Error )
-  FTC_Glyph_Cache_Lookup( FTC_Glyph_Cache  cache,
-                          FT_Pointer       type,
-                          FT_UInt          gindex,
-                          FTC_GlyphNode   *anode )
+  FT_EXPORT_DEF( FT_Error )  FTC_Glyph_Cache_Lookup( FTC_Glyph_Cache  cache,
+                                                     FT_Pointer       type,
+                                                     FT_UInt          gindex,
+                                                     FTC_GlyphNode   *anode )
   {
     FT_Error       error;
     FTC_GlyphSet   gset;
     FTC_GlyphNode  node;
     FTC_Manager    manager;
 
+
     /* check for valid `desc' delayed to FT_Lru_Lookup() */
 
     if ( !cache || !anode )
       return FT_Err_Invalid_Argument;
 
-    *anode  = 0;
-    gset    = cache->last_gset;
+    *anode = 0;
+    gset   = cache->last_gset;
+
     if ( !gset || !cache->compare( gset, type ) )
     {
       error = FT_Lru_Lookup( cache->gsets_lru,
@@ -465,4 +465,5 @@
     return error;
   }
 
+
 /* END */
diff --git a/src/cache/ftcimage.c b/src/cache/ftcimage.c
index f6fa4bf..4f0e649 100644
--- a/src/cache/ftcimage.c
+++ b/src/cache/ftcimage.c
@@ -73,7 +73,7 @@
   FT_CALLBACK_DEF
   FT_Error  ftc_glyph_image_node_new( FTC_GlyphSet     gset,
                                       FT_UInt          glyph_index,
-                                      FTC_GlyphImage*  anode )
+                                      FTC_GlyphImage  *anode )
   {
     FT_Memory       memory   = gset->memory;
     FTC_ImageSet    imageset = (FTC_ImageSet)gset;
diff --git a/src/cache/ftcsbits.c b/src/cache/ftcsbits.c
index 209f3d3..ef83046 100644
--- a/src/cache/ftcsbits.c
+++ b/src/cache/ftcsbits.c
@@ -94,7 +94,7 @@
   FT_CALLBACK_DEF
   FT_Error  ftc_sbit_chunk_node_new( FTC_ChunkSet    cset,
                                      FT_UInt         index,
-                                     FTC_ChunkNode*  anode )
+                                     FTC_ChunkNode  *anode )
   {
     FT_Error       error;
     FT_Memory      memory  = cset->memory;
@@ -358,9 +358,9 @@
                                                  FTC_SBit_Cache  *acache )
   {
     return FTC_Manager_Register_Cache(
-              manager,
-              (FTC_Cache_Class*)&ftc_sbit_cache_class,
-              (FTC_Cache*)acache );
+             manager,
+             (FTC_Cache_Class*)&ftc_sbit_cache_class,
+             (FTC_Cache*)acache );
   }
 
 
@@ -373,14 +373,15 @@
     FTC_ChunkNode  node;
     FT_UInt        cindex;
 
+
     /* argument checks delayed to FTC_Chunk_Cache_Lookup */
-    if (!ansbit)
+    if ( !ansbit )
       return FT_Err_Invalid_Argument;
       
     *ansbit = 0;
     error   = FTC_Chunk_Cache_Lookup( &cache->root, desc, gindex,
                                       &node, &cindex );
-    if (!error)
+    if ( !error )
       *ansbit = (FTC_SBit)node->elements + cindex;
     
     return error;