@@ -264,14 +264,17 @@ PyThread_exit_thread(void)
264
264
PyThread_type_lock
265
265
PyThread_allocate_lock (void )
266
266
{
267
- PNRMUTEX aLock ;
267
+ PNRMUTEX mutex ;
268
268
269
269
if (!initialized )
270
270
PyThread_init_thread ();
271
271
272
- aLock = AllocNonRecursiveMutex () ;
272
+ mutex = AllocNonRecursiveMutex () ;
273
273
274
- return (PyThread_type_lock ) aLock ;
274
+ PyThread_type_lock aLock = (PyThread_type_lock ) mutex ;
275
+ assert (aLock );
276
+
277
+ return aLock ;
275
278
}
276
279
277
280
void
@@ -295,6 +298,8 @@ PyLockStatus
295
298
PyThread_acquire_lock_timed (PyThread_type_lock aLock ,
296
299
PY_TIMEOUT_T microseconds , int intr_flag )
297
300
{
301
+ assert (aLock );
302
+
298
303
/* Fow now, intr_flag does nothing on Windows, and lock acquires are
299
304
* uninterruptible. */
300
305
PyLockStatus success ;
@@ -321,8 +326,8 @@ PyThread_acquire_lock_timed(PyThread_type_lock aLock,
321
326
milliseconds = INFINITE ;
322
327
}
323
328
324
- if (aLock && EnterNonRecursiveMutex ((PNRMUTEX )aLock ,
325
- (DWORD )milliseconds ) == WAIT_OBJECT_0 ) {
329
+ if (EnterNonRecursiveMutex ((PNRMUTEX )aLock ,
330
+ (DWORD )milliseconds ) == WAIT_OBJECT_0 ) {
326
331
success = PY_LOCK_ACQUIRED ;
327
332
}
328
333
else {
@@ -340,9 +345,8 @@ PyThread_acquire_lock(PyThread_type_lock aLock, int waitflag)
340
345
void
341
346
PyThread_release_lock (PyThread_type_lock aLock )
342
347
{
343
- if (aLock ) {
344
- (void )LeaveNonRecursiveMutex ((PNRMUTEX ) aLock );
345
- }
348
+ assert (aLock );
349
+ (void )LeaveNonRecursiveMutex ((PNRMUTEX ) aLock );
346
350
}
347
351
348
352
/* minimum/maximum thread stack sizes supported */
0 commit comments