modified nacl_sync.h to have NACL_WUR for all functions that return a

src/shared/platform/nacl_global_secure_random.c

 /*
- * Copyright 2008 The Native Client Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can
- * be found in the LICENSE file.
+ * Copyright (c) 2011 The Native Client Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
  */
 
 /*
  * NaCl Service Runtime.  Secure RNG abstraction.
  */
 
 #include "native_client/src/shared/platform/nacl_global_secure_random.h"
 #include "native_client/src/shared/platform/nacl_log.h"
 #include "native_client/src/shared/platform/nacl_secure_random.h"
 #include "native_client/src/shared/platform/nacl_sync.h"
 #include "native_client/src/shared/platform/nacl_sync_checked.h"
 
 static struct NaClMutex          nacl_global_rng_mu;
 static struct NaClSecureRng      nacl_global_rng;
 
 static struct NaClSecureRng      *nacl_grngp = &nacl_global_rng;
 
 void NaClGlobalSecureRngInit(void) {
-  NaClMutexCtor(&nacl_global_rng_mu);
+  NaClXMutexCtor(&nacl_global_rng_mu);
   if (!NaClSecureRngCtor(nacl_grngp)) {
     NaClLog(LOG_FATAL,
             "Could not construct global random number generator.\n");
   }
 }
 
 void NaClGlobalSecureRngFini(void) {
   (*nacl_grngp->base.vtbl->Dtor)(&nacl_grngp->base);
   NaClMutexDtor(&nacl_global_rng_mu);
 }
 
 void NaClGlobalSecureRngSwitchRngForTesting(struct NaClSecureRng  *rng) {
-  NaClMutexLock(&nacl_global_rng_mu);
+  NaClXMutexLock(&nacl_global_rng_mu);
   nacl_grngp = rng;
-  NaClMutexUnlock(&nacl_global_rng_mu);
+  NaClXMutexUnlock(&nacl_global_rng_mu);
 }
 
 int32_t NaClGlobalSecureRngUniform(int32_t range_max) {
   int32_t  rv;
 
   NaClXMutexLock(&nacl_global_rng_mu);
   rv = (*nacl_grngp->base.vtbl->Uniform)(&nacl_grngp->base, range_max);
   NaClXMutexUnlock(&nacl_global_rng_mu);
   return rv;
 }
@@ skipping 60 matching lines @@
 
   int               i;
   int               r;
 
   for (i = 0; i < length-1; ++i) {
     r = NaClGlobalSecureRngUniform(alphabet_size);
     path[i] = alphabet[r];
   }
   path[length-1] = '\0';
 }