Get rid of C++-style comments.

diff --git a/ChangeLog b/ChangeLog
index fe80506dcd353adc5e999a4b905604c53bec38a5..6640b2089e934e13a09c8d7b64e7ce7b3201d4fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
        * debian/changelog
 

diff --git a/src/fccache.c b/src/fccache.c
index eda5de0e2b2520acf274ec17bdf8bc3249e82c1d..2a2ac8a4c43dc62a2120406ea615b1e8488133fd 100644 (file)
--- 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 5a5ab6d291fb93ac18204f75c0cd1bf00df4ac81..8e98b645ad4df7ba447b479dbfa54d64e4aa0995 100644 (file)
--- 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;

diff --git a/src/fcfs.c b/src/fcfs.c
index cbb5dc7f0d3985fb9485114963690283eae879f6..bb7ff39a354a3cbb28c86b6d93db105cdb6dd268 100644 (file)
--- a/src/fcfs.c
+++ b/src/fcfs.c
@@ -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 f9822e013bf11fc85d698876b48ef9cf250f77a3..2fc77bc3bb04526b0d46f0292b4070fe37bb1887 100644 (file)
--- 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)
        {