commit 86f97a417d816faaec7ecb5e4f11bbb277a1ad84
author Johnny Chen <johnny.chen@apple.com> Tue Sep 06 19:52:49 2011 +0000
committer Johnny Chen <johnny.chen@apple.com> Tue Sep 06 19:52:49 2011 +0000
tree 19e0da14e3c9709d1098573ce4e040d21342d3e2
parent fed48af3def19576dee6d499126f5de80d3676e8

DNBBreakpoint::SetEnabled() should take a bool, not a uint32_t, as its input argument.
Plus for watchpoint related functions, add new macros INVALID_NUB_WATCH_ID and
NUB_WATCH_ID_IS_VALID and use them, instead.

llvm-svn: 139163

lldb/tools/debugserver/source/DNB.cpp

diff --git a/lldb/tools/debugserver/source/DNB.cpp b/lldb/tools/debugserver/source/DNB.cpp
index a4773a5..8e908b7 100644
--- a/lldb/tools/debugserver/source/DNB.cpp
+++ b/lldb/tools/debugserver/source/DNB.cpp
@@ -972,13 +972,13 @@
     {
         return procSP->CreateWatchpoint(addr, size, watch_flags, hardware, THREAD_NULL);
     }
-    return INVALID_NUB_BREAK_ID;
+    return INVALID_NUB_WATCH_ID;
 }
 
 nub_bool_t
 DNBWatchpointClear (nub_process_t pid, nub_watch_t watchID)
 {
-    if (NUB_BREAK_ID_IS_VALID(watchID))
+    if (NUB_WATCH_ID_IS_VALID(watchID))
     {
         MachProcessSP procSP;
         if (GetProcessSP (pid, procSP))
@@ -992,7 +992,7 @@
 nub_ssize_t
 DNBWatchpointGetHitCount (nub_process_t pid, nub_watch_t watchID)
 {
-    if (NUB_BREAK_ID_IS_VALID(watchID))
+    if (NUB_WATCH_ID_IS_VALID(watchID))
     {
         MachProcessSP procSP;
         if (GetProcessSP (pid, procSP))
@@ -1008,7 +1008,7 @@
 nub_ssize_t
 DNBWatchpointGetIgnoreCount (nub_process_t pid, nub_watch_t watchID)
 {
-    if (NUB_BREAK_ID_IS_VALID(watchID))
+    if (NUB_WATCH_ID_IS_VALID(watchID))
     {
         MachProcessSP procSP;
         if (GetProcessSP (pid, procSP))
@@ -1024,7 +1024,7 @@
 nub_bool_t
 DNBWatchpointSetIgnoreCount (nub_process_t pid, nub_watch_t watchID, nub_size_t ignore_count)
 {
-    if (NUB_BREAK_ID_IS_VALID(watchID))
+    if (NUB_WATCH_ID_IS_VALID(watchID))
     {
         MachProcessSP procSP;
         if (GetProcessSP (pid, procSP))
@@ -1047,7 +1047,7 @@
 nub_bool_t
 DNBWatchpointSetCallback (nub_process_t pid, nub_watch_t watchID, DNBCallbackBreakpointHit callback, void *baton)
 {
-    if (NUB_BREAK_ID_IS_VALID(watchID))
+    if (NUB_WATCH_ID_IS_VALID(watchID))
     {
         MachProcessSP procSP;
         if (GetProcessSP (pid, procSP))