Update copyright for 2014

[postgresql] / src / backend / utils / error / assert.c

diff --git a/src/backend/utils/error/assert.c b/src/backend/utils/error/assert.c
index 92bb3bc6b0b99ef4d88b2c09030e6ac2c84be330..07f51b3fd8572a69d9de2e5f8011dd0c5cb222c3 100644 (file)
--- a/src/backend/utils/error/assert.c
+++ b/src/backend/utils/error/assert.c
@@ -3,12 +3,12 @@
  * assert.c
  *       Assert code.
  *
- * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/utils/error/assert.c,v 1.36 2009/01/01 17:23:51 momjian Exp $
+ *       src/backend/utils/error/assert.c
  *
  * NOTE
  *       This should eventually work with elog()
@@ -21,11 +21,8 @@
 
 /*
  * ExceptionalCondition - Handles the failure of an Assert()
- *
- * Note: this can't actually return, but we declare it as returning int
- * because the TrapMacro() macro might get wonky otherwise.
  */
-int
+void
 ExceptionalCondition(const char *conditionName,
                                         const char *errorType,
                                         const char *fileName,
@@ -55,6 +52,4 @@ ExceptionalCondition(const char *conditionName,
 #endif
 
        abort();
-
-       return 0;
 }