bpo-41299: Mark private thread_nt.h functions as static (GH-28553)

vstinner · web-flow · commit 6bc89116cb12 · 2021-09-25T01:14:09.000+02:00
Mark the following thread_nt.h functions as static:

* AllocNonRecursiveMutex()
* FreeNonRecursiveMutex()
* EnterNonRecursiveMutex()
* LeaveNonRecursiveMutex()
diff --git a/Python/thread_nt.h b/Python/thread_nt.h
@@ -32,8 +32,8 @@ typedef struct _NRMUTEX
 } NRMUTEX;
 typedef NRMUTEX *PNRMUTEX;
 
-PNRMUTEX
-AllocNonRecursiveMutex()
+static PNRMUTEX
+AllocNonRecursiveMutex(void)
 {
     PNRMUTEX m = (PNRMUTEX)PyMem_RawMalloc(sizeof(NRMUTEX));
     if (!m)
@@ -51,7 +51,7 @@ AllocNonRecursiveMutex()
     return NULL;
 }
 
-VOID
+static VOID
 FreeNonRecursiveMutex(PNRMUTEX mutex)
 {
     if (mutex) {
@@ -61,7 +61,7 @@ FreeNonRecursiveMutex(PNRMUTEX mutex)
     }
 }
 
-DWORD
+static DWORD
 EnterNonRecursiveMutex(PNRMUTEX mutex, DWORD milliseconds)
 {
     DWORD result = WAIT_OBJECT_0;
@@ -101,7 +101,7 @@ EnterNonRecursiveMutex(PNRMUTEX mutex, DWORD milliseconds)
     return result;
 }
 
-BOOL
+static BOOL
 LeaveNonRecursiveMutex(PNRMUTEX mutex)
 {
     BOOL result;
@@ -119,26 +119,26 @@ LeaveNonRecursiveMutex(PNRMUTEX mutex)
 /* NR-locks based on a kernel mutex */
 #define PNRMUTEX HANDLE
 
-PNRMUTEX
-AllocNonRecursiveMutex()
+static PNRMUTEX
+AllocNonRecursiveMutex(void)
 {
     return CreateSemaphore(NULL, 1, 1, NULL);
 }
 
-VOID
+static VOID
 FreeNonRecursiveMutex(PNRMUTEX mutex)
 {
     /* No in-use check */
     CloseHandle(mutex);
 }
 
-DWORD
+static DWORD
 EnterNonRecursiveMutex(PNRMUTEX mutex, DWORD milliseconds)
 {
     return WaitForSingleObjectEx(mutex, milliseconds, FALSE);
 }
 
-BOOL
+static BOOL
 LeaveNonRecursiveMutex(PNRMUTEX mutex)
 {
     return ReleaseSemaphore(mutex, 1, NULL);

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ typedef struct _NRMUTEX`
`32`	`32`	`} NRMUTEX;`
`33`	`33`	`typedef NRMUTEX *PNRMUTEX;`
`34`	`34`
`35`		`-PNRMUTEX`
`36`		`-AllocNonRecursiveMutex()`
	`35`	`+static PNRMUTEX`
	`36`	`+AllocNonRecursiveMutex(void)`
`37`	`37`	`{`
`38`	`38`	`PNRMUTEX m = (PNRMUTEX)PyMem_RawMalloc(sizeof(NRMUTEX));`
`39`	`39`	`if (!m)`
`@@ -51,7 +51,7 @@ AllocNonRecursiveMutex()`
`51`	`51`	`return NULL;`
`52`	`52`	`}`
`53`	`53`
`54`		`-VOID`
	`54`	`+static VOID`
`55`	`55`	`FreeNonRecursiveMutex(PNRMUTEX mutex)`
`56`	`56`	`{`
`57`	`57`	`if (mutex) {`
`@@ -61,7 +61,7 @@ FreeNonRecursiveMutex(PNRMUTEX mutex)`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`		`-DWORD`
	`64`	`+static DWORD`
`65`	`65`	`EnterNonRecursiveMutex(PNRMUTEX mutex, DWORD milliseconds)`
`66`	`66`	`{`
`67`	`67`	`DWORD result = WAIT_OBJECT_0;`
`@@ -101,7 +101,7 @@ EnterNonRecursiveMutex(PNRMUTEX mutex, DWORD milliseconds)`
`101`	`101`	`return result;`
`102`	`102`	`}`
`103`	`103`
`104`		`-BOOL`
	`104`	`+static BOOL`
`105`	`105`	`LeaveNonRecursiveMutex(PNRMUTEX mutex)`
`106`	`106`	`{`
`107`	`107`	`BOOL result;`
`@@ -119,26 +119,26 @@ LeaveNonRecursiveMutex(PNRMUTEX mutex)`
`119`	`119`	`/* NR-locks based on a kernel mutex */`
`120`	`120`	`#define PNRMUTEX HANDLE`
`121`	`121`
`122`		`-PNRMUTEX`
`123`		`-AllocNonRecursiveMutex()`
	`122`	`+static PNRMUTEX`
	`123`	`+AllocNonRecursiveMutex(void)`
`124`	`124`	`{`
`125`	`125`	`return CreateSemaphore(NULL, 1, 1, NULL);`
`126`	`126`	`}`
`127`	`127`
`128`		`-VOID`
	`128`	`+static VOID`
`129`	`129`	`FreeNonRecursiveMutex(PNRMUTEX mutex)`
`130`	`130`	`{`
`131`	`131`	`/* No in-use check */`
`132`	`132`	`CloseHandle(mutex);`
`133`	`133`	`}`
`134`	`134`
`135`		`-DWORD`
	`135`	`+static DWORD`
`136`	`136`	`EnterNonRecursiveMutex(PNRMUTEX mutex, DWORD milliseconds)`
`137`	`137`	`{`
`138`	`138`	`return WaitForSingleObjectEx(mutex, milliseconds, FALSE);`
`139`	`139`	`}`
`140`	`140`
`141`		`-BOOL`
	`141`	`+static BOOL`
`142`	`142`	`LeaveNonRecursiveMutex(PNRMUTEX mutex)`
`143`	`143`	`{`
`144`	`144`	`return ReleaseSemaphore(mutex, 1, NULL);`