[BACK]Return to error.h CVS log [TXT][DIR] Up to [local] / src / usr.bin / make

Diff for /src/usr.bin/make/error.h between version 1.5 and 1.6

version 1.5, 2001/05/03 13:41:05 version 1.6, 2001/05/23 12:34:42
Line 1 
Line 1 
 /* $OpenPackages$ */  #ifndef ERROR_H
 /* $OpenBSD$ */  #define ERROR_H
   /*      $OpenPackages$ */
   /*      $OpenBSD$ */
   
 /*-  /*
  * Copyright (c) 1988, 1989, 1990, 1993   * Copyright (c) 2001 Marc Espie.
  *      The Regents of the University of California.  All rights reserved.  
  * Copyright (c) 1989 by Berkeley Softworks  
  * All rights reserved.  
  *   *
  * This code is derived from software contributed to Berkeley by  
  * Adam de Boor.  
  *  
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions   * modification, are permitted provided that the following conditions
  * are met:   * are met:
Line 18 
Line 14 
  * 2. Redistributions in binary form must reproduce the above copyright   * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the   *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.   *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software  
  *    must display the following acknowledgement:  
  *      This product includes software developed by the University of  
  *      California, Berkeley and its contributors.  
  * 4. Neither the name of the University nor the names of its contributors  
  *    may be used to endorse or promote products derived from this software  
  *    without specific prior written permission.  
  *   *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND   * THIS SOFTWARE IS PROVIDED BY THE OPENBSD PROJECT AND CONTRIBUTORS
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE   * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE   * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE   * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OPENBSD
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL   * PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT   * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY   * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF   * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * SUCH DAMAGE.   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    */
   /*      Error                   Print a tagged error message. The global
    *                              MAKE variable must have been defined. This
    *                              takes a format string and two optional
    *                              arguments for it.
  *   *
  *      from: @(#)nonints.h     8.3 (Berkeley) 3/19/94   *      Fatal                   Print an error message and exit. Also takes
    *                              a format string and two arguments.
    *
    *      Punt                    Aborts all jobs and exits with a message. Also
    *                              takes a format string and two arguments.
    *
    *      Finish                  Finish things up by printing the number of
    *                              errors which occured, as passed to it, and
    *                              exiting.
  */   */
 #ifndef ERROR_H  extern void Error(char *, ...);
 #define ERROR_H  extern void Fatal(char *, ...);
 extern void *emalloc(size_t);  extern void Punt(char *, ...);
 extern char *estrdup(const char *);  extern void DieHorribly(void);
 extern void *erealloc(void *, size_t);  extern void Finish(int);
 extern void *ecalloc(size_t, size_t);  
 extern int eunlink(const char *);  
 extern void esetenv(const char *, const char *);  
   
 /* efree(x) works when x==NULL. STDC behavior, may need some different  /*
  * definition for cross-builds on deficient systems */   * Error levels for parsing. PARSE_FATAL means the process cannot continue
 #define efree   free   * once the makefile has been parsed. PARSE_WARNING means it can. Passed
    * as the first argument to Parse_Error.
 extern void *hash_alloc(size_t, void *);   */
 extern void hash_free(void *, size_t, void *);  #define PARSE_WARNING   2
 extern void *element_alloc(size_t, void *);  #define PARSE_FATAL     1
   extern void Parse_Error(int, const char *, ...);
 #endif  /* ERROR_H */  extern int fatal_errors;
   #endif

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6