ICU-12451 CStr class, fix UCONFIG_NO_CONVERSION conditionals, add invariant conversio...

X-SVN-Rev: 38748

diff --git a/icu4c/source/common/cstr.cpp b/icu4c/source/common/cstr.cpp
index c30719361eacc5c083490d145094deb5dbf5e5c4..da5b1e5de260cf3431f79b340fd727ef56296191 100644 (file)
--- a/icu4c/source/common/cstr.cpp
+++ b/icu4c/source/common/cstr.cpp
@@ -6,22 +6,40 @@
 *   file name:  charstr.cpp
 */
 #include "unicode/utypes.h"
+#include "unicode/putil.h"
 #include "unicode/unistr.h"
 
-#include "charstr.h"
 #include "cstr.h"
 
+#include "charstr.h"
+#include "uinvchar.h"
+
 U_NAMESPACE_BEGIN
 
 CStr::CStr(const UnicodeString &in) {
     UErrorCode status = U_ZERO_ERROR;
-    int32_t length = in.extract(0, in.length(), NULL, (uint32_t)0);
+#if !UCONFIG_NO_CONVERSION || U_CHARSET_IS_UTF8
+    int32_t length = in.extract(0, in.length(), static_cast<char *>(NULL), static_cast<uint32_t>(0));
     int32_t resultCapacity = 0;
     char *buf = s.getAppendBuffer(length, length, resultCapacity, status);
     if (U_SUCCESS(status)) {
         in.extract(0, in.length(), buf, resultCapacity);
         s.append(buf, length, status);
     }
+#else
+    // No conversion available. Convert any invariant characters; substitute '?' for the rest.
+    // Note: can't just call u_UCharsToChars() or CharString.appendInvariantChars() on the 
+    //       whole string because they require that the entire input be invariant.
+    char buf[2];
+    for (int i=0; i<in.length(); i = in.moveIndex32(i, 1)) {
+        if (uprv_isInvariantUString(in.getBuffer()+i, 1)) {
+            u_UCharsToChars(in.getBuffer()+i, buf, 1);
+        } else {
+            buf[0] = '?';
+        }
+        s.append(buf, 1, status);
+    }
+#endif
 }
 
 CStr::~CStr() {

diff --git a/icu4c/source/common/cstr.h b/icu4c/source/common/cstr.h
index 7c64aee89170ab8534acb7e0d0fa7566601a925c..12a1e934defc43c38a3d4b335520d89a7053c2b5 100644 (file)
--- a/icu4c/source/common/cstr.h
+++ b/icu4c/source/common/cstr.h
@@ -1,7 +1,7 @@
 /*
 ******************************************************************************
 *
-*   Copyright (C) 2015, International Business Machines
+*   Copyright (C) 2016, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
@@ -19,13 +19,16 @@
 #include "charstr.h"
 
 /**
- * ICU-internal class CStr, a small helper class to facilitate passing UnicodStrings
+ * ICU-internal class CStr, a small helper class to facilitate passing UnicodeStrings
  * to functions needing (const char *) strings, such as printf().
  *
  * It is intended primarily for use in debugging or in tests. Uses platform 
  * default code page conversion, which will do the best job possible,
  * but may be lossy, depending on the platform.
  *
+ * If no other conversion is available, use invariant conversion and substitue
+ * '?' for non-invariant characters.
+ *
  * Example Usage:
  *   UnicodeString s = whatever;
  *   printf("%s", CStr(s)());