#include "access/gist.h"
#include "access/itup.h"
#include "access/nbtree.h"
-
-#include "utils/palloc.h"
#include "utils/geo_decls.h"
-#include "utils/elog.h"
typedef int (*CMPFUNC) (const void *a, const void *b);
typedef void (*BINARY_UNION) (Datum *, char *);
#include "access/gist.h"
#include "access/rtree.h"
#include "lib/stringinfo.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
#include "utils/builtins.h"
#include "cubedata.h"
#define __LTREE_H__
#include "postgres.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
+
#include "utils/builtins.h"
typedef struct
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/contrib/rtree_gist/Attic/rtree_gist.c,v 1.6 2002/09/04 20:31:08 momjian Exp $
+ * $Header: /cvsroot/pgsql/contrib/rtree_gist/Attic/rtree_gist.c,v 1.7 2003/07/27 17:10:06 tgl Exp $
*
*-------------------------------------------------------------------------
*/
#include "access/gist.h"
#include "access/itup.h"
#include "access/rtree.h"
-#include "utils/palloc.h"
#include "utils/geo_decls.h"
-#include "utils/elog.h"
typedef Datum (*RDF) (PG_FUNCTION_ARGS);
typedef Datum (*BINARY_UNION) (Datum, Datum, int *);
#include "access/gist.h"
#include "access/itup.h"
#include "access/rtree.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "storage/bufpage.h"
resroot = clean_fakeval_intree(root, &result);
if (result != V_UNKNOWN)
{
- elog(NOTICE, "Query contains only stopword(s) or doesn't contain lexem(s), ignored");
+ elog(NOTICE, "query contains only stopword(s) or doesn't contain lexeme(s), ignored");
*len = 0;
return NULL;
}
#include "access/gist.h"
#include "access/itup.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
#include "utils/builtins.h"
#include "storage/bufpage.h"
#include "access/gist.h"
#include "access/itup.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
#include "utils/builtins.h"
#include "storage/bufpage.h"
#include "access/gist.h"
#include "access/itup.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
#include "utils/builtins.h"
#include "storage/bufpage.h"
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/xtypes.sgml,v 1.17 2003/04/10 01:22:45 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/xtypes.sgml,v 1.18 2003/07/27 17:10:06 tgl Exp $
-->
<sect1 id="xtypes">
Complex *
complex_in(char *str)
{
- double x, y;
- Complex *result;
+ double x,
+ y;
+ Complex *result;
if (sscanf(str, " ( %lf , %lf )", &x, &y) != 2)
- {
- elog(ERROR, "complex_in: error in parsing %s", str);
- return NULL;
- }
+ ereport(ERROR,
+ (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+ errmsg("invalid input syntax for complex: \"%s\"", str)));
+
result = (Complex *) palloc(sizeof(Complex));
result->x = x;
result->y = y;
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: genam.h,v 1.39 2003/02/24 00:57:17 tgl Exp $
+ * $Id: genam.h,v 1.40 2003/07/27 17:10:06 tgl Exp $
*
*-------------------------------------------------------------------------
*/
typedef struct IndexVacuumCleanupInfo
{
bool vacuum_full; /* VACUUM FULL (we have exclusive lock) */
- int message_level; /* elog level for progress messages */
+ int message_level; /* ereport level for progress messages */
} IndexVacuumCleanupInfo;
/* Struct for heap-or-index scans of system tables */
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: tupmacs.h,v 1.22 2002/08/24 15:00:46 tgl Exp $
+ * $Id: tupmacs.h,v 1.23 2003/07/27 17:10:07 tgl Exp $
*
*-------------------------------------------------------------------------
*/
*(Datum *) (T) = (newdatum); \
break; \
default: \
- elog(ERROR, "store_att_byval: unsupported byval length %d", \
+ elog(ERROR, "unsupported byval length: %d", \
(int) (attlen)); \
break; \
} \
*(int32 *) (T) = DatumGetInt32(newdatum); \
break; \
default: \
- elog(ERROR, "store_att_byval: unsupported byval length %d", \
+ elog(ERROR, "unsupported byval length: %d", \
(int) (attlen)); \
break; \
} \
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: pqcomm.h,v 1.90 2003/07/23 23:30:41 tgl Exp $
+ * $Id: pqcomm.h,v 1.91 2003/07/27 17:10:07 tgl Exp $
*
*-------------------------------------------------------------------------
*/
/* workaround for clashing defines of "ERROR" */
#ifdef ELOG_H
#undef ERROR
-#define ERROR (-1)
+#define ERROR PGERROR
#endif
#else /* not WIN32 */
#include <sys/socket.h>
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: miscadmin.h,v 1.126 2003/07/17 00:55:37 tgl Exp $
+ * $Id: miscadmin.h,v 1.127 2003/07/27 17:10:07 tgl Exp $
*
* NOTES
* some of the information in this file should be moved to
*
* A related, but conceptually distinct, mechanism is the "critical section"
* mechanism. A critical section not only holds off cancel/die interrupts,
- * but causes any elog(ERROR) or elog(FATAL) to become elog(PANIC) --- that is,
- * a system-wide reset is forced. Needless to say, only really *critical*
- * code should be marked as a critical section! Currently, this mechanism
- * is only used for XLOG-related code.
+ * but causes any ereport(ERROR) or ereport(FATAL) to become ereport(PANIC)
+ * --- that is, a system-wide reset is forced. Needless to say, only really
+ * *critical* code should be marked as a critical section! Currently, this
+ * mechanism is only used for XLOG-related code.
*
*****************************************************************************/
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: buf_internals.h,v 1.59 2002/09/04 20:31:45 momjian Exp $
+ * $Id: buf_internals.h,v 1.60 2003/07/27 17:10:07 tgl Exp $
*
*-------------------------------------------------------------------------
*/
* Each backend has its own BufferLocks[] array holding flag bits
* showing what locks it has set on each buffer.
*
- * We have to free these locks in elog(ERROR)...
+ * We have to free these locks during ereport(ERROR)...
*/
#define BL_IO_IN_PROGRESS (1 << 0) /* unimplemented */
#define BL_PIN_COUNT_LOCK (1 << 1)
* procedural language
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_handler.c,v 1.14 2003/07/25 23:37:29 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_handler.c,v 1.15 2003/07/27 17:10:07 tgl Exp $
*
* This software is copyrighted by Jan Wieck - Hamburg.
*
* Connect to SPI manager
*/
if (SPI_connect() != SPI_OK_CONNECT)
- elog(ERROR, "could not connect to SPI manager");
+ elog(ERROR, "SPI_connect failed");
/* Find or compile the function */
func = plpgsql_compile(fcinfo);
* Disconnect from SPI manager
*/
if (SPI_finish() != SPI_OK_FINISH)
- elog(ERROR, "SPI_finish() failed");
+ elog(ERROR, "SPI_finish failed");
return retval;
}
#undef mkdir /* no reason to use that macro because we ignore the 2nd arg */
-#include "dirent.h"
+#include <dirent.h>
int
if (mkdir(todir) != 0)
{
- elog(ERROR, "could not make directory '%s'",todir);
+ ereport(ERROR,
+ (errcode_for_file_access(),
+ errmsg("could not create directory \"%s\": %m", todir)));
return 1;
}
xldir = opendir(fromdir);
if (xldir == NULL)
{
- closedir(xldir);
- elog(ERROR, "could not open directory '%s'",fromdir);
+ ereport(ERROR,
+ (errcode_for_file_access(),
+ errmsg("could not open directory \"%s\": %m", fromdir)));
return 1;
}
snprintf(tofl, MAXPGPATH, "%s/%s", todir, xlde->d_name);
if (CopyFile(fromfl,tofl,TRUE) < 0)
{
+ int save_errno = errno;
+
closedir(xldir);
- elog(ERROR,"could not create file %s\n",todir);
+ errno = save_errno;
+ ereport(ERROR,
+ (errcode_for_file_access(),
+ errmsg("could not copy file \"%s\": %m", fromfl)));
return 1;
}
}
/*
* These are replacement versions of unlink and rename that work on
* Win32 (NT, Win2k, XP). replace() doesn't work on Win95/98/Me.
- *
*/
#ifndef TEST_VERSION
#undef rename
#undef unlink
-int pgrename(const char *from, const char *to)
+int
+pgrename(const char *from, const char *to)
{
int loops = 0;
Sleep(100); /* ms */
if (loops == 10)
#ifndef FRONTEND
- elog(LOG, "Unable to rename %s to %s, continuing to try", from, to);
+ elog(LOG, "could not rename \"%s\" to \"%s\", continuing to try",
+ from, to);
#else
- fprintf(stderr, "Unable to rename %s to %s, continuing to try\n", from, to);
+ fprintf(stderr, "could not rename \"%s\" to \"%s\", continuing to try\n",
+ from, to);
#endif
loops++;
}
if (loops > 10)
#ifndef FRONTEND
- elog(LOG, "Completed rename of %s to %s", from, to);
+ elog(LOG, "completed rename of \"%s\" to \"%s\"", from, to);
#else
- fprintf(stderr, "Completed rename of %s to %s\n", from, to);
+ fprintf(stderr, "completed rename of \"%s\" to \"%s\"\n", from, to);
#endif
return 0;
}
-int pgunlink(const char *path)
+int
+pgunlink(const char *path)
{
int loops = 0;
Sleep(100); /* ms */
if (loops == 10)
#ifndef FRONTEND
- elog(LOG, "Unable to unlink %s, continuing to try", path);
+ elog(LOG, "could not unlink \"%s\", continuing to try",
+ path);
#else
- fprintf(stderr, "Unable to unlink %s, continuing to try\n", path);
+ fprintf(stderr, "could not unlink \"%s\", continuing to try\n",
+ path);
#endif
loops++;
}
if (loops > 10)
#ifndef FRONTEND
- elog(LOG, "Completed unlink of %s", path);
+ elog(LOG, "completed unlink of \"%s\"", path);
#else
- fprintf(stderr, "Completed unlink of %s\n", path);
+ fprintf(stderr, "completed unlink of \"%s\"\n", path);
#endif
return 0;
}
return 0;
}
+
#endif
Complex *result;
if (sscanf(str, " ( %lf , %lf )", &x, &y) != 2)
- {
- elog(ERROR, "complex_in: error in parsing \"%s\"", str);
- return NULL;
- }
+ ereport(ERROR,
+ (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+ errmsg("invalid input syntax for complex: \"%s\"", str)));
+
result = (Complex *) palloc(sizeof(Complex));
result->x = x;
result->y = y;
projects / postgresql / commitdiff