diff options
| author | Patrick Lam <plam@MIT.EDU> | 2006-03-03 06:35:53 +0000 |
|---|---|---|
| committer | Patrick Lam <plam@MIT.EDU> | 2006-03-03 06:35:53 +0000 |
| commit | bb6b19938e2c9d115abd4f36439c365b63713bb1 (patch) | |
| tree | 9aaf735c779cc8383fa8f2363454e7ea84eb9872 | |
| parent | 5b4a40a955c9607e80a8da5a42a0da5923e3c509 (diff) | |
Get rid of C++-style comments.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/fccache.c | 4 | ||||
| -rw-r--r-- | src/fcfreetype.c | 2 | ||||
| -rw-r--r-- | src/fcfs.c | 8 | ||||
| -rw-r--r-- | src/fcpat.c | 5 |
5 files changed, 18 insertions, 9 deletions
@@ -1,4 +1,12 @@ 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> * debian/changelog Enable creation of 2.3.94 Debian packages. diff --git a/src/fccache.c b/src/fccache.c index eda5de0..2a2ac8a 100644 --- a/src/fccache.c +++ b/src/fccache.c @@ -634,7 +634,7 @@ FcCacheSkipToArch (int fd, const char * arch) return -1; 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)) return -1; @@ -1206,7 +1206,7 @@ FcDirCacheProduce (FcFontSet *set, FcCache *metadata) current_dir_block = malloc (metadata->count); if (!current_dir_block) goto bail; - // shut up valgrind + /* shut up valgrind */ memset (current_dir_block, 0, metadata->count); final_dir_block = FcFontSetDistributeBytes (metadata, current_dir_block); diff --git a/src/fcfreetype.c b/src/fcfreetype.c index 5a5ab6d..8e98b64 100644 --- a/src/fcfreetype.c +++ b/src/fcfreetype.c @@ -2815,7 +2815,7 @@ GetScriptTags(FT_Face face, FT_ULong tabletag, FT_ULong **stags, FT_UShort *scri goto Fail; } - // sort the tag list before returning it + /* sort the tag list before returning it */ qsort(*stags, *script_count, sizeof(FT_ULong), compareulong); return TT_Err_Ok; @@ -123,12 +123,12 @@ FcFontSetDistributeBytes (FcCache * metadata, void * block_ptr) block_ptr = ALIGN (block_ptr, int); fcfs_pat_count = (int *)block_ptr; block_ptr = (int *)block_ptr + 1; - // we don't consume any bytes for the fontset itself, - // since we don't allocate it statically. + /* we don't consume any bytes for the fontset itself, */ + /* since we don't allocate it statically. */ block_ptr = FcPatternDistributeBytes (metadata, block_ptr); - // for good measure, write out the object ids used for - // this bank to the file. + /* for good measure, write out the object ids used for */ + /* this bank to the file. */ return FcObjectDistributeBytes (metadata, block_ptr); } diff --git a/src/fcpat.c b/src/fcpat.c index f9822e0..2fc77bc 100644 --- a/src/fcpat.c +++ b/src/fcpat.c @@ -393,7 +393,7 @@ FcValueListEntCreate (FcValueListPtr h) size = sizeof (FcValueListAlign) + n * sizeof (FcValueList); FcValueListFrozenCount[FcValueListPtrU(h)->value.type]++; FcValueListFrozenBytes[FcValueListPtrU(h)->value.type] += size; - // this leaks for some reason + /* this leaks for some reason */ ea = malloc (sizeof (FcValueListAlign)); if (!ea) return 0; @@ -1694,7 +1694,8 @@ FcValueListNeededBytes (FcValueList *p) vl; 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) { |