Skip to content

Commit e8db9b2

Browse files
tglsfdctglsfdc
committed
elog mop-up.
1 parent aeea73d commit e8db9b2

File tree

18 files changed

+62
-63
lines changed

18 files changed

+62
-63
lines changed

‎contrib/btree_gist/btree_gist.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
#include "access/gist.h"
44
#include "access/itup.h"
55
#include "access/nbtree.h"
6-
7-
#include "utils/palloc.h"
86
#include "utils/geo_decls.h"
9-
#include "utils/elog.h"
107

118
typedef int (*CMPFUNC) (const void *a, const void *b);
129
typedef void (*BINARY_UNION) (Datum *, char *);

‎contrib/cube/cube.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
#include "access/gist.h"
1212
#include "access/rtree.h"
1313
#include "lib/stringinfo.h"
14-
#include "utils/elog.h"
15-
#include "utils/palloc.h"
1614
#include "utils/builtins.h"
1715

1816
#include "cubedata.h"

‎contrib/ltree/ltree.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
#define __LTREE_H__
33

44
#include "postgres.h"
5-
#include "utils/elog.h"
6-
#include "utils/palloc.h"
5+
76
#include "utils/builtins.h"
87

98
typedef struct

‎contrib/rtree_gist/rtree_gist.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/contrib/rtree_gist/Attic/rtree_gist.c,v 1.6 2002/09/04 20:31:08 momjian Exp $
10+
* $Header: /cvsroot/pgsql/contrib/rtree_gist/Attic/rtree_gist.c,v 1.7 2003/07/27 17:10:06 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -16,9 +16,7 @@
1616
#include "access/gist.h"
1717
#include "access/itup.h"
1818
#include "access/rtree.h"
19-
#include "utils/palloc.h"
2019
#include "utils/geo_decls.h"
21-
#include "utils/elog.h"
2220

2321
typedef Datum (*RDF) (PG_FUNCTION_ARGS);
2422
typedef Datum (*BINARY_UNION) (Datum, Datum, int *);

‎contrib/tsearch/rewrite.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
#include "access/gist.h"
1111
#include "access/itup.h"
1212
#include "access/rtree.h"
13-
#include "utils/elog.h"
14-
#include "utils/palloc.h"
1513
#include "utils/array.h"
1614
#include "utils/builtins.h"
1715
#include "storage/bufpage.h"
@@ -283,7 +281,7 @@ clean_fakeval(ITEM * ptr, int4 *len)
283281
resroot = clean_fakeval_intree(root, &result);
284282
if (result != V_UNKNOWN)
285283
{
286-
elog(NOTICE, "Query contains only stopword(s) or doesn't contain lexem(s), ignored");
284+
elog(NOTICE, "query contains only stopword(s) or doesn't contain lexeme(s), ignored");
287285
*len = 0;
288286
return NULL;
289287
}

‎contrib/tsearch/txtidx.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
#include "access/gist.h"
1111
#include "access/itup.h"
12-
#include "utils/elog.h"
13-
#include "utils/palloc.h"
1412
#include "utils/builtins.h"
1513
#include "storage/bufpage.h"
1614

‎contrib/tsearch2/ts_stat.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55

66
#include "access/gist.h"
77
#include "access/itup.h"
8-
#include "utils/elog.h"
9-
#include "utils/palloc.h"
108
#include "utils/builtins.h"
119
#include "storage/bufpage.h"
1210

‎contrib/tsearch2/tsvector.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
#include "access/gist.h"
1111
#include "access/itup.h"
12-
#include "utils/elog.h"
13-
#include "utils/palloc.h"
1412
#include "utils/builtins.h"
1513
#include "storage/bufpage.h"
1614

‎doc/src/sgml/xtypes.sgml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/xtypes.sgml,v 1.17 2003/04/10 01:22:45 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/xtypes.sgml,v 1.18 2003/07/27 17:10:06 tgl Exp $
33
-->
44

55
<sect1 id="xtypes">
@@ -70,14 +70,15 @@ typedef struct Complex {
7070
Complex *
7171
complex_in(char *str)
7272
{
73-
double x, y;
74-
Complex *result;
73+
double x,
74+
y;
75+
Complex *result;
7576

7677
if (sscanf(str, " ( %lf , %lf )", &amp;x, &amp;y) != 2)
77-
{
78-
elog(ERROR, "complex_in: error in parsing %s", str);
79-
return NULL;
80-
}
78+
ereport(ERROR,
79+
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
80+
errmsg("invalid input syntax for complex: \"%s\"", str)));
81+
8182
result = (Complex *) palloc(sizeof(Complex));
8283
result-&gt;x = x;
8384
result-&gt;y = y;

‎src/include/access/genam.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: genam.h,v 1.39 2003/02/24 00:57:17 tgl Exp $
10+
* $Id: genam.h,v 1.40 2003/07/27 17:10:06 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -45,7 +45,7 @@ typedef bool (*IndexBulkDeleteCallback) (ItemPointer itemptr, void *state);
4545
typedef struct IndexVacuumCleanupInfo
4646
{
4747
bool vacuum_full; /* VACUUM FULL (we have exclusive lock) */
48-
int message_level; /* elog level for progress messages */
48+
int message_level; /* ereport level for progress messages */
4949
} IndexVacuumCleanupInfo;
5050

5151
/* Struct for heap-or-index scans of system tables */

0 commit comments

Comments
 (0)