Changeset 2928 for trunk/gsdl/src/mgpp/lib/huffman.cpp

Timestamp:

2002-01-30T15:40:53+13:00 (22 years ago)

Author:

jrm21

Message:

replaced bzero and bcopy with memset and memcpy in the src, even though it was
already done in the headers, just to make the code a bit clearer.

File:

• trunk/gsdl/src/mgpp/lib/huffman.cpp (modified) (6 diffs)

trunk/gsdl/src/mgpp/lib/huffman.cpp

@@ -52 +52 @@
       *mem += num * sizeof (char);
     }
-  bcopy ((void *) freqs, (void *) &heap[num], num * sizeof (*heap));
-  bzero ((char *) heap, num * sizeof (*heap));
+  memcpy (&heap[num], freqs, num * sizeof (*heap));
+  memset (heap, '\0', num * sizeof (*heap));
 
   /* Initialise the pointers to the leaves */
@@ -147 +147 @@
 
   /* zero the lencount's array */
-  bzero ((char *) hd->lencount, sizeof (hd->lencount));
+  memset (hd->lencount, '\0', sizeof (hd->lencount));
   hd->maxcodelen = 0;
   hd->mincodelen = 100;
@@ -203 +203 @@
   if (mem)
     *mem += data->num_codes * sizeof (*codes);
-  bcopy ((void *) data->min_code, (void *) mc, sizeof (mc));
+  memcpy (mc, data->min_code, sizeof (mc));
   for (i = 0; i < data->num_codes; i++)
     if (data->clens[i])
@@ -230 +230 @@
     }
 
-  bzero ((char *) values, (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *));
+  memset (values, '\0', (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *));
 
   if (mem)
@@ -343 +343 @@
       int i;  /* [RPAP - Jan 97: Endian Ordering] */
 
-      bzero ((char *) (hd->lencount), sizeof (hd->lencount));
+      memset (hd->lencount, '\0', sizeof (hd->lencount));
       if (fread (hd->lencount + hd->mincodelen, sizeof (*hd->lencount),
           hd->maxcodelen - hd->mincodelen + 1, f) !=
@@ -356 +356 @@
     (*disk) += sizeof (*hd->lencount) * (hd->maxcodelen - hd->mincodelen + 1);
 
-      bzero ((char *) (hd->min_code), sizeof (hd->min_code));
+      memset (hd->min_code, '\0', sizeof (hd->min_code));
 
       if (fread (hd->min_code, sizeof (*hd->min_code), hd->maxcodelen + 1, f) !=