Made indentation in the DRD source code uniform: indentation size is now two spaces in all soure files.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7684 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/exp-drd/drd_error.c b/exp-drd/drd_error.c
index cc1923b..e3a7bc9 100644
--- a/exp-drd/drd_error.c
+++ b/exp-drd/drd_error.c
@@ -40,26 +40,26 @@
 
 
 typedef enum {
-   ConflictingAccessSupp
+  ConflictingAccessSupp
 } DRD_SuppKind;
 
 
 static void make_path_relative(Char* const path)
 {
-   int offset = 0;
-   Char cwd[512];
+  int offset = 0;
+  Char cwd[512];
 
-   if (! VG_(get_startup_wd)(cwd, sizeof(cwd)))
-      tl_assert(False);
-   if (VG_(strncmp)(path + offset, cwd, VG_(strlen)(cwd)) == 0)
-   {
-      offset += VG_(strlen)(cwd);
-      if (path[offset] == '/')
-      {
-         offset++;
-      }
-   }
-   VG_(memmove)(path, path + offset, VG_(strlen)(path + offset) + 1);
+  if (! VG_(get_startup_wd)(cwd, sizeof(cwd)))
+    tl_assert(False);
+  if (VG_(strncmp)(path + offset, cwd, VG_(strlen)(cwd)) == 0)
+  {
+    offset += VG_(strlen)(cwd);
+    if (path[offset] == '/')
+    {
+      offset++;
+    }
+  }
+  VG_(memmove)(path, path + offset, VG_(strlen)(path + offset) + 1);
 }
 
 
