Restoring authorship annotation for <mcheshkov@yandex-team.ru>. Commit 2 of 2.

1 files changed, 281 insertions, 281 deletions

diff --git a/contrib/libs/icu/include/unicode/uspoof.h b/contrib/libs/icu/include/unicode/uspoof.h
index acc03f5378..63a13387b0 100644
--- a/contrib/libs/icu/include/unicode/uspoof.h
+++ b/contrib/libs/icu/include/unicode/uspoof.h
@@ -1,4 +1,4 @@
-// © 2016 and later: Unicode, Inc. and others. 
+// © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html
 /*
 ***************************************************************************
@@ -6,7 +6,7 @@
 * and others. All Rights Reserved.
 ***************************************************************************
 *   file name:  uspoof.h
-*   encoding:   UTF-8 
+*   encoding:   UTF-8
 *   tab size:   8 (not used)
 *   indentation:4
 *
@@ -353,18 +353,18 @@
  * @stable ICU 4.6
  */
 
-U_CDECL_BEGIN 
- 
+U_CDECL_BEGIN
+
 struct USpoofChecker;
-/** 
- * @stable ICU 4.2 
- */ 
+/**
+ * @stable ICU 4.2
+ */
 typedef struct USpoofChecker USpoofChecker; /**< typedef for C of USpoofChecker */
 
 struct USpoofCheckResult;
 /**
  * @see uspoof_openCheckResult
- * @stable ICU 58 
+ * @stable ICU 58
  */
 typedef struct USpoofCheckResult USpoofCheckResult;
 
