aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralmaslov <almaslov@yandex-team.ru>2022-02-10 16:47:35 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:47:35 +0300
commite95333de1601929cf26176ba4dfb31ea11a9d8e6 (patch)
tree4ca18e5e0d5eac73ae1539fbc22011612c7c1577
parent3d9f012b4a922bdd0b9421963aa5985c2096028f (diff)
downloadydb-e95333de1601929cf26176ba4dfb31ea11a9d8e6.tar.gz
Restoring authorship annotation for <almaslov@yandex-team.ru>. Commit 1 of 2.
-rw-r--r--contrib/libs/libidn/idna.c18
-rw-r--r--contrib/libs/libidn/idna.h8
-rw-r--r--library/cpp/uri/common.h4
-rw-r--r--library/cpp/uri/encodefsm.rl616
-rw-r--r--library/cpp/uri/parsefsm.rl62
-rw-r--r--library/cpp/uri/uri_ut.cpp8
6 files changed, 28 insertions, 28 deletions
diff --git a/contrib/libs/libidn/idna.c b/contrib/libs/libidn/idna.c
index af3f24d58e..55faee3a7f 100644
--- a/contrib/libs/libidn/idna.c
+++ b/contrib/libs/libidn/idna.c
@@ -77,7 +77,7 @@ static char* STRCAT(char* destination, const char* source) {
* @in: input array with unicode code points.
* @inlen: length of input array with unicode code points.
* @out: output zero terminated string that must have room for at
- * least IDNA_LABEL_MAX_LENGTH characters plus the terminating zero.
+ * least IDNA_LABEL_MAX_LENGTH characters plus the terminating zero.
* @flags: an #Idna_flags value, e.g., %IDNA_ALLOW_UNASSIGNED or
* %IDNA_USE_STD3_ASCII_RULES.
*
@@ -230,13 +230,13 @@ step3:
if (src[i] > 0x7F)
inasciirange = 0;
/* copy string to output buffer if we are about to skip to step8 */
- if (i < IDNA_LABEL_MAX_LENGTH)
+ if (i < IDNA_LABEL_MAX_LENGTH)
out[i] = src[i];
}
- if (i < IDNA_LABEL_MAX_LENGTH + 1)
+ if (i < IDNA_LABEL_MAX_LENGTH + 1)
out[i] = '\0';
else
- out[IDNA_LABEL_MAX_LENGTH] = 0;
+ out[IDNA_LABEL_MAX_LENGTH] = 0;
if (inasciirange)
goto step8;
}
@@ -268,7 +268,7 @@ step3:
for (len = 0; src[len]; len++)
;
src[len] = '\0';
- outlen = IDNA_LABEL_MAX_LENGTH - STRLEN (IDNA_ACE_PREFIX);
+ outlen = IDNA_LABEL_MAX_LENGTH - STRLEN (IDNA_ACE_PREFIX);
rc = punycode_encode (len, src, NULL,
&outlen, &out[STRLEN (IDNA_ACE_PREFIX)]);
if (rc != PUNYCODE_SUCCESS)
@@ -285,13 +285,13 @@ step3:
memcpy (out, IDNA_ACE_PREFIX, STRLEN (IDNA_ACE_PREFIX));
/*
- * 8. Verify that the number of code points is in the range 1 to IDNA_LABEL_MAX_LENGTH
+ * 8. Verify that the number of code points is in the range 1 to IDNA_LABEL_MAX_LENGTH
* inclusive (0 is excluded).
*/
step8:
free (src);
- if (STRLEN (out) < 1 || STRLEN (out) > IDNA_LABEL_MAX_LENGTH - 1)
+ if (STRLEN (out) < 1 || STRLEN (out) > IDNA_LABEL_MAX_LENGTH - 1)
return IDNA_INVALID_LENGTH;
return IDNA_SUCCESS;
@@ -303,7 +303,7 @@ idna_to_unicode_internal (char *utf8in,
uint32_t * out, size_t * outlen, int flags)
{
int rc;
- char tmpout[IDNA_LABEL_MAX_LENGTH + 1];
+ char tmpout[IDNA_LABEL_MAX_LENGTH + 1];
size_t utf8len = STRLEN (utf8in) + 1;
size_t addlen = 0;
@@ -857,7 +857,7 @@ idna_to_unicode_lzlz (const char *input, char **output, int flags)
* @IDNA_CONTAINS_MINUS: For IDNA_USE_STD3_ASCII_RULES, indicate that
* the string contains a leading or trailing hyphen-minus (U+002D).
* @IDNA_INVALID_LENGTH: The final output string is not within the
- * (inclusive) range 1 to IDNA_LABEL_MAX_LENGTH characters.
+ * (inclusive) range 1 to IDNA_LABEL_MAX_LENGTH characters.
* @IDNA_NO_ACE_PREFIX: The string does not contain the ACE prefix
* (for ToUnicode).
* @IDNA_ROUNDTRIP_VERIFY_ERROR: The ToASCII operation on output
diff --git a/contrib/libs/libidn/idna.h b/contrib/libs/libidn/idna.h
index afbfc737ca..f6ee9ddbbb 100644
--- a/contrib/libs/libidn/idna.h
+++ b/contrib/libs/libidn/idna.h
@@ -61,10 +61,10 @@ extern "C"
# define IDNA_ACE_PREFIX "xn--"
# endif
-# ifndef IDNA_LABEL_MAX_LENGTH
-# define IDNA_LABEL_MAX_LENGTH 255
-# endif
-
+# ifndef IDNA_LABEL_MAX_LENGTH
+# define IDNA_LABEL_MAX_LENGTH 255
+# endif
+
extern const char *idna_strerror (Idna_rc rc);
/* Core functions */
diff --git a/library/cpp/uri/common.h b/library/cpp/uri/common.h
index 8025357763..5d044df3b5 100644
--- a/library/cpp/uri/common.h
+++ b/library/cpp/uri/common.h
@@ -356,10 +356,10 @@ namespace NUri {
FeaturesCheckSpecialChar = 0 | FeatureEncodeSpace | FeatureEncodeCntrl | FeatureEncodePercent,
FeaturesEncodePChar = 0 | FeatureUpperEncoded | FeaturesEncodeDecode | FeaturesCheckSpecialChar,
-
+
// http://wiki.yandex-team.ru/robot/newDesign/dups/normolization
FeaturesRecommended = 0 | FeatureSchemeKnown | FeatureRemoteOnly | FeatureToLower | FeatureCheckHost | FeatureConvertHostIDN | FeatureHashBangToEscapedFragment | FeatureEncodeSpace | FeatureEncodeCntrl | FeatureEncodeExtendedASCII | FeatureUpperEncoded | FeatureDecodeUnreserved | FeaturePathOperation | FeaturePathStripRootParent,
-
+
FeaturesRobot = FeaturesRecommended
};
};
diff --git a/library/cpp/uri/encodefsm.rl6 b/library/cpp/uri/encodefsm.rl6
index 6a323aa85a..c28f6daed5 100644
--- a/library/cpp/uri/encodefsm.rl6
+++ b/library/cpp/uri/encodefsm.rl6
@@ -20,16 +20,16 @@ namespace NEncode {
> { HexReset(); }
% { DoHex(); };
- bad_escaped = ( "%" hex )
- % {
- DoSym(*(fpc - 2));
- DoSym(*(fpc - 1));
- };
+ bad_escaped = ( "%" hex )
+ % {
+ DoSym(*(fpc - 2));
+ DoSym(*(fpc - 1));
+ };
- sym = (any - bad_escaped - escaped) %{ DoSym(*(fpc - 1)); };
-
- main := ( escaped | bad_escaped | sym )**;
+ sym = (any - bad_escaped - escaped) %{ DoSym(*(fpc - 1)); };
+ main := ( escaped | bad_escaped | sym )**;
+
write data;
}%%
diff --git a/library/cpp/uri/parsefsm.rl6 b/library/cpp/uri/parsefsm.rl6
index 7097723650..afd9286ac6 100644
--- a/library/cpp/uri/parsefsm.rl6
+++ b/library/cpp/uri/parsefsm.rl6
@@ -145,7 +145,7 @@
ext_space = " " >{ REQ(fpc, FeatureEncodeSpace) };
ext_cntrl = cntrl >{ REQ(fpc, FeatureEncodeCntrl) };
- pct_maybe_encoded = PCT (HEXDIG | HEXNUM)? ;
+ pct_maybe_encoded = PCT (HEXDIG | HEXNUM)? ;
ext_safe = unreserved
| pct_maybe_encoded
| sub_delims
diff --git a/library/cpp/uri/uri_ut.cpp b/library/cpp/uri/uri_ut.cpp
index 2ebd83fc93..cca5490049 100644
--- a/library/cpp/uri/uri_ut.cpp
+++ b/library/cpp/uri/uri_ut.cpp
@@ -654,15 +654,15 @@ namespace NUri {
#undef ENC
}
{
-#define DEC "независимая-экспертиза-оценка-ущерба-авто-дтп.рф"
-#define PNC "xn--------3veabbbbjgk5abecc3afsad2cg8bvq2alouolqf5brd3a4jzftgqd.xn--p1ai"
+#define DEC "независимая-экспертиза-оценка-ущерба-авто-дтп.рф"
+#define PNC "xn--------3veabbbbjgk5abecc3afsad2cg8bvq2alouolqf5brd3a4jzftgqd.xn--p1ai"
TTest test = {
"http://" DEC "/", TParseFlags(TFeature::FeaturesRobot), TState::ParsedOK, "http", "", "", PNC, 80, "/", "", ""};
TUri url;
URL_TEST(url, test);
UNIT_ASSERT_VALUES_EQUAL(url.PrintS(), "http://" PNC "/");
-#undef PNC
-#undef DEC
+#undef PNC
+#undef DEC
}
}