btrace: uppercase btrace_read_type

2014-01-16  Markus Metzger  <markus.t.metzger@intel.com>

	* common/btrace-common.h (btrace_read_type) <btrace_read_all>:
	Change to ...
	(btrace_read_type) <BTRACE_READ_ALL>: ... this.  Update users.
	(btrace_read_type) <btrace_read_new>: Change to ...
	(btrace_read_type) <BTRACE_READ_NEW>: ... this.  Update users.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e1e6c744611fd584c5feb1e19cfd5e43ed2f22b5..153c508e48f0c6294ccd21a8849b7c6acc02db4c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2014-01-16  Markus Metzger  <markus.t.metzger@intel.com>
+
+       * common/btrace-common.h (btrace_read_type) <btrace_read_all>:
+       Change to ...
+       (btrace_read_type) <BTRACE_READ_ALL>: ... this.  Update users.
+       (btrace_read_type) <btrace_read_new>: Change to ...
+       (btrace_read_type) <BTRACE_READ_NEW>: ... this.  Update users.
+
 2014-01-16  Markus Metzger  <markus.t.metzger@intel.com>
 
        * common/linux-btrace.c (linux_read_btrace): Free trace from

diff --git a/gdb/btrace.c b/gdb/btrace.c
index 7f26e1ebfcb956886011be98392dc63435788b91..df62da8a9c44f8c2fee6d52167f6a5450627f0c8 100644 (file)
--- a/gdb/btrace.c
+++ b/gdb/btrace.c
@@ -401,7 +401,7 @@ btrace_fetch (struct thread_info *tp)
   if (btinfo->target == NULL)
     return;
 
-  btrace = target_read_btrace (btinfo->target, btrace_read_new);
+  btrace = target_read_btrace (btinfo->target, BTRACE_READ_NEW);
   if (VEC_empty (btrace_block_s, btrace))
     return;
 

diff --git a/gdb/common/btrace-common.h b/gdb/common/btrace-common.h
index c7d811687c19961a0255ff038df8a277b33032a4..1d389aff14d4e13011aa0521f3f0d8100be71e17 100644 (file)
--- a/gdb/common/btrace-common.h
+++ b/gdb/common/btrace-common.h
@@ -64,10 +64,10 @@ struct btrace_target_info;
 enum btrace_read_type
 {
   /* Send all available trace.  */
-  btrace_read_all,
+  BTRACE_READ_ALL,
 
   /* Send all available trace, if it changed.  */
-  btrace_read_new
+  BTRACE_READ_NEW
 };
 
 #endif /* BTRACE_COMMON_H */

diff --git a/gdb/common/linux-btrace.c b/gdb/common/linux-btrace.c
index 0d36ea5c9580f85bcbbd1d4bad3404317c242bd6..54740494f2a5a8653d78722a33dfd96e457158da 100644 (file)
--- a/gdb/common/linux-btrace.c
+++ b/gdb/common/linux-btrace.c
@@ -509,7 +509,7 @@ linux_read_btrace (struct btrace_target_info *tinfo,
   unsigned long data_head, retries = 5;
   size_t buffer_size;
 
-  if (type == btrace_read_new && !linux_btrace_has_changed (tinfo))
+  if (type == BTRACE_READ_NEW && !linux_btrace_has_changed (tinfo))
     return NULL;
 
   header = perf_event_header (tinfo);

diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index c9d9eec0d4e7444c70a1203fd7d77ae51b4868bf..9ae28f8ce7ebc56aef194bb84a04dcd95fe3a938 100644 (file)
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -1377,9 +1377,9 @@ handle_qxfer_btrace (const char *annex,
     }
 
   if (strcmp (annex, "all") == 0)
-    type = btrace_read_all;
+    type = BTRACE_READ_ALL;
   else if (strcmp (annex, "new") == 0)
-    type = btrace_read_new;
+    type = BTRACE_READ_NEW;
   else
     {
       strcpy (own_buf, "E.Bad annex.");

diff --git a/gdb/remote.c b/gdb/remote.c
index 563f7b7f2eb1274f70e1112fa68fe4df6ab88547..fca22509e979628765c844f4456285027ef9f4f4 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -11505,10 +11505,10 @@ remote_read_btrace (struct btrace_target_info *tinfo,
 
   switch (type)
     {
-    case btrace_read_all:
+    case BTRACE_READ_ALL:
       annex = "all";
       break;
-    case btrace_read_new:
+    case BTRACE_READ_NEW:
       annex = "new";
       break;
     default: