Commit 4eadfe87 authored by Bruce Momjian's avatar Bruce Momjian

Make 0x007f -> (unsigned)0x7f to make pgindent happy.

parent 519cd36d
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.41 1999/05/25 18:20:28 vadim Exp $ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.42 1999/05/25 22:04:11 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -68,6 +68,7 @@ _bt_doinsert(Relation rel, BTItem btitem, bool index_is_unique, Relation heapRel ...@@ -68,6 +68,7 @@ _bt_doinsert(Relation rel, BTItem btitem, bool index_is_unique, Relation heapRel
LockBuffer(buf, BT_WRITE); LockBuffer(buf, BT_WRITE);
l1: l1:
/* /*
* If the page was split between the time that we surrendered our read * If the page was split between the time that we surrendered our read
* lock and acquired our write lock, then this page may no longer be * lock and acquired our write lock, then this page may no longer be
...@@ -155,7 +156,7 @@ l1: ...@@ -155,7 +156,7 @@ l1:
_bt_relbuf(rel, buf, BT_WRITE); _bt_relbuf(rel, buf, BT_WRITE);
XactLockTableWait(xwait); XactLockTableWait(xwait);
buf = _bt_getbuf(rel, blkno, BT_WRITE); buf = _bt_getbuf(rel, blkno, BT_WRITE);
goto l1; /* continue from the begin */ goto l1;/* continue from the begin */
} }
elog(ERROR, "Cannot insert a duplicate key into a unique index"); elog(ERROR, "Cannot insert a duplicate key into a unique index");
} }
...@@ -178,7 +179,7 @@ l1: ...@@ -178,7 +179,7 @@ l1:
nblkno = opaque->btpo_next; nblkno = opaque->btpo_next;
if (nbuf != InvalidBuffer) if (nbuf != InvalidBuffer)
_bt_relbuf(rel, nbuf, BT_READ); _bt_relbuf(rel, nbuf, BT_READ);
for (nbuf = InvalidBuffer; ; ) for (nbuf = InvalidBuffer;;)
{ {
nbuf = _bt_getbuf(rel, nblkno, BT_READ); nbuf = _bt_getbuf(rel, nblkno, BT_READ);
page = BufferGetPage(nbuf); page = BufferGetPage(nbuf);
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.22 1999/05/25 18:20:29 vadim Exp $ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.23 1999/05/25 22:04:12 momjian Exp $
* *
* NOTES * NOTES
* Postgres btree pages look like ordinary relation pages. The opaque * Postgres btree pages look like ordinary relation pages. The opaque
...@@ -315,9 +315,10 @@ _bt_getbuf(Relation rel, BlockNumber blkno, int access) ...@@ -315,9 +315,10 @@ _bt_getbuf(Relation rel, BlockNumber blkno, int access)
} }
else else
{ {
/* /*
* Extend bufmgr code is unclean and so we have to * Extend bufmgr code is unclean and so we have to use locking
* use locking here. * here.
*/ */
LockPage(rel, 0, ExclusiveLock); LockPage(rel, 0, ExclusiveLock);
buf = ReadBuffer(rel, blkno); buf = ReadBuffer(rel, blkno);
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.39 1999/05/25 18:20:29 vadim Exp $ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.40 1999/05/25 22:04:13 momjian Exp $
* *
* NOTES * NOTES
* This file contains only the public interface routines. * This file contains only the public interface routines.
...@@ -403,8 +403,8 @@ btgettuple(IndexScanDesc scan, ScanDirection dir) ...@@ -403,8 +403,8 @@ btgettuple(IndexScanDesc scan, ScanDirection dir)
res = _bt_first(scan, dir); res = _bt_first(scan, dir);
/* /*
* Save heap TID to use it in _bt_restscan. * Save heap TID to use it in _bt_restscan. Unlock buffer before
* Unlock buffer before leaving index ! * leaving index !
*/ */
if (res) if (res)
{ {
...@@ -628,6 +628,7 @@ _bt_restscan(IndexScanDesc scan) ...@@ -628,6 +628,7 @@ _bt_restscan(IndexScanDesc scan)
BlockNumber blkno; BlockNumber blkno;
LockBuffer(buf, BT_READ); LockBuffer(buf, BT_READ);
/* /*
* We use this as flag when first index tuple on page is deleted but * We use this as flag when first index tuple on page is deleted but
* we do not move left (this would slowdown vacuum) - so we set * we do not move left (this would slowdown vacuum) - so we set
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.22 1999/05/25 18:20:30 vadim Exp $ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.23 1999/05/25 22:04:14 momjian Exp $
* *
* *
* NOTES * NOTES
...@@ -133,9 +133,10 @@ _bt_scandel(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno) ...@@ -133,9 +133,10 @@ _bt_scandel(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno)
ItemPointerSetInvalid(&(so->curHeapIptr)); ItemPointerSetInvalid(&(so->curHeapIptr));
else else
{ {
/* /*
* We have to lock buffer before _bt_step * We have to lock buffer before _bt_step and unlock it after
* and unlock it after that. * that.
*/ */
LockBuffer(buf, BT_READ); LockBuffer(buf, BT_READ);
_bt_step(scan, &buf, BackwardScanDirection); _bt_step(scan, &buf, BackwardScanDirection);
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/predmig.c,v 1.2 1999/05/25 16:09:30 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/predmig.c,v 1.3 1999/05/25 22:04:22 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: analyze.c,v 1.108 1999/05/25 16:10:10 momjian Exp $ * $Id: analyze.c,v 1.109 1999/05/25 22:04:25 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.19 1999/05/25 16:11:00 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.20 1999/05/25 22:04:32 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -100,7 +100,7 @@ s_lock(volatile slock_t *lock, const char *file, const int line) ...@@ -100,7 +100,7 @@ s_lock(volatile slock_t *lock, const char *file, const int line)
#if defined(__m68k__) #if defined(__m68k__)
static void static void
tas_dummy() /* really means: extern int tas(slock_t tas_dummy() /* really means: extern int tas(slock_t
* **lock); */ * **lock); */
{ {
__asm__(" \n\ __asm__(" \n\
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: tgRecipe.h,v 1.9 1999/05/25 16:11:46 momjian Exp $ * $Id: tgRecipe.h,v 1.10 1999/05/25 22:04:36 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -36,6 +36,7 @@ typedef struct ...@@ -36,6 +36,7 @@ typedef struct
* *
* *
* *
*
* geo-decls.h */ * geo-decls.h */
#endif /* TIOGA_FRONTEND */ #endif /* TIOGA_FRONTEND */
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* *
* 1998 Jan Wieck * 1998 Jan Wieck
* *
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.14 1999/05/25 16:12:14 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.15 1999/05/25 22:04:40 momjian Exp $
* *
* ---------- * ----------
*/ */
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* out of it's tuple * out of it's tuple
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.15 1999/05/25 16:12:19 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.16 1999/05/25 22:04:41 momjian Exp $
* *
* This software is copyrighted by Jan Wieck - Hamburg. * This software is copyrighted by Jan Wieck - Hamburg.
* *
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* 1999/1/15 Tatsuo Ishii * 1999/1/15 Tatsuo Ishii
* *
* $Id: big5.c,v 1.2 1999/05/25 16:12:40 momjian Exp $ * $Id: big5.c,v 1.3 1999/05/25 22:04:45 momjian Exp $
*/ */
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
...@@ -218,7 +218,7 @@ static unsigned short BinarySearchRange ...@@ -218,7 +218,7 @@ static unsigned short BinarySearchRange
{ {
if (0 == array[mid].peer) if (0 == array[mid].peer)
return 0; return 0;
if (code >= 0xa140 U) if (code >= (unsigned)0xa140)
{ {
/* big5 to cns */ /* big5 to cns */
tmp = ((code & 0xff00) - (array[mid].code & 0xff00)) >> 8; tmp = ((code & 0xff00) - (array[mid].code & 0xff00)) >> 8;
...@@ -292,7 +292,7 @@ BIG5toCNS(unsigned short big5, unsigned char *lc) ...@@ -292,7 +292,7 @@ BIG5toCNS(unsigned short big5, unsigned char *lc)
unsigned short cns = 0; unsigned short cns = 0;
int i; int i;
if (big5 < 0xc940 U) if (big5 < (unsigned)0xc940)
{ {
/* level 1 */ /* level 1 */
...@@ -301,14 +301,14 @@ BIG5toCNS(unsigned short big5, unsigned char *lc) ...@@ -301,14 +301,14 @@ BIG5toCNS(unsigned short big5, unsigned char *lc)
if (b1c4[i][0] == big5) if (b1c4[i][0] == big5)
{ {
*lc = LC_CNS11643_4; *lc = LC_CNS11643_4;
return (b1c4[i][1] | 0x8080 U); return (b1c4[i][1] | (unsigned)0x8080);
} }
} }
if (0 < (cns = BinarySearchRange(big5Level1ToCnsPlane1, 23, big5))) if (0 < (cns = BinarySearchRange(big5Level1ToCnsPlane1, 23, big5)))
*lc = LC_CNS11643_1; *lc = LC_CNS11643_1;
} }
else if (big5 == 0xc94a U) else if (big5 == (unsigned)0xc94a)
{ {
/* level 2 */ /* level 2 */
*lc = LC_CNS11643_1; *lc = LC_CNS11643_1;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* conversion between client encoding and server internal encoding * conversion between client encoding and server internal encoding
* (currently mule internal code (mic) is used) * (currently mule internal code (mic) is used)
* Tatsuo Ishii * Tatsuo Ishii
* $Id: conv.c,v 1.8 1999/05/25 16:12:41 momjian Exp $ * $Id: conv.c,v 1.9 1999/05/25 22:04:47 momjian Exp $
*/ */
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
...@@ -384,7 +384,7 @@ big52mic(unsigned char *big5, unsigned char *p, int len) ...@@ -384,7 +384,7 @@ big52mic(unsigned char *big5, unsigned char *p, int len)
while (len > 0 && (c1 = *big5++)) while (len > 0 && (c1 = *big5++))
{ {
if (c1 <= 0x007f U) if (c1 <= (unsigned)0x7f)
{ /* ASCII */ { /* ASCII */
len--; len--;
*p++ = c1; *p++ = c1;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: nbtree.h,v 1.26 1999/05/25 18:31:28 vadim Exp $ * $Id: nbtree.h,v 1.27 1999/05/25 22:04:55 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
#include <storage/page.h> #include <storage/page.h>
#include <access/funcindex.h> #include <access/funcindex.h>
#include <access/itup.h> #include <access/itup.h>
#include <storage/bufmgr.h> /* don't remove, required by BT_READ/BT_WRITE */ #include <storage/bufmgr.h> /* don't remove, required by
* BT_READ/BT_WRITE */
#include <storage/itemptr.h> #include <storage/itemptr.h>
/* /*
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: strat.h,v 1.13 1999/05/25 16:13:35 momjian Exp $ * $Id: strat.h,v 1.14 1999/05/25 22:04:56 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -32,6 +32,7 @@ typedef struct StrategyTransformMapData ...@@ -32,6 +32,7 @@ typedef struct StrategyTransformMapData
* *
* *
* *
*
* STRUCTURE */ * STRUCTURE */
typedef StrategyTransformMapData *StrategyTransformMap; typedef StrategyTransformMapData *StrategyTransformMap;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment