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

Comparing src/common/instance.c (file contents):
Revision 2.12 by greg, Tue Mar 22 03:56:17 2016 UTC vs.
Revision 2.13 by greg, Tue Nov 5 00:03:10 2024 UTC

# Line 22 | Line 22 | static SCENE  *slist = NULL;           /* list of loaded octree
22  
23  
24   SCENE *
25 < getscene(sname, flags)                  /* get new octree reference */
26 < char  *sname;
27 < int  flags;
25 > getscene(                               /* get new octree reference */
26 >        char  *sname,
27 >        int  flags
28 > )
29   {
30          char  *pathname;
31 <        register SCENE  *sc;
31 >        SCENE  *sc;
32  
33          flags &= ~IO_ILLEGAL;           /* not allowed */
34          for (sc = slist; sc != NULL; sc = sc->next)
# Line 66 | Line 67 | int  flags;
67  
68  
69   INSTANCE *
70 < getinstance(o, flags)                   /* get instance structure */
71 < register OBJREC  *o;
72 < int  flags;
70 > getinstance(                            /* get instance structure */
71 >        OBJREC  *o,
72 >        int  flags
73 > )
74   {
75 <        register INSTANCE  *ins;
75 >        INSTANCE  *ins;
76  
77          flags &= ~IO_ILLEGAL;           /* not allowed */
78          if ((ins = (INSTANCE *)o->os) == NULL) {
# Line 88 | Line 90 | int  flags;
90                  ins->obj = NULL;
91                  o->os = (char *)ins;
92          }
93 <        if (ins->obj == NULL)
93 >        if (ins->obj == NULL) {
94                  ins->obj = getscene(o->oargs.sarg[0], flags);
95 <        else if ((flags &= ~ins->obj->ldflags)) {
95 >        } else if ((flags &= ~ins->obj->ldflags)) {
96                  if (flags & IO_SCENE)
97                          ins->obj->firstobj = nobjects;
98                  if (flags)
# Line 105 | Line 107 | int  flags;
107  
108  
109   void
110 < freescene(sc)           /* release a scene reference */
111 < SCENE *sc;
110 > freescene(              /* release a scene reference */
111 >        SCENE *sc
112 > )
113   {
114          SCENE  shead;
115 <        register SCENE  *scp;
115 >        SCENE  *scp;
116  
117          if (sc == NULL)
118                  return;
119          if (sc->nref <= 0)
120                  error(CONSISTENCY, "unreferenced scene in freescene");
121 <        sc->nref--;
119 <        if (sc->nref)                   /* still in use? */
121 >        if (--sc->nref)                 /* still in use? */
122                  return;
123          shead.next = slist;             /* else remove from our list */
124          for (scp = &shead; scp->next != NULL; scp = scp->next)
# Line 131 | Line 133 | SCENE *sc;
133          freestr(sc->name);              /* free memory */
134          octfree(sc->scube.cutree);
135          freeobjects(sc->firstobj, sc->nobjs);
136 <        free((void *)sc);
136 >        free(sc);
137   }
138  
139  
140   void
141 < freeinstance(o)         /* free memory associated with instance */
142 < OBJREC  *o;
141 > freeinstance(           /* free memory associated with instance */
142 >        OBJREC  *o
143 > )
144   {
145          if (o->os == NULL)
146                  return;
147          freescene((*(INSTANCE *)o->os).obj);
148 <        free((void *)o->os);
148 >        free(o->os);
149          o->os = NULL;
150   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines