Rename Lockm to Locks.

bmomjian · bmomjian · commit 8fa93b016a8d · 1998-06-26T19:57:50.000Z
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.12 1998/06/25 14:24:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.13 1998/06/26 19:57:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -92,8 +92,8 @@ CreateSharedMemoryAndSemaphores(IPCKey key)
 	 * ----------------
 	 */
 	InitLocks();
-	InitMultiLevelLockm();
-	if (InitMultiLevelLockm() == INVALID_TABLEID)
+	InitMultiLevelLocks();
+	if (InitMultiLevelLocks() == INVALID_TABLEID)
 		elog(FATAL, "Couldn't create the lock table");
 
 	/* ----------------
@@ -146,7 +146,7 @@ AttachSharedMemoryAndSemaphores(IPCKey key)
 	 * ----------------
 	 */
 	InitLocks();
-	if (InitMultiLevelLockm() == INVALID_TABLEID)
+	if (InitMultiLevelLocks() == INVALID_TABLEID)
 		elog(FATAL, "Couldn't attach to the lock table");
 
 	AttachSharedInvalidationState(key);
diff --git a/src/backend/storage/lmgr/multi.c b/src/backend/storage/lmgr/multi.c
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.15 1998/06/26 01:58:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.16 1998/06/26 19:57:49 momjian Exp $
  *
  * NOTES:
  *	 (1) The lock.c module assumes that the caller here is doing
@@ -85,7 +85,7 @@ LockTableId ShortTermTableId = (LockTableId) NULL;
  * Create the lock table described by MultiConflicts and Multiprio.
  */
 LockTableId
-InitMultiLevelLockm()
+InitMultiLevelLocks()
 {
 	int			tableId;
 
@@ -99,13 +99,13 @@ InitMultiLevelLockm()
 	tableId = LockTableInit("LockTable", MultiConflicts, MultiPrios, 5);
 	MultiTableId = tableId;
 	if (!(MultiTableId))
-		elog(ERROR, "InitMultiLockm: couldnt initialize lock table");
+		elog(ERROR, "InitMultiLocks: couldnt initialize lock table");
 	/* -----------------------
 	 * No short term lock table for now.  -Jeff 15 July 1991
 	 *
 	 * ShortTermTableId = LockTableRename(tableId);
 	 * if (! (ShortTermTableId)) {
-	 *	 elog(ERROR,"InitMultiLockm: couldnt rename lock table");
+	 *	 elog(ERROR,"InitMultiLocks: couldnt rename lock table");
 	 * }
 	 * -----------------------
 	 */
diff --git a/src/include/storage/multilev.h b/src/include/storage/multilev.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: multilev.h,v 1.7 1998/02/26 04:43:30 momjian Exp $
+ * $Id: multilev.h,v 1.8 1998/06/26 19:57:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -49,7 +49,7 @@ extern LockTableId ShortTermTableId;
 /*
  * function prototypes
  */
-extern LockTableId InitMultiLevelLockm(void);
+extern LockTableId InitMultiLevelLocks(void);
 extern bool MultiLockReln(LockInfo linfo, LOCKT lockt);
 extern bool MultiLockTuple(LockInfo linfo, ItemPointer tidPtr, LOCKT lockt);
 extern bool MultiLockPage(LockInfo linfo, ItemPointer tidPtr, LOCKT lockt);

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`* Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $Id: multilev.h,v 1.7 1998/02/26 04:43:30 momjian Exp $`
	`10`	`+ * $Id: multilev.h,v 1.8 1998/06/26 19:57:50 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -49,7 +49,7 @@ extern LockTableId ShortTermTableId;`
`49`	`49`	`/*`
`50`	`50`	`* function prototypes`
`51`	`51`	`*/`
`52`		`-extern LockTableId InitMultiLevelLockm(void);`
	`52`	`+extern LockTableId InitMultiLevelLocks(void);`
`53`	`53`	`extern bool MultiLockReln(LockInfo linfo, LOCKT lockt);`
`54`	`54`	`extern bool MultiLockTuple(LockInfo linfo, ItemPointer tidPtr, LOCKT lockt);`
`55`	`55`	`extern bool MultiLockPage(LockInfo linfo, ItemPointer tidPtr, LOCKT lockt);`