ICU 56 update step 1

source/tools/toolutil/udbgutil.cpp

 /********************************************************************
  * COPYRIGHT:
- * Copyright (c) 2007-2013, International Business Machines Corporation and
+ * Copyright (c) 2007-2015, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 
 #include "udbgutil.h"
 #include <string.h>
 #include "ustr_imp.h"
 #include "cstring.h"
 #include "putilimp.h"
 #include "unicode/ulocdata.h"
 #include "unicode/ucnv.h"
 #include "unicode/unistr.h"
 
 /*
 To add a new enum type
       (For example: UShoeSize  with values USHOE_WIDE=0, USHOE_REGULAR, USHOE_NARROW, USHOE_COUNT)
 
+    0. Make sure that all lines you add are protected with appropriate uconfig guards,
+        such as '#if !UCONFIG_NO_SHOES'.
     1. udbgutil.h:  add  UDBG_UShoeSize to the UDebugEnumType enum before UDBG_ENUM_COUNT
       ( The subsequent steps involve this file, udbgutil.cpp )
     2. Find the marker "Add new enum types above this line"
     3. Before that marker, add a #include of any header file you need.
     4. Each enum type has three things in this section:  a #define, a count_, and an array of Fields.
        It may help to copy and paste a previous definition.
     5. In the case of the USHOE_... strings above, "USHOE_" is common to all values- six characters
          " #define LEN_USHOE 6 "
        6 characters will strip off "USHOE_" leaving enum values of WIDE, REGULAR, and NARROW.
     6. Define the 'count_' variable, with the number of enum values. If the enum has a _MAX or _COUNT value,
@@ skipping 147 matching lines @@
    FIELD_NAME_STR( LEN_UCOL, UCOL_SHIFTED ),
    FIELD_NAME_STR( LEN_UCOL, UCOL_NON_IGNORABLE ),
    // gap
    FIELD_NAME_STR( LEN_UCOL, UCOL_LOWER_FIRST ),
    FIELD_NAME_STR( LEN_UCOL, UCOL_UPPER_FIRST ),
 };
 
 #endif
 
 
+#if UCONFIG_ENABLE_PLUGINS
 #include "unicode/icuplug.h"
 
 #define LEN_UPLUG_REASON 13 /* UPLUG_REASON_ */
 static const int32_t count_UPlugReason = UPLUG_REASON_COUNT;
 static const Field names_UPlugReason[]  = {
    FIELD_NAME_STR( LEN_UPLUG_REASON, UPLUG_REASON_QUERY ),
    FIELD_NAME_STR( LEN_UPLUG_REASON, UPLUG_REASON_LOAD ),
    FIELD_NAME_STR( LEN_UPLUG_REASON, UPLUG_REASON_UNLOAD ),
 };
 
 #define LEN_UPLUG_LEVEL 12 /* UPLUG_LEVEL_ */
 static const int32_t count_UPlugLevel = UPLUG_LEVEL_COUNT;
 static const Field names_UPlugLevel[]  = {
    FIELD_NAME_STR( LEN_UPLUG_LEVEL, UPLUG_LEVEL_INVALID ),
    FIELD_NAME_STR( LEN_UPLUG_LEVEL, UPLUG_LEVEL_UNKNOWN ),
    FIELD_NAME_STR( LEN_UPLUG_LEVEL, UPLUG_LEVEL_LOW ),
    FIELD_NAME_STR( LEN_UPLUG_LEVEL, UPLUG_LEVEL_HIGH ),
 };
