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

Commit0b874f0

Browse files
committed
Clean up compile errors and warnings, cf Billy Allie's
complaints (and some of my own).
1 parentb5b5852 commit0b874f0

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

‎src/backend/commands/vacuum.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.97 1999/03/28 20:32:01 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.98 1999/04/02 04:51:04 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -66,7 +66,6 @@ static Portal vc_portal;
6666
staticintMESSAGE_LEVEL;/* message level */
6767

6868
staticTransactionIdXmaxRecent;
69-
externvoidGetXmaxRecent(TransactionId*xid);
7069

7170
#defineswapLong(a,b){long tmp; tmp=a; a=b; b=tmp;}
7271
#defineswapInt(a,b){int tmp; tmp=a; a=b; b=tmp;}
@@ -2421,16 +2420,16 @@ vc_find_eq(void *bot, int nelem, int size, void *elm,
24212420
}
24222421
if (last_move== true)
24232422
{
2424-
res=compar(elm,bot+last*size);
2423+
res=compar(elm,(void*)((char*)bot+last*size));
24252424
if (res>0)
24262425
returnNULL;
24272426
if (res==0)
2428-
returnbot+last*size;
2427+
return(void*)((char*)bot+last*size);
24292428
last_move= false;
24302429
}
2431-
res=compar(elm,bot+celm*size);
2430+
res=compar(elm,(void*)((char*)bot+celm*size));
24322431
if (res==0)
2433-
returnbot+celm*size;
2432+
return(void*)((char*)bot+celm*size);
24342433
if (res<0)
24352434
{
24362435
if (celm==0)
@@ -2445,7 +2444,7 @@ vc_find_eq(void *bot, int nelem, int size, void *elm,
24452444
returnNULL;
24462445

24472446
last=last-celm-1;
2448-
bot=bot+ (celm+1)*size;
2447+
bot=(void*)((char*)bot+ (celm+1)*size);
24492448
celm= (last+1) /2;
24502449
first_move= true;
24512450
}

‎src/backend/storage/ipc/shmem.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.38 1999/03/28 20:32:22 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.39 1999/04/02 04:51:03 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -737,5 +737,4 @@ GetXmaxRecent(TransactionId *XmaxRecent)
737737

738738
SpinRelease(ShmemIndexLock);
739739
elog(ERROR,"GetXmaxRecent: ShmemIndex corrupted");
740-
returnNULL;
741740
}

‎src/include/storage/shmem.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: shmem.h,v 1.15 1999/02/13 23:22:10 momjian Exp $
9+
* $Id: shmem.h,v 1.16 1999/04/02 04:51:05 tgl Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -71,6 +71,7 @@ extern SHMEM_OFFSET ShmemPIDDestroy(int pid);
7171
externlong*ShmemInitStruct(char*name,unsigned longsize,
7272
bool*foundPtr);
7373
externboolTransactionIdIsInProgress(TransactionIdxid);
74+
externvoidGetXmaxRecent(TransactionId*XmaxRecent);
7475

7576

7677
typedefintTableID;

0 commit comments

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