@@ -413,7 +413,7 @@ typedef enum USpoofChecks {
      *
      * @see uspoof_areConfusable
      * @see uspoof_getSkeleton
-     * @stable ICU 58 
+     * @stable ICU 58
      */
     USPOOF_CONFUSABLE               =   USPOOF_SINGLE_SCRIPT_CONFUSABLE | USPOOF_MIXED_SCRIPT_CONFUSABLE | USPOOF_WHOLE_SCRIPT_CONFUSABLE,
 
@@ -465,7 +465,7 @@ typedef enum USpoofChecks {
       */
     USPOOF_CHAR_LIMIT               =  64,
 
-    /** 
+    /**
      * Check that an identifier does not mix numbers from different numbering systems.
      * For more information, see UTS 39 section 5.3.
      *
@@ -473,27 +473,27 @@ typedef enum USpoofChecks {
      */
     USPOOF_MIXED_NUMBERS            = 128,
 
-    /** 
-     * Check that an identifier does not have a combining character following a character in which that 
-     * combining character would be hidden; for example 'i' followed by a U+0307 combining dot. 
-     * 
-     * More specifically, the following characters are forbidden from preceding a U+0307: 
-     * <ul> 
-     * <li>Those with the Soft_Dotted Unicode property (which includes 'i' and 'j')</li> 
-     * <li>Latin lowercase letter 'l'</li> 
-     * <li>Dotless 'i' and 'j' ('ı' and 'ȷ', U+0131 and U+0237)</li> 
-     * <li>Any character whose confusable prototype ends with such a character 
-     * (Soft_Dotted, 'l', 'ı', or 'ȷ')</li> 
-     * </ul> 
-     * In addition, combining characters are allowed between the above characters and U+0307 except those 
-     * with combining class 0 or combining class "Above" (230, same class as U+0307). 
-     * 
-     * This list and the number of combing characters considered by this check may grow over time. 
-     * 
-     * @stable ICU 62 
-     */ 
-    USPOOF_HIDDEN_OVERLAY            = 256, 
- 
+    /**
+     * Check that an identifier does not have a combining character following a character in which that
+     * combining character would be hidden; for example 'i' followed by a U+0307 combining dot.
+     *
+     * More specifically, the following characters are forbidden from preceding a U+0307:
+     * <ul>
+     * <li>Those with the Soft_Dotted Unicode property (which includes 'i' and 'j')</li>
+     * <li>Latin lowercase letter 'l'</li>
+     * <li>Dotless 'i' and 'j' ('ı' and 'ȷ', U+0131 and U+0237)</li>
+     * <li>Any character whose confusable prototype ends with such a character
+     * (Soft_Dotted, 'l', 'ı', or 'ȷ')</li>
+     * </ul>
+     * In addition, combining characters are allowed between the above characters and U+0307 except those
+     * with combining class 0 or combining class "Above" (230, same class as U+0307).
+     *
+     * This list and the number of combing characters considered by this check may grow over time.
+     *
+     * @stable ICU 62
+     */
+    USPOOF_HIDDEN_OVERLAY            = 256,
+
    /**
      * Enable all spoof checks.
      *
@@ -986,9 +986,9 @@ uspoof_checkUTF8(const USpoofChecker *sc,
  * @see uspoof_openCheckResult
  * @see uspoof_check2UTF8
  * @see uspoof_check2UnicodeString
- * @stable ICU 58 
+ * @stable ICU 58
  */
-U_STABLE int32_t U_EXPORT2 
+U_STABLE int32_t U_EXPORT2
 uspoof_check2(const USpoofChecker *sc,
     const UChar* id, int32_t length,
     USpoofCheckResult* checkResult,
@@ -1023,9 +1023,9 @@ uspoof_check2(const USpoofChecker *sc,
  * @see uspoof_openCheckResult
  * @see uspoof_check2
  * @see uspoof_check2UnicodeString
- * @stable ICU 58 
+ * @stable ICU 58
  */
-U_STABLE int32_t U_EXPORT2 
+U_STABLE int32_t U_EXPORT2
 uspoof_check2UTF8(const USpoofChecker *sc,
     const char *id, int32_t length,
     USpoofCheckResult* checkResult,
@@ -1047,9 +1047,9 @@ uspoof_check2UTF8(const USpoofChecker *sc,
  * @see uspoof_check2
  * @see uspoof_check2UTF8
  * @see uspoof_check2UnicodeString
- * @stable ICU 58 
+ * @stable ICU 58
  */
-U_STABLE USpoofCheckResult* U_EXPORT2 
+U_STABLE USpoofCheckResult* U_EXPORT2
 uspoof_openCheckResult(UErrorCode *status);
 
 /**
@@ -1057,9 +1057,9 @@ uspoof_openCheckResult(UErrorCode *status);
  *   its implementation.
  *
  * @param checkResult  The instance of USpoofCheckResult to close
- * @stable ICU 58 
+ * @stable ICU 58
  */
-U_STABLE void U_EXPORT2 
+U_STABLE void U_EXPORT2
 uspoof_closeCheckResult(USpoofCheckResult *checkResult);
 
 /**
@@ -1074,9 +1074,9 @@ uspoof_closeCheckResult(USpoofCheckResult *checkResult);
  *                will be zero if the input string passes all of the
  *                enabled checks.
  * @see uspoof_setChecks
- * @stable ICU 58 
+ * @stable ICU 58
  */
-U_STABLE int32_t U_EXPORT2 
+U_STABLE int32_t U_EXPORT2
 uspoof_getCheckResultChecks(const USpoofCheckResult *checkResult, UErrorCode *status);
 
 /**
@@ -1087,9 +1087,9 @@ uspoof_getCheckResultChecks(const USpoofCheckResult *checkResult, UErrorCode *st
  * @param status       The error code, set if an error occurred.
  * @return             The restriction level contained in the USpoofCheckResult
  * @see uspoof_setRestrictionLevel
- * @stable ICU 58 
+ * @stable ICU 58
  */
-U_STABLE URestrictionLevel U_EXPORT2 
+U_STABLE URestrictionLevel U_EXPORT2
 uspoof_getCheckResultRestrictionLevel(const USpoofCheckResult *checkResult, UErrorCode *status);
 
 /**
@@ -1101,9 +1101,9 @@ uspoof_getCheckResultRestrictionLevel(const USpoofCheckResult *checkResult, UErr
  * @param checkResult  The instance of USpoofCheckResult created by {@link uspoof_openCheckResult}
  * @return             The set of numerics contained in the USpoofCheckResult
  * @param status       The error code, set if an error occurred.
- * @stable ICU 58 
+ * @stable ICU 58
  */
-U_STABLE const USet* U_EXPORT2 
+U_STABLE const USet* U_EXPORT2
 uspoof_getCheckResultNumerics(const USpoofCheckResult *checkResult, UErrorCode *status);
 
 
@@ -1300,244 +1300,244 @@ uspoof_getInclusionSet(UErrorCode *status);
 U_STABLE const USet * U_EXPORT2
 uspoof_getRecommendedSet(UErrorCode *status);
 
-/** 
- * Serialize the data for a spoof detector into a chunk of memory. 
- * The flattened spoof detection tables can later be used to efficiently 
- * instantiate a new Spoof Detector. 
- * 
- * The serialized spoof checker includes only the data compiled from the 
- * Unicode data tables by uspoof_openFromSource(); it does not include 
- * include any other state or configuration that may have been set. 
- * 
- * @param sc   the Spoof Detector whose data is to be serialized. 
- * @param data a pointer to 32-bit-aligned memory to be filled with the data, 
- *             can be NULL if capacity==0 
- * @param capacity the number of bytes available at data, 
- *                 or 0 for preflighting 
- * @param status an in/out ICU UErrorCode; possible errors include: 
- * - U_BUFFER_OVERFLOW_ERROR if the data storage block is too small for serialization 
- * - U_ILLEGAL_ARGUMENT_ERROR  the data or capacity parameters are bad 
- * @return the number of bytes written or needed for the spoof data 
- * 
- * @see utrie2_openFromSerialized() 
- * @stable ICU 4.2 
- */ 
-U_STABLE int32_t U_EXPORT2 
-uspoof_serialize(USpoofChecker *sc, 
-                 void *data, int32_t capacity, 
-                 UErrorCode *status); 
- 
-U_CDECL_END 
- 
+/**
+ * Serialize the data for a spoof detector into a chunk of memory.
+ * The flattened spoof detection tables can later be used to efficiently
+ * instantiate a new Spoof Detector.
+ *
+ * The serialized spoof checker includes only the data compiled from the
+ * Unicode data tables by uspoof_openFromSource(); it does not include
+ * include any other state or configuration that may have been set.
+ *
+ * @param sc   the Spoof Detector whose data is to be serialized.
+ * @param data a pointer to 32-bit-aligned memory to be filled with the data,
+ *             can be NULL if capacity==0
+ * @param capacity the number of bytes available at data,
+ *                 or 0 for preflighting
+ * @param status an in/out ICU UErrorCode; possible errors include:
+ * - U_BUFFER_OVERFLOW_ERROR if the data storage block is too small for serialization
+ * - U_ILLEGAL_ARGUMENT_ERROR  the data or capacity parameters are bad
+ * @return the number of bytes written or needed for the spoof data
+ *
+ * @see utrie2_openFromSerialized()
+ * @stable ICU 4.2
+ */
+U_STABLE int32_t U_EXPORT2
+uspoof_serialize(USpoofChecker *sc,
+                 void *data, int32_t capacity,
+                 UErrorCode *status);
+
+U_CDECL_END
+
 #if U_SHOW_CPLUSPLUS_API
 
-U_NAMESPACE_BEGIN 
- 
+U_NAMESPACE_BEGIN
+
+/**
+ * \class LocalUSpoofCheckerPointer
+ * "Smart pointer" class, closes a USpoofChecker via uspoof_close().
+ * For most methods see the LocalPointerBase base class.
+ *
+ * @see LocalPointerBase
+ * @see LocalPointer
+ * @stable ICU 4.4
+ */
+/**
+ * \cond
+ * Note: Doxygen is giving a bogus warning on this U_DEFINE_LOCAL_OPEN_POINTER.
+ *       For now, suppress with a Doxygen cond
+ */
+U_DEFINE_LOCAL_OPEN_POINTER(LocalUSpoofCheckerPointer, USpoofChecker, uspoof_close);
+/** \endcond */
+
+/**
+ * \class LocalUSpoofCheckResultPointer
+ * "Smart pointer" class, closes a USpoofCheckResult via `uspoof_closeCheckResult()`.
+ * For most methods see the LocalPointerBase base class.
+ *
+ * @see LocalPointerBase
+ * @see LocalPointer
+ * @stable ICU 58
+ */
+
+/**
+ * \cond
+ * Note: Doxygen is giving a bogus warning on this U_DEFINE_LOCAL_OPEN_POINTER.
+ *       For now, suppress with a Doxygen cond
+ */
+U_DEFINE_LOCAL_OPEN_POINTER(LocalUSpoofCheckResultPointer, USpoofCheckResult, uspoof_closeCheckResult);
+/** \endcond */
+
+U_NAMESPACE_END
+
+/**
+ * Limit the acceptable characters to those specified by a Unicode Set.
+ *   Any previously specified character limit is
+ *   is replaced by the new settings.    This includes limits on
+ *   characters that were set with the uspoof_setAllowedLocales() function.
+ *
+ * The USPOOF_CHAR_LIMIT test is automatically enabled for this
+ * USoofChecker by this function.
+ *
+ * @param sc       The USpoofChecker
+ * @param chars    A Unicode Set containing the list of
+ *                 characters that are permitted.  Ownership of the set
+ *                 remains with the caller.  The incoming set is cloned by
+ *                 this function, so there are no restrictions on modifying
+ *                 or deleting the UnicodeSet after calling this function.
+ * @param status   The error code, set if this function encounters a problem.
+ * @stable ICU 4.2
+ */
+U_STABLE void U_EXPORT2
+uspoof_setAllowedUnicodeSet(USpoofChecker *sc, const icu::UnicodeSet *chars, UErrorCode *status);
+
+
+/**
+ * Get a UnicodeSet for the characters permitted in an identifier.
+ * This corresponds to the limits imposed by the Set Allowed Characters /
+ * UnicodeSet functions. Limitations imposed by other checks will not be
+ * reflected in the set returned by this function.
+ *
+ * The returned set will be frozen, meaning that it cannot be modified
+ * by the caller.
+ *
+ * Ownership of the returned set remains with the Spoof Detector.  The
+ * returned set will become invalid if the spoof detector is closed,
+ * or if a new set of allowed characters is specified.
+ *
+ *
+ * @param sc       The USpoofChecker
+ * @param status   The error code, set if this function encounters a problem.
+ * @return         A UnicodeSet containing the characters that are permitted by
+ *                 the USPOOF_CHAR_LIMIT test.
+ * @stable ICU 4.2
+ */
+U_STABLE const icu::UnicodeSet * U_EXPORT2
+uspoof_getAllowedUnicodeSet(const USpoofChecker *sc, UErrorCode *status);
+
+/**
+ * Check the specified string for possible security issues.
+ * The text to be checked will typically be an identifier of some sort.
+ * The set of checks to be performed is specified with uspoof_setChecks().
+ *
+ * \note
+ *   Consider using the newer API, {@link uspoof_check2UnicodeString}, instead.
+ *   The newer API exposes additional information from the check procedure
+ *   and is otherwise identical to this method.
+ *
+ * @param sc      The USpoofChecker
+ * @param id      A identifier to be checked for possible security issues.
+ * @param position  Deprecated in ICU 51.  Always returns zero.
+ *                Originally, an out parameter for the index of the first
+ *                string position that failed a check.
+ *                This parameter may be NULL.
+ * @param status  The error code, set if an error occurred while attempting to
+ *                perform the check.
+ *                Spoofing or security issues detected with the input string are
+ *                not reported here, but through the function's return value.
+ * @return        An integer value with bits set for any potential security
+ *                or spoofing issues detected.  The bits are defined by
+ *                enum USpoofChecks.  (returned_value & USPOOF_ALL_CHECKS)
+ *                will be zero if the input string passes all of the
+ *                enabled checks.
+ * @see uspoof_check2UnicodeString
+ * @stable ICU 4.2
+ */
+U_STABLE int32_t U_EXPORT2
+uspoof_checkUnicodeString(const USpoofChecker *sc,
+                          const icu::UnicodeString &id,
+                          int32_t *position,
+                          UErrorCode *status);
+
+/**
+ * Check the specified string for possible security issues.
+ * The text to be checked will typically be an identifier of some sort.
+ * The set of checks to be performed is specified with uspoof_setChecks().
+ *
+ * @param sc      The USpoofChecker
+ * @param id      A identifier to be checked for possible security issues.
+ * @param checkResult  An instance of USpoofCheckResult to be filled with
+ *                details about the identifier.  Can be NULL.
+ * @param status  The error code, set if an error occurred while attempting to
+ *                perform the check.
+ *                Spoofing or security issues detected with the input string are
+ *                not reported here, but through the function's return value.
+ * @return        An integer value with bits set for any potential security
+ *                or spoofing issues detected.  The bits are defined by
+ *                enum USpoofChecks.  (returned_value & USPOOF_ALL_CHECKS)
+ *                will be zero if the input string passes all of the
+ *                enabled checks.  Any information in this bitmask will be
+ *                consistent with the information saved in the optional
+ *                checkResult parameter.
+ * @see uspoof_openCheckResult
+ * @see uspoof_check2
+ * @see uspoof_check2UTF8
+ * @stable ICU 58
+ */
+U_STABLE int32_t U_EXPORT2
+uspoof_check2UnicodeString(const USpoofChecker *sc,
+    const icu::UnicodeString &id,
+    USpoofCheckResult* checkResult,
+    UErrorCode *status);
+
+/**
+ * A version of {@link uspoof_areConfusable} accepting UnicodeStrings.
+ *
+ * @param sc      The USpoofChecker
+ * @param s1     The first of the two identifiers to be compared for
+ *                confusability.  The strings are in UTF-8 format.
+ * @param s2     The second of the two identifiers to be compared for
+ *                confusability.  The strings are in UTF-8 format.
+ * @param status  The error code, set if an error occurred while attempting to
+ *                perform the check.
+ *                Confusability of the identifiers is not reported here,
+ *                but through this function's return value.
+ * @return        An integer value with bit(s) set corresponding to
+ *                the type of confusability found, as defined by
+ *                enum USpoofChecks.  Zero is returned if the identifiers
+ *                are not confusable.
+ *
+ * @stable ICU 4.2
+ *
+ * @see uspoof_areConfusable
+ */
+U_STABLE int32_t U_EXPORT2
+uspoof_areConfusableUnicodeString(const USpoofChecker *sc,
+                                  const icu::UnicodeString &s1,
+                                  const icu::UnicodeString &s2,
+                                  UErrorCode *status);
+
+/**
+ *  Get the "skeleton" for an identifier.
+ *  Skeletons are a transformation of the input identifier;
+ *  Two identifiers are confusable if their skeletons are identical.
+ *  See Unicode UAX #39 for additional information.
+ *
+ *  Using skeletons directly makes it possible to quickly check
+ *  whether an identifier is confusable with any of some large
+ *  set of existing identifiers, by creating an efficiently
+ *  searchable collection of the skeletons.
+ *
+ * @param sc      The USpoofChecker.
+ * @param type    Deprecated in ICU 58.  You may pass any number.
+ *                Originally, controlled which of the Unicode confusable data
+ *                tables to use.
+ * @param id      The input identifier whose skeleton will be computed.
+ * @param dest    The output identifier, to receive the skeleton string.
+ * @param status  The error code, set if an error occurred while attempting to
+ *                perform the check.
+ * @return        A reference to the destination (skeleton) string.
+ *
+ * @stable ICU 4.2
+ */
+U_I18N_API icu::UnicodeString & U_EXPORT2
+uspoof_getSkeletonUnicodeString(const USpoofChecker *sc,
+                                uint32_t type,
+                                const icu::UnicodeString &id,
+                                icu::UnicodeString &dest,
+                                UErrorCode *status);
+
 /**
- * \class LocalUSpoofCheckerPointer 
- * "Smart pointer" class, closes a USpoofChecker via uspoof_close(). 
- * For most methods see the LocalPointerBase base class. 
- * 
- * @see LocalPointerBase 
- * @see LocalPointer 
- * @stable ICU 4.4 
- */ 
-/** 
- * \cond 
- * Note: Doxygen is giving a bogus warning on this U_DEFINE_LOCAL_OPEN_POINTER. 
- *       For now, suppress with a Doxygen cond 
- */ 
-U_DEFINE_LOCAL_OPEN_POINTER(LocalUSpoofCheckerPointer, USpoofChecker, uspoof_close); 
-/** \endcond */ 
- 
-/** 
- * \class LocalUSpoofCheckResultPointer 
- * "Smart pointer" class, closes a USpoofCheckResult via `uspoof_closeCheckResult()`. 
- * For most methods see the LocalPointerBase base class. 
- * 
- * @see LocalPointerBase 
- * @see LocalPointer 
- * @stable ICU 58 
- */ 
- 
-/** 
- * \cond 
- * Note: Doxygen is giving a bogus warning on this U_DEFINE_LOCAL_OPEN_POINTER. 
- *       For now, suppress with a Doxygen cond 
- */ 
-U_DEFINE_LOCAL_OPEN_POINTER(LocalUSpoofCheckResultPointer, USpoofCheckResult, uspoof_closeCheckResult); 
-/** \endcond */ 
- 
-U_NAMESPACE_END 
- 
-/** 
- * Limit the acceptable characters to those specified by a Unicode Set. 
- *   Any previously specified character limit is 
- *   is replaced by the new settings.    This includes limits on 
- *   characters that were set with the uspoof_setAllowedLocales() function. 
- * 
- * The USPOOF_CHAR_LIMIT test is automatically enabled for this 
- * USoofChecker by this function. 
- * 
- * @param sc       The USpoofChecker 
- * @param chars    A Unicode Set containing the list of 
- *                 characters that are permitted.  Ownership of the set 
- *                 remains with the caller.  The incoming set is cloned by 
- *                 this function, so there are no restrictions on modifying 
- *                 or deleting the UnicodeSet after calling this function. 
- * @param status   The error code, set if this function encounters a problem. 
- * @stable ICU 4.2 
- */ 
-U_STABLE void U_EXPORT2 
-uspoof_setAllowedUnicodeSet(USpoofChecker *sc, const icu::UnicodeSet *chars, UErrorCode *status); 
- 
- 
-/** 
- * Get a UnicodeSet for the characters permitted in an identifier. 
- * This corresponds to the limits imposed by the Set Allowed Characters / 
- * UnicodeSet functions. Limitations imposed by other checks will not be 
- * reflected in the set returned by this function. 
- * 
- * The returned set will be frozen, meaning that it cannot be modified 
- * by the caller. 
- * 
- * Ownership of the returned set remains with the Spoof Detector.  The 
- * returned set will become invalid if the spoof detector is closed, 
- * or if a new set of allowed characters is specified. 
- * 
- * 
- * @param sc       The USpoofChecker 
- * @param status   The error code, set if this function encounters a problem. 
- * @return         A UnicodeSet containing the characters that are permitted by 
- *                 the USPOOF_CHAR_LIMIT test. 
- * @stable ICU 4.2 
- */ 
-U_STABLE const icu::UnicodeSet * U_EXPORT2 
-uspoof_getAllowedUnicodeSet(const USpoofChecker *sc, UErrorCode *status); 
- 
-/** 
- * Check the specified string for possible security issues. 
- * The text to be checked will typically be an identifier of some sort. 
- * The set of checks to be performed is specified with uspoof_setChecks(). 
- * 
- * \note 
- *   Consider using the newer API, {@link uspoof_check2UnicodeString}, instead. 
- *   The newer API exposes additional information from the check procedure 
- *   and is otherwise identical to this method. 
- * 
- * @param sc      The USpoofChecker 
- * @param id      A identifier to be checked for possible security issues. 
- * @param position  Deprecated in ICU 51.  Always returns zero. 
- *                Originally, an out parameter for the index of the first 
- *                string position that failed a check. 
- *                This parameter may be NULL. 
- * @param status  The error code, set if an error occurred while attempting to 
- *                perform the check. 
- *                Spoofing or security issues detected with the input string are 
- *                not reported here, but through the function's return value. 
- * @return        An integer value with bits set for any potential security 
- *                or spoofing issues detected.  The bits are defined by 
- *                enum USpoofChecks.  (returned_value & USPOOF_ALL_CHECKS) 
- *                will be zero if the input string passes all of the 
- *                enabled checks. 
- * @see uspoof_check2UnicodeString 
- * @stable ICU 4.2 
- */ 
-U_STABLE int32_t U_EXPORT2 
-uspoof_checkUnicodeString(const USpoofChecker *sc, 
-                          const icu::UnicodeString &id, 
-                          int32_t *position, 
-                          UErrorCode *status); 
- 
-/** 
- * Check the specified string for possible security issues. 
- * The text to be checked will typically be an identifier of some sort. 
- * The set of checks to be performed is specified with uspoof_setChecks(). 
- * 
- * @param sc      The USpoofChecker 
- * @param id      A identifier to be checked for possible security issues. 
- * @param checkResult  An instance of USpoofCheckResult to be filled with 
- *                details about the identifier.  Can be NULL. 
- * @param status  The error code, set if an error occurred while attempting to 
- *                perform the check. 
- *                Spoofing or security issues detected with the input string are 
- *                not reported here, but through the function's return value. 
- * @return        An integer value with bits set for any potential security 
- *                or spoofing issues detected.  The bits are defined by 
- *                enum USpoofChecks.  (returned_value & USPOOF_ALL_CHECKS) 
- *                will be zero if the input string passes all of the 
- *                enabled checks.  Any information in this bitmask will be 
- *                consistent with the information saved in the optional 
- *                checkResult parameter. 
- * @see uspoof_openCheckResult 
- * @see uspoof_check2 
- * @see uspoof_check2UTF8 
- * @stable ICU 58 
- */ 
-U_STABLE int32_t U_EXPORT2 
-uspoof_check2UnicodeString(const USpoofChecker *sc, 
-    const icu::UnicodeString &id, 
-    USpoofCheckResult* checkResult, 
-    UErrorCode *status); 
- 
-/** 
- * A version of {@link uspoof_areConfusable} accepting UnicodeStrings. 
- * 
- * @param sc      The USpoofChecker 
- * @param s1     The first of the two identifiers to be compared for 
- *                confusability.  The strings are in UTF-8 format. 
- * @param s2     The second of the two identifiers to be compared for 
- *                confusability.  The strings are in UTF-8 format. 
- * @param status  The error code, set if an error occurred while attempting to 
- *                perform the check. 
- *                Confusability of the identifiers is not reported here, 
- *                but through this function's return value. 
- * @return        An integer value with bit(s) set corresponding to 
- *                the type of confusability found, as defined by 
- *                enum USpoofChecks.  Zero is returned if the identifiers 
- *                are not confusable. 
- * 
- * @stable ICU 4.2 
- * 
- * @see uspoof_areConfusable 
- */ 
-U_STABLE int32_t U_EXPORT2 
-uspoof_areConfusableUnicodeString(const USpoofChecker *sc, 
-                                  const icu::UnicodeString &s1, 
-                                  const icu::UnicodeString &s2, 
-                                  UErrorCode *status); 
- 
-/** 
- *  Get the "skeleton" for an identifier. 
- *  Skeletons are a transformation of the input identifier; 
- *  Two identifiers are confusable if their skeletons are identical. 
- *  See Unicode UAX #39 for additional information. 
- * 
- *  Using skeletons directly makes it possible to quickly check 
- *  whether an identifier is confusable with any of some large 
- *  set of existing identifiers, by creating an efficiently 
- *  searchable collection of the skeletons. 
- * 
- * @param sc      The USpoofChecker. 
- * @param type    Deprecated in ICU 58.  You may pass any number. 
- *                Originally, controlled which of the Unicode confusable data 
- *                tables to use. 
- * @param id      The input identifier whose skeleton will be computed. 
- * @param dest    The output identifier, to receive the skeleton string. 
- * @param status  The error code, set if an error occurred while attempting to 
- *                perform the check. 
- * @return        A reference to the destination (skeleton) string. 
- * 
- * @stable ICU 4.2 
- */ 
-U_I18N_API icu::UnicodeString & U_EXPORT2 
-uspoof_getSkeletonUnicodeString(const USpoofChecker *sc, 
-                                uint32_t type, 
-                                const icu::UnicodeString &id, 
-                                icu::UnicodeString &dest, 
-                                UErrorCode *status); 
- 
-/** 
   * Get the set of Candidate Characters for Inclusion in Identifiers, as defined
   * in http://unicode.org/Public/security/latest/xidmodifications.txt
   * and documented in http://www.unicode.org/reports/tr39/, Unicode Security Mechanisms.
@@ -1569,6 +1569,6 @@ uspoof_getRecommendedUnicodeSet(UErrorCode *status);
 
 #endif /* U_SHOW_CPLUSPLUS_API */
 
-#endif /* UCONFIG_NO_NORMALIZATION */ 
+#endif /* UCONFIG_NO_NORMALIZATION */
 
 #endif   /* USPOOF_H */