@@ -67,102 +67,102 @@
 /* messages, putting the result in ai. */
 void describe_addr(Addr const a, SizeT const len, AddrInfo* const ai)
 {
-   Addr       stack_min, stack_max;
-   DebugInfo* sg;
+  Addr       stack_min, stack_max;
+  DebugInfo* sg;
 
-   /* Perhaps it's on a thread's stack? */
-   ai->stack_tid = thread_lookup_stackaddr(a, &stack_min, &stack_max);
-   if (ai->stack_tid != DRD_INVALID_THREADID)
-   {
-      ai->akind     = eStack;
-      ai->size      = len;
-      ai->rwoffset  = a - stack_max;
-      tl_assert(a + ai->size <= stack_max);
-      tl_assert(ai->rwoffset < 0);
+  /* Perhaps it's on a thread's stack? */
+  ai->stack_tid = thread_lookup_stackaddr(a, &stack_min, &stack_max);
+  if (ai->stack_tid != DRD_INVALID_THREADID)
+  {
+    ai->akind     = eStack;
+    ai->size      = len;
+    ai->rwoffset  = a - stack_max;
+    tl_assert(a + ai->size <= stack_max);
+    tl_assert(ai->rwoffset < 0);
+    return;
+  }
+
+  /* Perhaps it's in a mapped segment ? */
+  sg = VG_(find_seginfo)(a);
+  if (sg)
+  {
+    int i, n;
+
+    ai->akind   = eSegment;
+    ai->debuginfo = sg;
+    ai->name[0] = 0;
+    ai->size = 1;
+    ai->rwoffset = 0;
+
+    n = VG_(seginfo_syms_howmany)(sg);
+    for (i = 0; i < n; i++)
+    {
+      Addr addr;
+      Addr tocptr;
+      UInt size;
+      HChar* name;
+      Char filename[256];
+      Int linenum;
+      Bool isText;
+
+      VG_(seginfo_syms_getidx)(sg, i, &addr, &tocptr, &size, &name, &isText);
+      if (isText && addr <= a && a < addr + size)
+      {
+        ai->size     = size;
+        ai->rwoffset = a - addr;
+        tl_assert(name && name[0]);
+        VG_(snprintf)(ai->name, sizeof(ai->name), "%s", name);
+        if (VG_(get_filename_linenum)(addr,
+                                      filename, sizeof(filename),
+                                      0, 0, 0,
+                                      &linenum))
+        {
+          make_path_relative(filename);
+          VG_(snprintf)(ai->descr, sizeof(ai->descr),
+                        " in %s:%d", filename, linenum);
+        }
+        else
+        {
+          i = n;
+        }
+        break;
+      }
+    }
+    if (i == n)
+    {
+      Char filename[512];
+      Char soname[512];
+      VgSectKind kind = VG_(seginfo_sect_kind)(NULL, 0, a);
+      const HChar* sect_kind_name = VG_(pp_SectKind)(kind);
+      VG_(strncpy)(filename, VG_(seginfo_filename)(sg), sizeof(filename));
+      filename[sizeof(filename) - 1] = 0;
+      make_path_relative(filename);
+      VG_(strncpy)(soname, VG_(seginfo_soname)(sg), sizeof(soname));
+      soname[sizeof(soname) - 1] = 0;
+      make_path_relative(soname);
+      VG_(snprintf)(ai->descr, sizeof(ai->descr),
+                    "%s, %s:%s",
+                    filename,
+                    soname,
+                    sect_kind_name);
+    }
+    return;
+  }
+
+  /* Search for a currently malloc'd block which might bracket it. */
+  {
+    Addr data;
+    if (drd_heap_addrinfo(a, &data, &ai->size, &ai->lastchange))
+    {
+      ai->akind = eMallocd;
+      ai->rwoffset = a - data;
       return;
-   }
+    }
+  }
 
-   /* Perhaps it's in a mapped segment ? */
-   sg = VG_(find_seginfo)(a);
-   if (sg)
-   {
-      int i, n;
-
-      ai->akind   = eSegment;
-      ai->debuginfo = sg;
-      ai->name[0] = 0;
-      ai->size = 1;
-      ai->rwoffset = 0;
-
-      n = VG_(seginfo_syms_howmany)(sg);
-      for (i = 0; i < n; i++)
-      {
-         Addr addr;
-         Addr tocptr;
-         UInt size;
-         HChar* name;
-         Char filename[256];
-         Int linenum;
-         Bool isText;
-
-         VG_(seginfo_syms_getidx)(sg, i, &addr, &tocptr, &size, &name, &isText);
-         if (isText && addr <= a && a < addr + size)
-         {
-            ai->size     = size;
-            ai->rwoffset = a - addr;
-            tl_assert(name && name[0]);
-            VG_(snprintf)(ai->name, sizeof(ai->name), "%s", name);
-            if (VG_(get_filename_linenum)(addr,
-                                          filename, sizeof(filename),
-                                          0, 0, 0,
-                                          &linenum))
-            {
-               make_path_relative(filename);
-               VG_(snprintf)(ai->descr, sizeof(ai->descr),
-                             " in %s:%d", filename, linenum);
-            }
-            else
-            {
-               i = n;
-            }
-            break;
-         }
-      }
-      if (i == n)
-      {
-         Char filename[512];
-         Char soname[512];
-         VgSectKind kind = VG_(seginfo_sect_kind)(NULL, 0, a);
-         const HChar* sect_kind_name = VG_(pp_SectKind)(kind);
-         VG_(strncpy)(filename, VG_(seginfo_filename)(sg), sizeof(filename));
-         filename[sizeof(filename) - 1] = 0;
-         make_path_relative(filename);
-         VG_(strncpy)(soname, VG_(seginfo_soname)(sg), sizeof(soname));
-         soname[sizeof(soname) - 1] = 0;
-         make_path_relative(soname);
-         VG_(snprintf)(ai->descr, sizeof(ai->descr),
-                       "%s, %s:%s",
-                       filename,
-                       soname,
-                       sect_kind_name);
-      }
-      return;
-   }
-
-   /* Search for a currently malloc'd block which might bracket it. */
-   {
-      Addr data;
-      if (drd_heap_addrinfo(a, &data, &ai->size, &ai->lastchange))
-      {
-         ai->akind = eMallocd;
-         ai->rwoffset = a - data;
-         return;
-      }
-   }
-
-   /* Clueless ... */
-   ai->akind = eUnknown;
-   return;
+  /* Clueless ... */
+  ai->akind = eUnknown;
+  return;
 }
 
 /**
@@ -171,291 +171,285 @@
 Char* describe_addr_text(Addr const a, SizeT const len, AddrInfo* const ai,
                          Char* const buf, UInt const n_buf)
 {
-   tl_assert(a);
-   tl_assert(ai);
-   tl_assert(buf);
+  tl_assert(a);
+  tl_assert(ai);
+  tl_assert(buf);
 
-   describe_addr(a, len, ai);
+  describe_addr(a, len, ai);
 
-   switch (ai->akind)
-   {
-   case eStack: {
+  switch (ai->akind)
+  {
+  case eStack: {
+    VG_(snprintf)(buf, n_buf,
+                  "stack of %s, offset %d",
+                  thread_get_name(ai->stack_tid), ai->rwoffset);
+    break;
+  }
+  case eSegment: {
+    if (ai->name[0])
+    {
       VG_(snprintf)(buf, n_buf,
-                    "stack of %s, offset %d",
-                    thread_get_name(ai->stack_tid), ai->rwoffset);
-      break;
-   }
-   case eSegment: {
-      if (ai->name[0])
-      {
-         VG_(snprintf)(buf, n_buf,
-                       "%s (offset %ld, size %ld) in %s",
-                       ai->name, ai->rwoffset, ai->size, ai->descr);
-      }
-      else
-      {
-         VG_(snprintf)(buf, n_buf,
-                       "%s",
-                       ai->descr);
-      }
-      break;
-   }
-   case eMallocd: {
-      VG_(snprintf)(buf, n_buf, "heap");
-      VG_(snprintf)(buf + VG_(strlen)(buf), n_buf - VG_(strlen)(buf),
-                    ", offset %ld in block at 0x%lx of size %ld",
-                    ai->rwoffset, a - ai->rwoffset, ai->size);
-      break;
-   }
-   case eUnknown:
-      VG_(snprintf)(buf, n_buf, "unknown");
-      break;
-   default:
-      tl_assert(0);
-   }
-   return buf;
+                    "%s (offset %ld, size %ld) in %s",
+                    ai->name, ai->rwoffset, ai->size, ai->descr);
+    }
+    else
+    {
+      VG_(snprintf)(buf, n_buf,
+                    "%s",
+                    ai->descr);
+    }
+    break;
+  }
+  case eMallocd: {
+    VG_(snprintf)(buf, n_buf, "heap");
+    VG_(snprintf)(buf + VG_(strlen)(buf), n_buf - VG_(strlen)(buf),
+                  ", offset %ld in block at 0x%lx of size %ld",
+                  ai->rwoffset, a - ai->rwoffset, ai->size);
+    break;
+  }
+  case eUnknown:
+    VG_(snprintf)(buf, n_buf, "unknown");
+    break;
+  default:
+    tl_assert(0);
+  }
+  return buf;
 }
 
 static
 void drd_report_data_race2(Error* const err, const DataRaceErrInfo* const dri)
 {
-   AddrInfo ai;
-   Char descr1[256];
-   Char descr2[256];
+  AddrInfo ai;
+  Char descr1[256];
+  Char descr2[256];
 
-   tl_assert(dri);
-   tl_assert(dri->addr);
-   tl_assert(dri->size > 0);
+  tl_assert(dri);
+  tl_assert(dri->addr);
+  tl_assert(dri->size > 0);
 
-   descr1[0] = 0;
-   descr2[0] = 0;
-   VG_(get_data_description)(descr1, descr2, sizeof(descr1), dri->addr);
-   if (descr1[0] == 0)
-   {
-      describe_addr(dri->addr, dri->size, &ai);
-   }
-   VG_(message)(Vg_UserMsg,
-                "Conflicting %s by %s at 0x%08lx size %ld",
-                dri->access_type == eStore ? "store" : "load",
-                thread_get_name(VgThreadIdToDrdThreadId(dri->tid)),
-                dri->addr,
-                dri->size);
-   VG_(pp_ExeContext)(VG_(get_error_where)(err));
-   if (descr1[0])
-   {
-      VG_(message)(Vg_UserMsg, "%s", descr1);
-      VG_(message)(Vg_UserMsg, "%s", descr2);
-   }
-   else if (ai.akind == eMallocd && ai.lastchange)
-   {
-      VG_(message)(Vg_UserMsg,
-                   "Address 0x%lx is at offset %ld from 0x%lx."
-                   " Allocation context:",
-                   dri->addr, ai.rwoffset, dri->addr - ai.rwoffset);
-      VG_(pp_ExeContext)(ai.lastchange);
-   }
-   else
-   {
-      VG_(message)(Vg_UserMsg, "Allocation context: unknown.");
-   }
-   thread_report_conflicting_segments(VgThreadIdToDrdThreadId(dri->tid),
-                                      dri->addr, dri->size, dri->access_type);
+  descr1[0] = 0;
+  descr2[0] = 0;
+  VG_(get_data_description)(descr1, descr2, sizeof(descr1), dri->addr);
+  if (descr1[0] == 0)
+  {
+    describe_addr(dri->addr, dri->size, &ai);
+  }
+  VG_(message)(Vg_UserMsg,
+               "Conflicting %s by %s at 0x%08lx size %ld",
+               dri->access_type == eStore ? "store" : "load",
+               thread_get_name(VgThreadIdToDrdThreadId(dri->tid)),
+               dri->addr,
+               dri->size);
+  VG_(pp_ExeContext)(VG_(get_error_where)(err));
+  if (descr1[0])
+  {
+    VG_(message)(Vg_UserMsg, "%s", descr1);
+    VG_(message)(Vg_UserMsg, "%s", descr2);
+  }
+  else if (ai.akind == eMallocd && ai.lastchange)
+  {
+    VG_(message)(Vg_UserMsg,
+                 "Address 0x%lx is at offset %ld from 0x%lx."
+                 " Allocation context:",
+                 dri->addr, ai.rwoffset, dri->addr - ai.rwoffset);
+    VG_(pp_ExeContext)(ai.lastchange);
+  }
+  else
+  {
+    VG_(message)(Vg_UserMsg, "Allocation context: unknown.");
+  }
+  thread_report_conflicting_segments(VgThreadIdToDrdThreadId(dri->tid),
+                                     dri->addr, dri->size, dri->access_type);
 }
 
 static Bool drd_tool_error_eq(VgRes res, Error* e1, Error* e2)
 {
-   return False;
+  return False;
 }
 
 static void drd_tool_error_pp(Error* const e)
 {
-   switch (VG_(get_error_kind)(e))
-   {
-   case DataRaceErr: {
-      drd_report_data_race2(e, VG_(get_error_extra)(e));
-      break;
-   }
-   case MutexErr: {
-      MutexErrInfo* p = (MutexErrInfo*)(VG_(get_error_extra)(e));
-      tl_assert(p);
-      VG_(message)(Vg_UserMsg,
-                   "%s: mutex 0x%lx, recursion count %d, owner %d.",
-                   VG_(get_error_string)(e),
-                   p->mutex,
-                   p->recursion_count,
-                   p->owner);
-      VG_(pp_ExeContext)(VG_(get_error_where)(e));
-      break;
-   }
-   case CondErr: {
-      CondErrInfo* cdei =(CondErrInfo*)(VG_(get_error_extra)(e));
-      VG_(message)(Vg_UserMsg,
-                   "%s: cond 0x%lx",
-                   cdei->cond,
-                   VG_(get_error_string)(e));
-      VG_(pp_ExeContext)(VG_(get_error_where)(e));
-      break;
-   }
-   case CondRaceErr: {
-      CondRaceErrInfo* cei = (CondRaceErrInfo*)(VG_(get_error_extra)(e));
-      VG_(message)(Vg_UserMsg,
-                   "Race condition: condition variable 0x%lx has been"
-                   " signalled but the associated mutex 0x%lx is not locked"
-                   " by the signalling thread",
-                   cei->cond, cei->mutex);
-      VG_(pp_ExeContext)(VG_(get_error_where)(e));
-      break;
-   }
-   case CondDestrErr: {
-      CondDestrErrInfo* cdi = (CondDestrErrInfo*)(VG_(get_error_extra)(e));
-      VG_(message)(Vg_UserMsg,
-                   "%s: cond 0x%lx, mutex 0x%lx locked by thread %d",
-                   cdi->cond, cdi->mutex, cdi->tid);
-      VG_(pp_ExeContext)(VG_(get_error_where)(e));
-      break;
-   }
-   case SemaphoreErr: {
-      SemaphoreErrInfo* sei =(SemaphoreErrInfo*)(VG_(get_error_extra)(e));
-      tl_assert(sei);
-      VG_(message)(Vg_UserMsg,
-                   "%s: semaphore 0x%lx",
-                   VG_(get_error_string)(e),
-                   sei->semaphore);
-      VG_(pp_ExeContext)(VG_(get_error_where)(e));
-      break;
-   }
-   case BarrierErr: {
-      BarrierErrInfo* sei =(BarrierErrInfo*)(VG_(get_error_extra)(e));
-      tl_assert(sei);
-      VG_(message)(Vg_UserMsg,
-                   "%s: barrier 0x%lx",
-                   VG_(get_error_string)(e),
-                   sei->barrier);
-      VG_(pp_ExeContext)(VG_(get_error_where)(e));
-      break;
-   }
-   case RwlockErr: {
-      RwlockErrInfo* p = (RwlockErrInfo*)(VG_(get_error_extra)(e));
-      tl_assert(p);
-      VG_(message)(Vg_UserMsg,
-                   "%s: rwlock 0x%lx.",
-                   VG_(get_error_string)(e),
-                   p->rwlock);
-      VG_(pp_ExeContext)(VG_(get_error_where)(e));
-      break;
-   }
-   case GenericErr: {
-      //GenericErrInfo* gei =(GenericErrInfo*)(VG_(get_error_extra)(e));
-      VG_(message)(Vg_UserMsg, "%s", VG_(get_error_string)(e));
-      VG_(pp_ExeContext)(VG_(get_error_where)(e));
-      break;
-   }
-   default:
-      VG_(message)(Vg_UserMsg,
-                   "%s",
-                   VG_(get_error_string)(e));
-      VG_(pp_ExeContext)(VG_(get_error_where)(e));
-      break;
-   }
+  switch (VG_(get_error_kind)(e))
+  {
+  case DataRaceErr: {
+    drd_report_data_race2(e, VG_(get_error_extra)(e));
+    break;
+  }
+  case MutexErr: {
+    MutexErrInfo* p = (MutexErrInfo*)(VG_(get_error_extra)(e));
+    tl_assert(p);
+    VG_(message)(Vg_UserMsg,
+                 "%s: mutex 0x%lx, recursion count %d, owner %d.",
+                 VG_(get_error_string)(e),
+                 p->mutex,
+                 p->recursion_count,
+                 p->owner);
+    VG_(pp_ExeContext)(VG_(get_error_where)(e));
+    break;
+  }
+  case CondErr: {
+    CondErrInfo* cdei =(CondErrInfo*)(VG_(get_error_extra)(e));
+    VG_(message)(Vg_UserMsg,
+                 "%s: cond 0x%lx",
+                 cdei->cond,
+                 VG_(get_error_string)(e));
+    VG_(pp_ExeContext)(VG_(get_error_where)(e));
+    break;
+  }
+  case CondRaceErr: {
+    CondRaceErrInfo* cei = (CondRaceErrInfo*)(VG_(get_error_extra)(e));
+    VG_(message)(Vg_UserMsg,
+                 "Race condition: condition variable 0x%lx has been"
+                 " signalled but the associated mutex 0x%lx is not locked"
+                 " by the signalling thread",
+                 cei->cond, cei->mutex);
+    VG_(pp_ExeContext)(VG_(get_error_where)(e));
+    break;
+  }
+  case CondDestrErr: {
+    CondDestrErrInfo* cdi = (CondDestrErrInfo*)(VG_(get_error_extra)(e));
+    VG_(message)(Vg_UserMsg,
+                 "%s: cond 0x%lx, mutex 0x%lx locked by thread %d",
+                 cdi->cond, cdi->mutex, cdi->tid);
+    VG_(pp_ExeContext)(VG_(get_error_where)(e));
+    break;
+  }
+  case SemaphoreErr: {
+    SemaphoreErrInfo* sei =(SemaphoreErrInfo*)(VG_(get_error_extra)(e));
+    tl_assert(sei);
+    VG_(message)(Vg_UserMsg,
+                 "%s: semaphore 0x%lx",
+                 VG_(get_error_string)(e),
+                 sei->semaphore);
+    VG_(pp_ExeContext)(VG_(get_error_where)(e));
+    break;
+  }
+  case BarrierErr: {
+    BarrierErrInfo* sei =(BarrierErrInfo*)(VG_(get_error_extra)(e));
+    tl_assert(sei);
+    VG_(message)(Vg_UserMsg,
+                 "%s: barrier 0x%lx",
+                 VG_(get_error_string)(e),
+                 sei->barrier);
+    VG_(pp_ExeContext)(VG_(get_error_where)(e));
+    break;
+  }
+  case RwlockErr: {
+    RwlockErrInfo* p = (RwlockErrInfo*)(VG_(get_error_extra)(e));
+    tl_assert(p);
+    VG_(message)(Vg_UserMsg,
+                 "%s: rwlock 0x%lx.",
+                 VG_(get_error_string)(e),
+                 p->rwlock);
+    VG_(pp_ExeContext)(VG_(get_error_where)(e));
+    break;
+  }
+  case GenericErr: {
+    //GenericErrInfo* gei =(GenericErrInfo*)(VG_(get_error_extra)(e));
+    VG_(message)(Vg_UserMsg, "%s", VG_(get_error_string)(e));
+    VG_(pp_ExeContext)(VG_(get_error_where)(e));
+    break;
+  }
+  default:
+    VG_(message)(Vg_UserMsg,
+                 "%s",
+                 VG_(get_error_string)(e));
+    VG_(pp_ExeContext)(VG_(get_error_where)(e));
+    break;
+  }
 }
 
 static UInt drd_tool_error_update_extra(Error* e)
 {
-   switch (VG_(get_error_kind)(e))
-   {
-   case DataRaceErr:
-      return sizeof(DataRaceErrInfo);
-   case MutexErr:
-      return sizeof(MutexErrInfo);
-   case CondErr:
-      return sizeof(CondErrInfo);
-   case CondRaceErr:
-      return sizeof(CondRaceErrInfo);
-   case CondDestrErr:
-      return sizeof(CondDestrErrInfo);
-   case SemaphoreErr:
-      return sizeof(SemaphoreErrInfo);
-   case BarrierErr:
-      return sizeof(BarrierErrInfo);
-   case RwlockErr:
-      return sizeof(RwlockErrInfo);
-   case GenericErr:
-      return sizeof(GenericErrInfo);
-   default:
-      tl_assert(False);
-      break;
-   }
+  switch (VG_(get_error_kind)(e))
+  {
+  case DataRaceErr:
+    return sizeof(DataRaceErrInfo);
+  case MutexErr:
+    return sizeof(MutexErrInfo);
+  case CondErr:
+    return sizeof(CondErrInfo);
+  case CondRaceErr:
+    return sizeof(CondRaceErrInfo);
+  case CondDestrErr:
+    return sizeof(CondDestrErrInfo);
+  case SemaphoreErr:
+    return sizeof(SemaphoreErrInfo);
+  case BarrierErr:
+    return sizeof(BarrierErrInfo);
+  case RwlockErr:
+    return sizeof(RwlockErrInfo);
+  case GenericErr:
+    return sizeof(GenericErrInfo);
+  default:
+    tl_assert(False);
+    break;
+  }
 }
 
 static Bool drd_tool_error_recog(Char* const name, Supp* const supp)
 {
-   SuppKind skind;
+  SuppKind skind;
 
-   if (VG_(strcmp)(name, "ConflictingAccess") == 0)
-      skind = ConflictingAccessSupp;
-   else
-      return False;
+  if (VG_(strcmp)(name, "ConflictingAccess") == 0)
+    skind = ConflictingAccessSupp;
+  else
+    return False;
 
-   VG_(set_supp_kind)(supp, skind);
-   return True;
+  VG_(set_supp_kind)(supp, skind);
+  return True;
 }
 
 static Bool drd_tool_error_read_extra(Int fd, Char* buf, Int nBuf, Supp* supp)
 {
-   return True;
+  return True;
 }
 
 static Bool drd_tool_error_matches(Error* const e, Supp* const supp)
 {
-   switch (VG_(get_supp_kind)(supp))
-   {
-   }
-   return True;
+  switch (VG_(get_supp_kind)(supp))
+  {
+  }
+  return True;
 }
 
 static Char* drd_tool_error_name(Error* e)
 {
-   switch (VG_(get_error_kind)(e))
-   {
-   case DataRaceErr:  return "DataRaceErr";
-   case MutexErr:     return "MutexErr";
-   case CondErr:      return "CondErr";
-   case CondRaceErr:  return "CondRaceErr";
-   case CondDestrErr: return "CondDestrErr";
-   case SemaphoreErr: return "SemaphoreErr";
-   case BarrierErr:   return "BarrierErr";
-   case RwlockErr:    return "RwlockErr";
-   case GenericErr:   return "GenericErr";
-   default:
-      tl_assert(0);
-   }
-   return 0;
+  switch (VG_(get_error_kind)(e))
+  {
+  case DataRaceErr:  return "DataRaceErr";
+  case MutexErr:     return "MutexErr";
+  case CondErr:      return "CondErr";
+  case CondRaceErr:  return "CondRaceErr";
+  case CondDestrErr: return "CondDestrErr";
+  case SemaphoreErr: return "SemaphoreErr";
+  case BarrierErr:   return "BarrierErr";
+  case RwlockErr:    return "RwlockErr";
+  case GenericErr:   return "GenericErr";
+  default:
+    tl_assert(0);
+  }
+  return 0;
 }
 
 static void drd_tool_error_print_extra(Error* e)
 {
-   switch (VG_(get_error_kind)(e))
-   {
-      // VG_(printf)("   %s\n", VG_(get_error_string)(err));
-   }
+  switch (VG_(get_error_kind)(e))
+  {
+    // VG_(printf)("   %s\n", VG_(get_error_string)(err));
+  }
 }
 
 void drd_register_error_handlers(void)
 {
-   // Tool error reporting.
-   VG_(needs_tool_errors)(drd_tool_error_eq,
-                          drd_tool_error_pp,
-                          True,
-                          drd_tool_error_update_extra,
-                          drd_tool_error_recog,
-                          drd_tool_error_read_extra,
-                          drd_tool_error_matches,
-                          drd_tool_error_name,
-                          drd_tool_error_print_extra);
+  // Tool error reporting.
+  VG_(needs_tool_errors)(drd_tool_error_eq,
+                         drd_tool_error_pp,
+                         True,
+                         drd_tool_error_update_extra,
+                         drd_tool_error_recog,
+                         drd_tool_error_read_extra,
+                         drd_tool_error_matches,
+                         drd_tool_error_name,
+                         drd_tool_error_print_extra);
 }
-
-/*
- * Local variables:
- * c-basic-offset: 3
- * End:
- */