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

Comparing ray/src/common/readfargs.c (file contents):
Revision 2.7 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.11 by greg, Thu Jun 12 22:12:20 2014 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   * Allocate, read and free object arguments
6   */
7  
8 < /* ====================================================================
9 < * The Radiance Software License, Version 1.0
10 < *
11 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 < *
14 < * Redistribution and use in source and binary forms, with or without
15 < * modification, are permitted provided that the following conditions
16 < * are met:
17 < *
18 < * 1. Redistributions of source code must retain the above copyright
19 < *         notice, this list of conditions and the following disclaimer.
20 < *
21 < * 2. Redistributions in binary form must reproduce the above copyright
22 < *       notice, this list of conditions and the following disclaimer in
23 < *       the documentation and/or other materials provided with the
24 < *       distribution.
25 < *
26 < * 3. The end-user documentation included with the redistribution,
27 < *           if any, must include the following acknowledgment:
28 < *             "This product includes Radiance software
29 < *                 (http://radsite.lbl.gov/)
30 < *                 developed by the Lawrence Berkeley National Laboratory
31 < *               (http://www.lbl.gov/)."
32 < *       Alternately, this acknowledgment may appear in the software itself,
33 < *       if and wherever such third-party acknowledgments normally appear.
34 < *
35 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 < *       and "The Regents of the University of California" must
37 < *       not be used to endorse or promote products derived from this
38 < *       software without prior written permission. For written
39 < *       permission, please contact [email protected].
40 < *
41 < * 5. Products derived from this software may not be called "Radiance",
42 < *       nor may "Radiance" appear in their name, without prior written
43 < *       permission of Lawrence Berkeley National Laboratory.
44 < *
45 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 < * SUCH DAMAGE.
57 < * ====================================================================
58 < *
59 < * This software consists of voluntary contributions made by many
60 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 < * information on Lawrence Berkeley National Laboratory, please see
62 < * <http://www.lbl.gov/>.
63 < */
8 > #include "copyright.h"
9  
10   #include "standard.h"
11  
# Line 69 | Line 14 | static const char      RCSid[] = "$Id$";
14  
15  
16   int
17 < readfargs(fa, fp)               /* read function arguments from stream */
18 < register FUNARGS  *fa;
19 < FILE  *fp;
17 > readfargs(                      /* read function arguments from stream */
18 >        FUNARGS  *fa,
19 >        FILE  *fp
20 > )
21   {
22   #define getstr(s)       (fgetword(s,sizeof(s),fp)!=NULL)
23   #define getint(s)       (getstr(s) && isint(s))
24   #define getflt(s)       (getstr(s) && isflt(s))
25          char  sbuf[MAXSTR];
26 <        register int  n, i;
26 >        int  n, i;
27  
28          if (!getint(sbuf) || (n = atoi(sbuf)) < 0)
29                  return(0);
30 <        if (fa->nsargs = n) {
30 >        if ( (fa->nsargs = n) ) {
31                  fa->sarg = (char **)malloc(n*sizeof(char *));
32                  if (fa->sarg == NULL)
33                          return(-1);
# Line 112 | Line 58 | FILE  *fp;
58   #endif
59          if (!getint(sbuf) || (n = atoi(sbuf)) < 0)
60                  return(0);
61 <        if (fa->nfargs = n) {
62 <                fa->farg = (FLOAT *)malloc(n*sizeof(FLOAT));
61 >        if ( (fa->nfargs = n) ) {
62 >                fa->farg = (RREAL *)malloc(n*sizeof(RREAL));
63                  if (fa->farg == NULL)
64                          return(-1);
65                  for (i = 0; i < n; i++) {
# Line 131 | Line 77 | FILE  *fp;
77  
78  
79   void
80 < freefargs(fa)                   /* free object arguments */
81 < register FUNARGS  *fa;
80 > freefargs(                              /* free object arguments */
81 >        FUNARGS  *fa
82 > )
83   {
84 <        register int  i;
84 >        int  i;
85  
86          if (fa->nsargs) {
87                  for (i = 0; i < fa->nsargs; i++)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines