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

Comparing ray/src/hd/rhinfo.c (file contents):
Revision 3.7 by greg, Fri Jun 20 00:25:49 2003 UTC vs.
Revision 3.11 by greg, Thu Sep 9 01:06:19 2004 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   * Get general information on holodeck file
6   */
7  
8 + #include <stdio.h>
9 +
10 + #include "platform.h"
11 + #include "resolu.h"
12   #include "holo.h"
13  
14   #ifndef NHBINS
# Line 15 | Line 19 | char   *progname;              /* global argv[0] */
19  
20   long    beamtot, samptot;       /* total beams and samples */
21  
22 + static void gethdinfo(char      *fname, FILE    *fout);
23 + static void psectstats(HOLO     *hp, FILE       *fp);
24  
19 – main(argc, argv)
20 – int     argc;
21 – char    *argv[];
22 – {
23 –        int     sect;
25  
26 + int
27 + main(
28 +        int     argc,
29 +        char    *argv[]
30 + )
31 + {
32          progname = argv[0];
33          if (argc != 2)
34                  goto userr;
# Line 33 | Line 40 | userr:
40   }
41  
42  
43 < gethdinfo(fname, fout)          /* get information on holodeck */
44 < char    *fname;
45 < FILE    *fout;
43 > static void
44 > gethdinfo(              /* get information on holodeck */
45 >        char    *fname,
46 >        FILE    *fout
47 > )
48   {
49          FILE    *fp;
50          HOLO    *hdsect;
# Line 56 | Line 65 | FILE   *fout;
65          nextloc = ftell(fp);                    /* get stdio position */
66          fclose(fp);                             /* done with stdio */
67          for (n = 0; nextloc > 0L; n++) {        /* get the section(s) */
68 <                lseek(fd, (off_t)nextloc, 0);
68 >                lseek(fd, (off_t)nextloc, SEEK_SET);
69                  read(fd, (char *)&nextloc, sizeof(nextloc));
70                  fprintf(fout, "Section %d:\n", n);
71                  hdsect = hdinit(fd, NULL);      /* load section directory */
# Line 68 | Line 77 | FILE   *fout;
77                          samptot, beamtot, (double)samptot/beamtot);
78          fprintf(fout, "%.1f Mbyte file, %.1f%% fragmentation\n",
79                          nextloc/(1024.*1024.),
80 <                        100.*(nextloc-hdfiluse(fd,1))/nextloc);
80 >                        100.*(nextloc-hdfiluse(fd))/nextloc);
81                                                  /* don't bother with cleanup */
82   #if 0
83          hddone(NULL);                           /* free sections */
# Line 77 | Line 86 | FILE   *fout;
86   }
87  
88  
89 < psectstats(hp, fp)              /* print statistical information for section */
90 < register HOLO   *hp;
91 < FILE    *fp;
89 > static void
90 > psectstats(             /* print statistical information for section */
91 >        register HOLO   *hp,
92 >        FILE    *fp
93 > )
94   {
95          int     scount[NHBINS];
96          int     minsamp = 10000, maxsamp = 0;

Diff Legend

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