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

Comparing ray/src/common/modobject.c (file contents):
Revision 2.8 by greg, Tue Feb 25 02:47:21 2003 UTC vs.
Revision 2.11 by greg, Tue Sep 30 00:13:58 2003 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static const char       RCSid[] = "$Id$";
2 > static const char RCSid[] = "$Id$";
3   #endif
4   /*
5   *  Routines for tracking object modifiers
# Line 21 | Line 21 | static struct ohtab {
21          OBJECT  *htab;                  /* table, if allocated */
22   }  modtab = {100, NULL}, objtab = {1000, NULL}; /* modifiers and objects */
23  
24 < static int  otndx();
24 > static int  otndx(char *, struct ohtab *);
25  
26  
27 < int
27 > OBJECT
28   objndx(op)                      /* get object number from pointer */
29   register OBJREC  *op;
30   {
# Line 39 | Line 39 | register OBJREC  *op;
39   }
40  
41  
42 < int
42 > OBJECT
43   lastmod(obj, mname)             /* find modifier definition before obj */
44   OBJECT  obj;
45   char  *mname;
# Line 59 | Line 59 | char  *mname;
59   }
60  
61  
62 < int
62 > OBJECT
63   modifier(mname)                 /* get a modifier number from its name */
64   char  *mname;
65   {
# Line 71 | Line 71 | char  *mname;
71  
72  
73   #ifdef  GETOBJ
74 < int
74 > OBJECT
75   object(oname)                   /* get an object number from its name */
76   char  *oname;
77   {
# Line 158 | Line 158 | register struct ohtab  *tab;
158          hval = shash(name);
159   tryagain:
160          for (i = 0; i < tab->hsiz; i++) {
161 <                ndx = (hval + i*i) % tab->hsiz;
161 >                ndx = (hval + (unsigned long)i*i) % tab->hsiz;
162                  if (tab->htab[ndx] == OVOID ||
163                                  !strcmp(objptr(tab->htab[ndx])->oname, name))
164                          return(ndx);

Diff Legend

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