ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/error.c

Comparing ray/src/common/error.c (file contents):
Revision 2.3 by gregl, Wed May 28 17:23:31 1997 UTC vs.
Revision 2.6 by greg, Sat Feb 22 02:07:22 2003 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1991 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char       RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		*  error.c - standard error reporting function
6	+	*
7	+	*  External symbols declared in standard.h
8		*/
9
10	+	/* ====================================================================
11	+	* The Radiance Software License, Version 1.0
12	+	*
13	+	* Copyright (c) 1990 - 2002 The Regents of the University of California,
14	+	* through Lawrence Berkeley National Laboratory.   All rights reserved.
15	+	*
16	+	* Redistribution and use in source and binary forms, with or without
17	+	* modification, are permitted provided that the following conditions
18	+	* are met:
19	+	*
20	+	* 1. Redistributions of source code must retain the above copyright
21	+	*         notice, this list of conditions and the following disclaimer.
22	+	*
23	+	* 2. Redistributions in binary form must reproduce the above copyright
24	+	*       notice, this list of conditions and the following disclaimer in
25	+	*       the documentation and/or other materials provided with the
26	+	*       distribution.
27	+	*
28	+	* 3. The end-user documentation included with the redistribution,
29	+	*           if any, must include the following acknowledgment:
30	+	*             "This product includes Radiance software
31	+	*                 (http://radsite.lbl.gov/)
32	+	*                 developed by the Lawrence Berkeley National Laboratory
33	+	*               (http://www.lbl.gov/)."
34	+	*       Alternately, this acknowledgment may appear in the software itself,
35	+	*       if and wherever such third-party acknowledgments normally appear.
36	+	*
37	+	* 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
38	+	*       and "The Regents of the University of California" must
39	+	*       not be used to endorse or promote products derived from this
40	+	*       software without prior written permission. For written
41	+	*       permission, please contact [email protected].
42	+	*
43	+	* 5. Products derived from this software may not be called "Radiance",
44	+	*       nor may "Radiance" appear in their name, without prior written
45	+	*       permission of Lawrence Berkeley National Laboratory.
46	+	*
47	+	* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
48	+	* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49	+	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
50	+	* DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
51	+	* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52	+	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53	+	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
54	+	* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
55	+	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56	+	* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57	+	* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58	+	* SUCH DAMAGE.
59	+	* ====================================================================
60	+	*
61	+	* This software consists of voluntary contributions made by many
62	+	* individuals on behalf of Lawrence Berkeley National Laboratory.   For more
63	+	* information on Lawrence Berkeley National Laboratory, please see
64	+	* <http://www.lbl.gov/>.
65	+	*/
66	+
67		#include  "standard.h"
68
69	<	#ifndef linux
70	<	extern char  *sys_errlist[];    /* system error list */
71	<	extern int  sys_nerr;           /* number of system errors */
16	<	#endif
69	>	extern char     *strerror();
70	>	/* global list of error actions */
71	>	struct erract   erract[NERRS] = ERRACT_INIT;
72
73		char  errmsg[512];              /* global error message buffer */
74
75
76	+	void
77		error(etype, emsg)              /* report error, quit if necessary */
78		int  etype;
79		char  *emsg;
80		{
81	<	switch (etype) {
82	<	case WARNING:
83	<	wputs("warning - ");
28	<	wputs(emsg);
29	<	wputs("\n");
81	>	register struct erract  *ep;
82	>
83	>	if (etype < 0 | etype >= NERRS)
84		return;
85	<	case COMMAND:
86	<	cputs(emsg);
87	<	cputs("\n");
88	<	return;
89	<	case USER:
90	<	eputs("fatal - ");
91	<	eputs(emsg);
38	<	eputs("\n");
39	<	quit(1);
40	<	case INTERNAL:
41	<	eputs("internal - ");
42	<	eputs(emsg);
43	<	eputs("\n");
44	<	quit(1);
45	<	case SYSTEM:
46	<	eputs("system - ");
47	<	eputs(emsg);
48	<	if (errno > 0) {
49	<	eputs(": ");
50	<	if (errno <= sys_nerr)
51	<	eputs(sys_errlist[errno]);
52	<	else
53	<	eputs("Unknown error");
85	>	ep = erract + etype;
86	>	if (ep->pf != NULL) {
87	>	if (ep->pre[0]) (*ep->pf)(ep->pre);
88	>	if (emsg != NULL && emsg[0]) (*ep->pf)(emsg);
89	>	if (etype == SYSTEM && errno > 0) {
90	>	(*ep->pf)(": ");
91	>	(*ep->pf)(strerror(errno));
92		}
93	<	eputs("\n");
56	<	quit(2);
57	<	case CONSISTENCY:
58	<	eputs("consistency - ");
59	<	eputs(emsg);
60	<	eputs("\n");
61	<	abort();
93	>	(*ep->pf)("\n");
94		}
95	+	if (!ep->ec)            /* non-fatal */
96	+	return;
97	+	if (ep->ec < 0)         /* dump core */
98	+	abort();
99	+	quit(ep->ec);           /* quit calls exit after cleanup */
100		}

Diff Legend

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