Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitcfd6c89

Browse files
committed
Silence a rather odd compiler warning. In passing, make this file's
error messages look at least a little bit like the message styleguidelines say.
1 parenta190eb3 commitcfd6c89

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

‎contrib/pageinspect/btreefuncs.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ extern Datum bt_page_stats(PG_FUNCTION_ARGS);
5656
#defineIS_INDEX(r) ((r)->rd_rel->relkind == 'i')
5757
#defineIS_BTREE(r) ((r)->rd_rel->relam == BTREE_AM_OID)
5858

59-
#defineCHECK_PAGE_OFFSET_RANGE(page,offset) { \
60-
if ( !(FirstOffsetNumber<=(offset) && \
61-
(offset)<=PageGetMaxOffsetNumber(page)) ) \
62-
elog(ERROR, "Page offset number out of range."); }
59+
#defineCHECK_PAGE_OFFSET_RANGE(pg,offnum) { \
60+
if ( !(FirstOffsetNumber<=(offnum) && \
61+
(offnum)<=PageGetMaxOffsetNumber(pg)) ) \
62+
elog(ERROR, "page offset number out of range"); }
6363

6464
#defineCHECK_RELATION_BLOCK_RANGE(rel,blkno) { \
6565
if ( (blkno)<0 && RelationGetNumberOfBlocks((rel))<=(blkno) ) \
66-
elog(ERROR, "Block number out of range."); }
66+
elog(ERROR, "block number out of range"); }
6767

6868
/* ------------------------------------------------
6969
* structure for single btree page statistics
@@ -220,10 +220,10 @@ bt_page_stats(PG_FUNCTION_ARGS)
220220
buffer=ReadBuffer(rel,blkno);
221221

222222
if (!IS_INDEX(rel)|| !IS_BTREE(rel))
223-
elog(ERROR,"bt_page_stats() can be usedonlyon b-tree index.");
223+
elog(ERROR,"bt_page_stats() canonlybe used on b-tree index");
224224

225225
if (blkno==0)
226-
elog(ERROR,"Block 0 is a meta page.");
226+
elog(ERROR,"block 0 is a meta page");
227227

228228
{
229229
HeapTupletuple;
@@ -323,7 +323,7 @@ bt_page_items(PG_FUNCTION_ARGS)
323323
structuser_args*uargs=NULL;
324324

325325
if (blkno==0)
326-
elog(ERROR,"Block 0 is a meta page.");
326+
elog(ERROR,"block 0 is a meta page");
327327

328328
if (SRF_IS_FIRSTCALL())
329329
{
@@ -343,14 +343,14 @@ bt_page_items(PG_FUNCTION_ARGS)
343343
uargs->buffer=ReadBuffer(uargs->rel,blkno);
344344

345345
if (!IS_INDEX(uargs->rel)|| !IS_BTREE(uargs->rel))
346-
elog(ERROR,"bt_page_items() can be usedonlyon b-tree index.");
346+
elog(ERROR,"bt_page_items() canonlybe used on b-tree index");
347347

348348
uargs->page=BufferGetPage(uargs->buffer);
349349

350350
opaque= (BTPageOpaque)PageGetSpecialPointer(uargs->page);
351351

352352
if (P_ISDELETED(opaque))
353-
elog(NOTICE,"bt_page_items(): thispage is deleted.");
353+
elog(NOTICE,"page is deleted");
354354

355355
fctx->max_calls=PageGetMaxOffsetNumber(uargs->page);
356356
fctx->user_fctx=uargs;
@@ -368,7 +368,7 @@ bt_page_items(PG_FUNCTION_ARGS)
368368
id=PageGetItemId(uargs->page,uargs->offset);
369369

370370
if (!ItemIdIsValid(id))
371-
elog(ERROR,"Invalid ItemId.");
371+
elog(ERROR,"invalid ItemId");
372372

373373
itup= (IndexTuple)PageGetItem(uargs->page,id);
374374

@@ -453,7 +453,7 @@ bt_metap(PG_FUNCTION_ARGS)
453453
rel=relation_openrv(relrv,AccessShareLock);
454454

455455
if (!IS_INDEX(rel)|| !IS_BTREE(rel))
456-
elog(ERROR,"bt_metap() can be usedonlyon b-tree index.");
456+
elog(ERROR,"bt_metap() canonlybe used on b-tree index");
457457

458458
buffer=ReadBuffer(rel,0);
459459

‎contrib/pgstattuple/pgstatindex.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ extern Datum pg_relpages(PG_FUNCTION_ARGS);
4747
#defineIS_INDEX(r) ((r)->rd_rel->relkind == 'i')
4848
#defineIS_BTREE(r) ((r)->rd_rel->relam == BTREE_AM_OID)
4949

50-
#defineCHECK_PAGE_OFFSET_RANGE(page,offset) { \
51-
if ( !(FirstOffsetNumber<=(offset) && \
52-
(offset)<=PageGetMaxOffsetNumber(page)) ) \
53-
elog(ERROR, "Page offset number out of range."); }
50+
#defineCHECK_PAGE_OFFSET_RANGE(pg,offnum) { \
51+
if ( !(FirstOffsetNumber<=(offnum) && \
52+
(offnum)<=PageGetMaxOffsetNumber(pg)) ) \
53+
elog(ERROR, "page offset number out of range"); }
5454

5555
#defineCHECK_RELATION_BLOCK_RANGE(rel,blkno) { \
5656
if ( (blkno)<0 && RelationGetNumberOfBlocks((rel))<=(blkno) ) \
57-
elog(ERROR, "Block number out of range."); }
57+
elog(ERROR, "block number out of range"); }
5858

5959
/* ------------------------------------------------
6060
* A structure for a whole btree index statistics
@@ -100,7 +100,7 @@ pgstatindex(PG_FUNCTION_ARGS)
100100
rel=relation_openrv(relrv,AccessShareLock);
101101

102102
if (!IS_INDEX(rel)|| !IS_BTREE(rel))
103-
elog(ERROR,"pgstatindex() can be usedonlyon b-tree index.");
103+
elog(ERROR,"pgstatindex() canonlybe used on b-tree index");
104104

105105
/*-------------------
106106
* Read a metapage

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp