Fix minor naming inconsistency (#67). r=mmentovai

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@58 4c0a9323-5329-0410-9bdc-e9ce6186880e

3 files changed, 47 insertions, 47 deletions

diff --git a/src/processor/minidump.cc b/src/processor/minidump.cc
index f0d728c3..06993fbd 100644
--- a/src/processor/minidump.cc
+++ b/src/processor/minidump.cc
@@ -462,13 +462,13 @@ void MinidumpContext::FreeContext() {
 
 
 bool MinidumpContext::CheckAgainstSystemInfo(u_int32_t context_cpu_type) {
-  // It's OK if the minidump doesn't contain a SYSTEM_INFO_STREAM,
+  // It's OK if the minidump doesn't contain an MD_SYSTEM_INFO_STREAM,
   // as this function just implements a sanity check.
   MinidumpSystemInfo* system_info = minidump_->GetSystemInfo();
   if (!system_info)
     return true;
 
-  // If there is a SYSTEM_INFO_STREAM, it should contain valid system info.
+  // If there is an MD_SYSTEM_INFO_STREAM, it should contain valid system info.
   const MDRawSystemInfo* raw_system_info = system_info->system_info();
   if (!raw_system_info)
     return false;
@@ -2128,12 +2128,12 @@ bool Minidump::Read() {
     // type.
     unsigned int stream_type = directory_entry->stream_type;
     switch (stream_type) {
-      case THREAD_LIST_STREAM:
-      case MODULE_LIST_STREAM:
-      case MEMORY_LIST_STREAM:
-      case EXCEPTION_STREAM:
-      case SYSTEM_INFO_STREAM:
-      case MISC_INFO_STREAM: {
+      case MD_THREAD_LIST_STREAM:
+      case MD_MODULE_LIST_STREAM:
+      case MD_MEMORY_LIST_STREAM:
+      case MD_EXCEPTION_STREAM:
+      case MD_SYSTEM_INFO_STREAM:
+      case MD_MISC_INFO_STREAM: {
         if (stream_map->find(stream_type) != stream_map->end()) {
           // Another stream with this type was already found.  A minidump
           // file should contain at most one of each of these stream types.
diff --git a/src/processor/minidump.h b/src/processor/minidump.h
index 700daa18..c637dd66 100644
--- a/src/processor/minidump.h
+++ b/src/processor/minidump.h
@@ -327,7 +327,7 @@ class MinidumpThreadList : public MinidumpStream {
   typedef map<u_int32_t, MinidumpThread*> IDToThreadMap;
   typedef vector<MinidumpThread> MinidumpThreads;
 
-  static const u_int32_t kStreamType = THREAD_LIST_STREAM;
+  static const u_int32_t kStreamType = MD_THREAD_LIST_STREAM;
 
   explicit MinidumpThreadList(Minidump* aMinidump);
 
@@ -437,7 +437,7 @@ class MinidumpModuleList : public MinidumpStream {
 
   typedef vector<MinidumpModule> MinidumpModules;
 
-  static const u_int32_t kStreamType = MODULE_LIST_STREAM;
+  static const u_int32_t kStreamType = MD_MODULE_LIST_STREAM;
 
   explicit MinidumpModuleList(Minidump* minidump);
 
@@ -482,7 +482,7 @@ class MinidumpMemoryList : public MinidumpStream {
   typedef vector<MDMemoryDescriptor>   MemoryDescriptors;
   typedef vector<MinidumpMemoryRegion> MemoryRegions;
 
-  static const u_int32_t kStreamType = MEMORY_LIST_STREAM;
+  static const u_int32_t kStreamType = MD_MEMORY_LIST_STREAM;
 
   explicit MinidumpMemoryList(Minidump* minidump);
 
@@ -529,7 +529,7 @@ class MinidumpException : public MinidumpStream {
  private:
   friend class Minidump;
 
-  static const u_int32_t kStreamType = EXCEPTION_STREAM;
+  static const u_int32_t kStreamType = MD_EXCEPTION_STREAM;
 
   explicit MinidumpException(Minidump* minidump);
 
@@ -566,7 +566,7 @@ class MinidumpSystemInfo : public MinidumpStream {
  private:
   friend class Minidump;
 
-  static const u_int32_t kStreamType = SYSTEM_INFO_STREAM;
+  static const u_int32_t kStreamType = MD_SYSTEM_INFO_STREAM;
 
   explicit MinidumpSystemInfo(Minidump* minidump);
 
@@ -596,7 +596,7 @@ class MinidumpMiscInfo : public MinidumpStream {
  private:
   friend class Minidump;
 
-  static const u_int32_t kStreamType = MISC_INFO_STREAM;
+  static const u_int32_t kStreamType = MD_MISC_INFO_STREAM;
 
   explicit MinidumpMiscInfo(Minidump* minidump_);
 
diff --git a/src/processor/minidump_format.h b/src/processor/minidump_format.h
index b873755f..b939b6c1 100644
--- a/src/processor/minidump_format.h
+++ b/src/processor/minidump_format.h
@@ -434,7 +434,7 @@ typedef struct {
 
 /* For (MDRawHeader).flags: */
 typedef enum {
-  /* MINIDUMP_NORMAL is the standard type of minidump.  It includes full
+  /* MD_NORMAL is the standard type of minidump.  It includes full
    * streams for the thread list, module list, exception, system info,
    * and miscellaneous info.  A memory list stream is also present,
    * pointing to the same stack memory contained in the thread list,
@@ -442,21 +442,21 @@ typedef enum {
    * was executing when the exception occurred.  Stack memory is from
    * 4 bytes below a thread's stack pointer up to the top of the
    * memory region encompassing the stack. */
-  MINIDUMP_NORMAL                            = 0x00000000,
-  MINIDUMP_WITH_DATA_SEGS                    = 0x00000001,
-  MINIDUMP_WITH_FULL_MEMORY                  = 0x00000002,
-  MINIDUMP_WITH_HANDLE_DATA                  = 0x00000004,
-  MINIDUMP_FILTER_MEMORY                     = 0x00000008,
-  MINIDUMP_SCAN_MEMORY                       = 0x00000010,
-  MINIDUMP_WITH_UNLOADED_MODULES             = 0x00000020,
-  MINIDUMP_WITH_INDIRECTLY_REFERENCED_MEMORY = 0x00000040,
-  MINIDUMP_FILTER_MODULE_PATHS               = 0x00000080,
-  MINIDUMP_WITH_PROCESS_THREAD_DATA          = 0x00000100,
-  MINIDUMP_WITH_PRIVATE_READ_WRITE_MEMORY    = 0x00000200,
-  MINIDUMP_WITHOUT_OPTIONAL_DATA             = 0x00000400,
-  MINIDUMP_WITH_FULL_MEMORY_INFO             = 0x00000800,
-  MINIDUMP_WITH_THREAD_INFO                  = 0x00001000,
-  MINIDUMP_WITH_CODE_SEGS                    = 0x00002000
+  MD_NORMAL                            = 0x00000000,
+  MD_WITH_DATA_SEGS                    = 0x00000001,
+  MD_WITH_FULL_MEMORY                  = 0x00000002,
+  MD_WITH_HANDLE_DATA                  = 0x00000004,
+  MD_FILTER_MEMORY                     = 0x00000008,
+  MD_SCAN_MEMORY                       = 0x00000010,
+  MD_WITH_UNLOADED_MODULES             = 0x00000020,
+  MD_WITH_INDIRECTLY_REFERENCED_MEMORY = 0x00000040,
+  MD_FILTER_MODULE_PATHS               = 0x00000080,
+  MD_WITH_PROCESS_THREAD_DATA          = 0x00000100,
+  MD_WITH_PRIVATE_READ_WRITE_MEMORY    = 0x00000200,
+  MD_WITHOUT_OPTIONAL_DATA             = 0x00000400,
+  MD_WITH_FULL_MEMORY_INFO             = 0x00000800,
+  MD_WITH_THREAD_INFO                  = 0x00001000,
+  MD_WITH_CODE_SEGS                    = 0x00002000
 } MDType;  /* MINIDUMP_TYPE */
 
 
@@ -467,23 +467,23 @@ typedef struct {
 
 /* For (MDRawDirectory).stream_type */
 typedef enum {
-  UNUSED_STREAM               =  0,
-  RESERVED_STREAM_0           =  1,
-  RESERVED_STREAM_1           =  2,
-  THREAD_LIST_STREAM          =  3,  /* MDRawThreadList */
-  MODULE_LIST_STREAM          =  4,  /* MDRawModuleList */
-  MEMORY_LIST_STREAM          =  5,  /* MDRawMemoryList */
-  EXCEPTION_STREAM            =  6,  /* MDRawExceptionStream */
-  SYSTEM_INFO_STREAM          =  7,  /* MDRawSystemInfo */
-  THREAD_EX_LIST_STREAM       =  8,
-  MEMORY_64_LIST_STREAM       =  9,
-  COMMENT_STREAM_A            = 10,
-  COMMENT_STREAM_W            = 11,
-  HANDLE_DATA_STREAM          = 12,
-  FUNCTION_TABLE_STREAM       = 13,
-  UNLOADED_MODULE_LIST_STREAM = 14,
-  MISC_INFO_STREAM            = 15,  /* MDRawMiscInfo */
-  LAST_RESERVED_STREAM        = 0x0000ffff
+  MD_UNUSED_STREAM               =  0,
+  MD_RESERVED_STREAM_0           =  1,
+  MD_RESERVED_STREAM_1           =  2,
+  MD_THREAD_LIST_STREAM          =  3,  /* MDRawThreadList */
+  MD_MODULE_LIST_STREAM          =  4,  /* MDRawModuleList */
+  MD_MEMORY_LIST_STREAM          =  5,  /* MDRawMemoryList */
+  MD_EXCEPTION_STREAM            =  6,  /* MDRawExceptionStream */
+  MD_SYSTEM_INFO_STREAM          =  7,  /* MDRawSystemInfo */
+  MD_THREAD_EX_LIST_STREAM       =  8,
+  MD_MEMORY_64_LIST_STREAM       =  9,
+  MD_COMMENT_STREAM_A            = 10,
+  MD_COMMENT_STREAM_W            = 11,
+  MD_HANDLE_DATA_STREAM          = 12,
+  MD_FUNCTION_TABLE_STREAM       = 13,
+  MD_UNLOADED_MODULE_LIST_STREAM = 14,
+  MD_MISC_INFO_STREAM            = 15,  /* MDRawMiscInfo */
+  MD_LAST_RESERVED_STREAM        = 0x0000ffff
 } MDStreamType;  /* MINIDUMP_STREAM_TYPE */