[Valgrind-developers] valgrind: r9687 - branches/DARWIN/coregrind

[<sv...@va...>]

Author: njn
Date: 2009-04-30 04:21:28 +0100 (Thu, 30 Apr 2009)
New Revision: 9687

Log:
Some minor code layout changes to sync with r9685 on the trunk.


Modified:
   branches/DARWIN/coregrind/m_signals.c


Modified: branches/DARWIN/coregrind/m_signals.c
===================================================================
--- branches/DARWIN/coregrind/m_signals.c	2009-04-30 03:15:43 UTC (rev 9686)
+++ branches/DARWIN/coregrind/m_signals.c	2009-04-30 03:21:28 UTC (rev 9687)
@@ -1053,17 +1053,17 @@
                                  vki_sigset_t* oldset )
 {
    switch(how) {
-      case VKI_SIG_BLOCK:
-      case VKI_SIG_UNBLOCK:
-      case VKI_SIG_SETMASK:
-         vg_assert(VG_(is_valid_tid)(tid));
-         do_setmask ( tid, how, set, oldset );
-         return VG_(mk_SysRes_Success)( 0 );
+   case VKI_SIG_BLOCK:
+   case VKI_SIG_UNBLOCK:
+   case VKI_SIG_SETMASK:
+      vg_assert(VG_(is_valid_tid)(tid));
+      do_setmask ( tid, how, set, oldset );
+      return VG_(mk_SysRes_Success)( 0 );
 
-      default:
-         VG_(message)(Vg_DebugMsg, 
-                     "sigprocmask: unknown 'how' field %d", how);
-         return VG_(mk_SysRes_Error)( VKI_EINVAL );
+   default:
+      VG_(message)(Vg_DebugMsg, 
+                  "sigprocmask: unknown 'how' field %d", how);
+      return VG_(mk_SysRes_Error)( VKI_EINVAL );
    }
 }
 
@@ -1304,39 +1304,39 @@
    vg_assert(VG_(is_running_thread)(tid));
    
    switch(sigNo) {
-      case VKI_SIGQUIT:	/* core */
-      case VKI_SIGILL:	/* core */
-      case VKI_SIGABRT:	/* core */
-      case VKI_SIGFPE:	/* core */
-      case VKI_SIGSEGV:	/* core */
-      case VKI_SIGBUS:	/* core */
-      case VKI_SIGTRAP:	/* core */
-      case VKI_SIGXCPU:	/* core */
-      case VKI_SIGXFSZ:	/* core */
-         terminate = True;
-         core = True;
-         break;
+   case VKI_SIGQUIT:	/* core */
+   case VKI_SIGILL:	/* core */
+   case VKI_SIGABRT:	/* core */
+   case VKI_SIGFPE:	/* core */
+   case VKI_SIGSEGV:	/* core */
+   case VKI_SIGBUS:	/* core */
+   case VKI_SIGTRAP:	/* core */
+   case VKI_SIGXCPU:	/* core */
+   case VKI_SIGXFSZ:	/* core */
+      terminate = True;
+      core = True;
+      break;
 
-      case VKI_SIGHUP:	/* term */
-      case VKI_SIGINT:	/* term */
-      case VKI_SIGKILL:	/* term - we won't see this */
-      case VKI_SIGPIPE:	/* term */
-      case VKI_SIGALRM:	/* term */
-      case VKI_SIGTERM:	/* term */
-      case VKI_SIGUSR1:	/* term */
-      case VKI_SIGUSR2:	/* term */
-      case VKI_SIGIO:	/* term */
-#     if defined(VKI_SIGPWR)
-      case VKI_SIGPWR:	/* term */
-#     endif
-      case VKI_SIGSYS:	/* term */
-      case VKI_SIGPROF:	/* term */
-      case VKI_SIGVTALRM:	/* term */
-#     if defined(VKI_SIGRTMIN) && defined(VKI_SIGRTMAX)
-      case VKI_SIGRTMIN ... VKI_SIGRTMAX: /* term */
-#     endif
-         terminate = True;
-         break;
+   case VKI_SIGHUP:	/* term */
+   case VKI_SIGINT:	/* term */
+   case VKI_SIGKILL:	/* term - we won't see this */
+   case VKI_SIGPIPE:	/* term */
+   case VKI_SIGALRM:	/* term */
+   case VKI_SIGTERM:	/* term */
+   case VKI_SIGUSR1:	/* term */
+   case VKI_SIGUSR2:	/* term */
+   case VKI_SIGIO:	/* term */
+#  if defined(VKI_SIGPWR)
+   case VKI_SIGPWR:	/* term */
+#  endif
+   case VKI_SIGSYS:	/* term */
+   case VKI_SIGPROF:	/* term */
+   case VKI_SIGVTALRM:	/* term */
+#  if defined(VKI_SIGRTMIN) && defined(VKI_SIGRTMAX)
+   case VKI_SIGRTMIN ... VKI_SIGRTMAX: /* term */
+#  endif
+      terminate = True;
+      break;
    }
 
    vg_assert(!core || (core && terminate));
@@ -1344,7 +1344,8 @@
    if (VG_(clo_trace_signals))
       VG_(message)(Vg_DebugMsg,
          "delivering %d (code %d) to default handler; action: %s%s",
-         sigNo, info->si_code, terminate ? "terminate" : "ignore", core ? "+core" : "");
+         sigNo, info->si_code, terminate ? "terminate" : "ignore",
+         core ? "+core" : "");
 
    if (!terminate)
       return;			/* nothing to do */