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

Get rid of C++-style comments.

This commit is contained in:
Patrick Lam 2006-03-03 06:35:53 +00:00
parent 5b4a40a955
commit bb6b19938e
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-03-03 Patrick Lam <plam@mit.edu>
* src/fccache.c (FcCacheSkipToArch, FcDirCacheProduce):
* src/fcfreetype.c (GetScriptTags):
* src/fcfs.c (FcFontSetDistributeBytes):
* src/fcpat.c (FcValueListEntCreate, FcValueListNeededBytes):
Get rid of C++-style comments.
2006-03-03 Patrick Lam <plam@mit.edu> 2006-03-03 Patrick Lam <plam@mit.edu>
* debian/changelog * debian/changelog

4
src/fccache.c
View File

@ -634,7 +634,7 @@ FcCacheSkipToArch (int fd, const char * arch)
return -1; return -1;
bs = strtol(candidate_arch_machine_name_count, &candidate_arch, 16); bs = strtol(candidate_arch_machine_name_count, &candidate_arch, 16);
// count = 0 should probably be distinguished from the !bs condition /* count = 0 should probably be distinguished from the !bs condition */
if (!bs || bs < strlen (candidate_arch_machine_name_count)) if (!bs || bs < strlen (candidate_arch_machine_name_count))
return -1; return -1;
@ -1206,7 +1206,7 @@ FcDirCacheProduce (FcFontSet *set, FcCache *metadata)
current_dir_block = malloc (metadata->count); current_dir_block = malloc (metadata->count);
if (!current_dir_block) if (!current_dir_block)
goto bail; goto bail;
// shut up valgrind /* shut up valgrind */
memset (current_dir_block, 0, metadata->count); memset (current_dir_block, 0, metadata->count);
final_dir_block = FcFontSetDistributeBytes (metadata, current_dir_block); final_dir_block = FcFontSetDistributeBytes (metadata, current_dir_block);

2
src/fcfreetype.c
View File

@ -2815,7 +2815,7 @@ GetScriptTags(FT_Face face, FT_ULong tabletag, FT_ULong **stags, FT_UShort *scri
goto Fail; goto Fail;
} }
// sort the tag list before returning it /* sort the tag list before returning it */
qsort(*stags, *script_count, sizeof(FT_ULong), compareulong); qsort(*stags, *script_count, sizeof(FT_ULong), compareulong);
return TT_Err_Ok; return TT_Err_Ok;

8
src/fcfs.c
View File

@ -123,12 +123,12 @@ FcFontSetDistributeBytes (FcCache * metadata, void * block_ptr)
block_ptr = ALIGN (block_ptr, int); block_ptr = ALIGN (block_ptr, int);
fcfs_pat_count = (int *)block_ptr; fcfs_pat_count = (int *)block_ptr;
block_ptr = (int *)block_ptr + 1; block_ptr = (int *)block_ptr + 1;
// we don't consume any bytes for the fontset itself, /* we don't consume any bytes for the fontset itself, */
// since we don't allocate it statically. /* since we don't allocate it statically. */
block_ptr = FcPatternDistributeBytes (metadata, block_ptr); block_ptr = FcPatternDistributeBytes (metadata, block_ptr);
// for good measure, write out the object ids used for /* for good measure, write out the object ids used for */
// this bank to the file. /* this bank to the file. */
return FcObjectDistributeBytes (metadata, block_ptr); return FcObjectDistributeBytes (metadata, block_ptr);
} }

5
src/fcpat.c
View File

@ -393,7 +393,7 @@ FcValueListEntCreate (FcValueListPtr h)
size = sizeof (FcValueListAlign) + n * sizeof (FcValueList); size = sizeof (FcValueListAlign) + n * sizeof (FcValueList);
FcValueListFrozenCount[FcValueListPtrU(h)->value.type]++; FcValueListFrozenCount[FcValueListPtrU(h)->value.type]++;
FcValueListFrozenBytes[FcValueListPtrU(h)->value.type] += size; FcValueListFrozenBytes[FcValueListPtrU(h)->value.type] += size;
// this leaks for some reason /* this leaks for some reason */
ea = malloc (sizeof (FcValueListAlign)); ea = malloc (sizeof (FcValueListAlign));
if (!ea) if (!ea)
return 0; return 0;
@ -1694,7 +1694,8 @@ FcValueListNeededBytes (FcValueList *p)
vl; vl;
vl = FcValueListPtrU(vl->next)) vl = FcValueListPtrU(vl->next))
{ {
FcValue v = FcValueCanonicalize(&vl->value); // unserialize just in case /* unserialize just in case */
FcValue v = FcValueCanonicalize(&vl->value);
switch (v.type) switch (v.type)
{ {