Add tor_cond_init/uninit

1 files changed, 7 insertions, 12 deletions

diff --git a/src/common/compat_winthreads.c b/src/common/compat_winthreads.c
index 634dfbed30..11f91c63df 100644
--- a/src/common/compat_winthreads.c
+++ b/src/common/compat_winthreads.c
@@ -70,30 +70,25 @@ tor_get_thread_id(void)
   return (unsigned long)GetCurrentThreadId();
 }
 
-tor_cond_t *
-tor_cond_new(void)
+int
+tor_cond_init(tor_cond_t *cond)
 {
-  tor_cond_t *cond = tor_malloc(sizeof(tor_cond_t));
+  memset(cond, 0, sizeof(tor_cond_t));
   if (InitializeCriticalSectionAndSpinCount(&cond->lock, SPIN_COUNT)==0) {
-    tor_free(cond);
-    return NULL;
+    return -1;
   }
   if ((cond->event = CreateEvent(NULL,TRUE,FALSE,NULL)) == NULL) {
     DeleteCriticalSection(&cond->lock);
-    tor_free(cond);
-    return NULL;
+    return -1;
   }
   cond->n_waiting = cond->n_to_wake = cond->generation = 0;
-  return cond;
+  return 0;
 }
 void
-tor_cond_free(tor_cond_t *cond)
+tor_cond_uninit(tor_cond_t *cond)
 {
-  if (!cond)
-    return;
   DeleteCriticalSection(&cond->lock);
   CloseHandle(cond->event);
-  mm_free(cond);
 }
 
 static void