ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/hd/rholo3.c
(Generate patch)

Comparing ray/src/hd/rholo3.c (file contents):
Revision 3.37 by greg, Fri Jun 20 00:25:49 2003 UTC vs.
Revision 3.38 by schorsch, Mon Jun 30 14:59:12 2003 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   * Routines for tracking beam compuatations
6   */
7  
8 + #include <string.h>
9 +
10   #include "rholo.h"
11   #include "view.h"
12  
# Line 92 | Line 94 | register HDBEAMI       *hb;
94                  CHECK(p==NULL, SYSTEM, "out of memory in dispbeam");
95          }
96                                          /* assign packet fields */
97 <        bcopy((void *)hdbray(b), (void *)packra(p), b->nrm*sizeof(RAYVAL));
97 >        memcpy((void *)packra(p), (void *)hdbray(b), b->nrm*sizeof(RAYVAL));
98          p->nr = p->nc = b->nrm;
99          for (p->hd = 0; hdlist[p->hd] != hb->h; p->hd++)
100                  if (hdlist[p->hd] == NULL)
# Line 166 | Line 168 | int    nents;
168                  complist = (PACKHEAD *)malloc(nents*sizeof(PACKHEAD));
169                  if (complist == NULL)
170                          goto memerr;
171 <                bcopy((void *)clist, (void *)complist, nents*sizeof(PACKHEAD));
171 >                memcpy((void *)complist, (void *)clist, nents*sizeof(PACKHEAD));
172                  break;
173          case BS_ADD:                    /* add to computation set */
174          case BS_MAX:                    /* maximum of quantities */
# Line 391 | Line 393 | sortcomplist()                 /* fix our list order */
393          else if (listpos) {     /* else sort and merge sublist */
394                  list2 = (PACKHEAD *)malloc(listpos*sizeof(PACKHEAD));
395                  CHECK(list2==NULL, SYSTEM, "out of memory in sortcomplist");
396 <                bcopy((void *)complist,(void *)list2,listpos*sizeof(PACKHEAD));
396 >                memcpy((void *)list2,(void *)complist,listpos*sizeof(PACKHEAD));
397                  qsort((void *)list2, listpos, sizeof(PACKHEAD), beamcmp);
398                  mergeclists(complist, list2, listpos,
399                                  complist+listpos, complen-listpos);

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)