+#endif
 
 #define LEN_UDBG 5 /* "UDBG_" */
 static const int32_t count_UDebugEnumType = UDBG_ENUM_COUNT;
 static const Field names_UDebugEnumType[] =
 {
     FIELD_NAME_STR( LEN_UDBG, UDBG_UDebugEnumType ),
 #if !UCONFIG_NO_FORMATTING
     FIELD_NAME_STR( LEN_UDBG, UDBG_UCalendarDateFields ),
     FIELD_NAME_STR( LEN_UDBG, UDBG_UCalendarMonths ),
     FIELD_NAME_STR( LEN_UDBG, UDBG_UDateFormatStyle ),
 #endif
+#if UCONFIG_ENABLE_PLUGINS
     FIELD_NAME_STR( LEN_UDBG, UDBG_UPlugReason ),
     FIELD_NAME_STR( LEN_UDBG, UDBG_UPlugLevel ),
+#endif
     FIELD_NAME_STR( LEN_UDBG, UDBG_UAcceptResult ),
 #if !UCONFIG_NO_COLLATION
     FIELD_NAME_STR( LEN_UDBG, UDBG_UColAttributeValue ),
 #endif
 };
 
 
 // --- Add new enum types above this line ---
 
 #define COUNT_CASE(x)  case UDBG_##x: return (actual?count_##x:DBG_ARRAY_COUNT(names_##x));
 #define COUNT_FAIL_CASE(x) case UDBG_##x: return -1;
 
 #define FIELD_CASE(x)  case UDBG_##x: return names_##x;
 #define FIELD_FAIL_CASE(x) case UDBG_##x: return NULL;
 
 // low level
 
 /**
  * @param type type of item
  * @param actual TRUE: for the actual enum's type (UCAL_FIELD_COUNT, etc), or FALSE for the string count
  */
 static int32_t _udbg_enumCount(UDebugEnumType type, UBool actual) {
         switch(type) {
                 COUNT_CASE(UDebugEnumType)
 #if !UCONFIG_NO_FORMATTING
                 COUNT_CASE(UCalendarDateFields)
                 COUNT_CASE(UCalendarMonths)
                 COUNT_CASE(UDateFormatStyle)
 #endif
+#if UCONFIG_ENABLE_PLUGINS
         COUNT_CASE(UPlugReason)
         COUNT_CASE(UPlugLevel)
+#endif
         COUNT_CASE(UAcceptResult)
 #if !UCONFIG_NO_COLLATION
         COUNT_CASE(UColAttributeValue)
 #endif
                 // COUNT_FAIL_CASE(UNonExistentEnum)
         default:
                 return -1;
         }
 }
 
 static const Field* _udbg_enumFields(UDebugEnumType type) {
         switch(type) {
                 FIELD_CASE(UDebugEnumType)
 #if !UCONFIG_NO_FORMATTING
                 FIELD_CASE(UCalendarDateFields)
                 FIELD_CASE(UCalendarMonths)
                 FIELD_CASE(UDateFormatStyle)
 #endif
+#if UCONFIG_ENABLE_PLUGINS
         FIELD_CASE(UPlugReason)
         FIELD_CASE(UPlugLevel)
+#endif
         FIELD_CASE(UAcceptResult)
-                // FIELD_FAIL_CASE(UNonExistentEnum)
+       // FIELD_FAIL_CASE(UNonExistentEnum)
 #if !UCONFIG_NO_COLLATION
         FIELD_CASE(UColAttributeValue)
 #endif
         default:
                 return NULL;
         }
 }
 
 // implementation
 
@@ skipping 31 matching lines @@
                         return fields[field].num;
                 }
         }
 }
 
 int32_t udbg_enumByName(UDebugEnumType type, const char *value) {
     if(type<0||type>=_udbg_enumCount(UDBG_UDebugEnumType, TRUE)) {
         return -1; // type out of range
     }
         const Field *fields = _udbg_enumFields(type);
-    for(int32_t field = 0;field<_udbg_enumCount(type, FALSE);field++) {
-        if(!strcmp(value, fields[field].str + fields[field].prefix)) {
-            return fields[field].num;
+    if (fields != NULL) {
+        for(int32_t field = 0;field<_udbg_enumCount(type, FALSE);field++) {
+            if(!strcmp(value, fields[field].str + fields[field].prefix)) {
+                return fields[field].num;
+            }
         }
-    }
-    // try with the prefix
-    for(int32_t field = 0;field<_udbg_enumCount(type, FALSE);field++) {
-        if(!strcmp(value, fields[field].str)) {
-            return fields[field].num;
+        // try with the prefix
+        for(int32_t field = 0;field<_udbg_enumCount(type, FALSE);field++) {
+            if(!strcmp(value, fields[field].str)) {
+                return fields[field].num;
+            }
         }
     }
     // fail
     return -1;
 }
 
 /* platform info */
 /**
  * Print the current platform
  */
@@ skipping 427 matching lines @@
     return TRUE;
   }
 }
 
 U_CAPI void udbg_knownIssue_close(void *ptr) {
   KnownIssues *t = static_cast<KnownIssues*>(ptr);
   delete t;
 }
 
 #endif