1212 *
1313 *
1414 * IDENTIFICATION
15- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/deadlock.c,v 1.16 2003/01/16 21:01:44 tgl Exp $
15+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/deadlock.c,v 1.17 2003/02/18 02:13:24 momjian Exp $
1616 *
1717 *Interface:
1818 *
@@ -425,7 +425,7 @@ FindLockCycleRecurse(PGPROC *checkProc,
425425{
426426PGPROC * proc ;
427427LOCK * lock ;
428- PROCLOCK * holder ;
428+ PROCLOCK * proclock ;
429429SHM_QUEUE * lockHolders ;
430430LOCKMETHODTABLE * lockMethodTable ;
431431PROC_QUEUE * waitQueue ;
@@ -484,19 +484,19 @@ FindLockCycleRecurse(PGPROC *checkProc,
484484 */
485485lockHolders = & (lock -> lockHolders );
486486
487- holder = (PROCLOCK * )SHMQueueNext (lockHolders ,lockHolders ,
487+ proclock = (PROCLOCK * )SHMQueueNext (lockHolders ,lockHolders ,
488488 offsetof(PROCLOCK ,lockLink ));
489489
490- while (holder )
490+ while (proclock )
491491{
492- proc = (PGPROC * )MAKE_PTR (holder -> tag .proc );
492+ proc = (PGPROC * )MAKE_PTR (proclock -> tag .proc );
493493
494494/* A proc never blocks itself */
495495if (proc != checkProc )
496496{
497497for (lm = 1 ;lm <=numLockModes ;lm ++ )
498498{
499- if (holder -> holding [lm ]> 0 &&
499+ if (proclock -> holding [lm ]> 0 &&
500500((1 <<lm )& conflictMask )!= 0 )
501501{
502502/* This proc hard-blocks checkProc */
@@ -512,13 +512,13 @@ FindLockCycleRecurse(PGPROC *checkProc,
512512
513513return true;
514514}
515- /* If no deadlock, we're done looking at thisholder */
515+ /* If no deadlock, we're done looking at thisproclock */
516516break ;
517517}
518518}
519519}
520520
521- holder = (PROCLOCK * )SHMQueueNext (lockHolders ,& holder -> lockLink ,
521+ proclock = (PROCLOCK * )SHMQueueNext (lockHolders ,& proclock -> lockLink ,
522522 offsetof(PROCLOCK ,lockLink ));
523523}
524524