Просмотр исходного кода

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

luchko 3 лет назад
Родитель
Сommit
9f21dcc5d3

+ 7 - 7
contrib/tools/python/pyconfig.inc

@@ -13,7 +13,7 @@ SET(PYTHON_FLAGS "-DPy_BUILD_CORE")
 ADDINCL(${PYTHON_SRC_DIR}/Include)
 ADDINCL(${PYTHON_SRC_DIR}/Include)
 
 
 CFLAGS(
 CFLAGS(
-    -DUNQUOTED_VERSION=2.7
+    -DUNQUOTED_VERSION=2.7 
 )
 )
 
 
 IF (NOT WIN32)
 IF (NOT WIN32)
@@ -23,18 +23,18 @@ IF (NOT WIN32)
         EXTRALIBS(-ldl)
         EXTRALIBS(-ldl)
 
 
         CFLAGS(
         CFLAGS(
-            -DUNQUOTED_PYTHONPATH=:plat-linux2
-            -DUNQUOTED_PLATFORM=linux2
+            -DUNQUOTED_PYTHONPATH=:plat-linux2 
+            -DUNQUOTED_PLATFORM=linux2 
         )
         )
     ELSEIF (FREEBSD)
     ELSEIF (FREEBSD)
         CFLAGS(
         CFLAGS(
-            -DUNQUOTED_PYTHONPATH=:plat-freebsd${FREEBSD_VER}
-            -DUNQUOTED_PLATFORM=freebsd${FREEBSD_VER}
+            -DUNQUOTED_PYTHONPATH=:plat-freebsd${FREEBSD_VER} 
+            -DUNQUOTED_PLATFORM=freebsd${FREEBSD_VER} 
         )
         )
     ELSEIF (DARWIN)
     ELSEIF (DARWIN)
         CFLAGS(
         CFLAGS(
-            -DUNQUOTED_PYTHONPATH=:plat-darwin
-            -DUNQUOTED_PLATFORM=darwin
+            -DUNQUOTED_PYTHONPATH=:plat-darwin 
+            -DUNQUOTED_PLATFORM=darwin 
         )
         )
         LDFLAGS(
         LDFLAGS(
            -framework SystemConfiguration
            -framework SystemConfiguration

+ 6 - 6
library/cpp/http/fetch/exthttpcodes.cpp

@@ -148,22 +148,22 @@ static ui16* prepare_flags(http_flag* arg) {
     http_flag* ptr;
     http_flag* ptr;
     size_t i;
     size_t i;
 
 
-    // устанавливаем значение по умолчанию для кодов не перечисленных в таблице выше
+    // устанавливаем значение по умолчанию для кодов не перечисленных в таблице выше 
     for (i = 0; i < EXT_HTTP_CODE_MAX; ++i)
     for (i = 0; i < EXT_HTTP_CODE_MAX; ++i)
         flags[i] = CrazyServer;
         flags[i] = CrazyServer;
 
 
-    // устанавливаем флаги для перечисленных кодов
+    // устанавливаем флаги для перечисленных кодов 
     for (ptr = arg; ptr->http; ++ptr)
     for (ptr = arg; ptr->http; ++ptr)
         flags[ptr->http & (EXT_HTTP_CODE_MAX - 1)] = ptr->flag;
         flags[ptr->http & (EXT_HTTP_CODE_MAX - 1)] = ptr->flag;
 
 
     // для стандартных кодов ошибок берем флаги из первого кода каждой группы и проставляем их
     // для стандартных кодов ошибок берем флаги из первого кода каждой группы и проставляем их
-    // всем кодам не перечисленным в таблице выше
+    // всем кодам не перечисленным в таблице выше 
     for (size_t group = 0; group < 1000; group += 100)
     for (size_t group = 0; group < 1000; group += 100)
         for (size_t j = group + 1; j < group + 100; ++j)
         for (size_t j = group + 1; j < group + 100; ++j)
-            flags[j] = flags[group];
+            flags[j] = flags[group]; 
 
 
-    // предыдущий цикл затер некоторые флаги перечисленные в таблице выше
-    // восстанавливаем их
+    // предыдущий цикл затер некоторые флаги перечисленные в таблице выше 
+    // восстанавливаем их 
     for (ptr = arg; ptr->http; ++ptr)
     for (ptr = arg; ptr->http; ++ptr)
         flags[ptr->http & (EXT_HTTP_CODE_MAX - 1)] = ptr->flag;
         flags[ptr->http & (EXT_HTTP_CODE_MAX - 1)] = ptr->flag;
 
 

+ 2 - 2
library/cpp/http/fetch/exthttpcodes.h

@@ -109,8 +109,8 @@ enum ExtHttpCodes {
 
 
     EXT_HTTP_FASTHOPS = 4000,
     EXT_HTTP_FASTHOPS = 4000,
     EXT_HTTP_NODOC = 4001,
     EXT_HTTP_NODOC = 4001,
-
-    EXT_HTTP_MAX
+ 
+    EXT_HTTP_MAX 
 };
 };
 
 
 enum HttpFlags {
 enum HttpFlags {

+ 3 - 3
library/cpp/http/fetch/httpfsm.rl6

@@ -154,18 +154,18 @@ action set_content_length { setguarded(base_hd->content_length, I); }
 
 
 content_length  = "content-length"i def %beg_content_length int eoh %set_content_length;
 content_length  = "content-length"i def %beg_content_length int eoh %set_content_length;
 
 
-################# content-range ###################
+################# content-range ################### 
 action beg_content_range_start { guard(base_hd->content_range_start); I = -1; }
 action beg_content_range_start { guard(base_hd->content_range_start); I = -1; }
 action set_content_range_start { setguarded(base_hd->content_range_start, I); }
 action set_content_range_start { setguarded(base_hd->content_range_start, I); }
 action beg_content_range_end { guard(base_hd->content_range_end); I = -1; }
 action beg_content_range_end { guard(base_hd->content_range_end); I = -1; }
 action set_content_range_end { setguarded(base_hd->content_range_end, I); }
 action set_content_range_end { setguarded(base_hd->content_range_end, I); }
 action beg_content_range_el { guard(base_hd->content_range_entity_length); I = -1; }
 action beg_content_range_el { guard(base_hd->content_range_entity_length); I = -1; }
 action set_content_range_el { setguarded(base_hd->content_range_entity_length, I); }
 action set_content_range_el { setguarded(base_hd->content_range_entity_length, I); }
-
+ 
 content_range   = "content-range"i def "bytes"i sp %beg_content_range_start int '-' %set_content_range_start
 content_range   = "content-range"i def "bytes"i sp %beg_content_range_start int '-' %set_content_range_start
                                                    %beg_content_range_end int '/' %set_content_range_end
                                                    %beg_content_range_end int '/' %set_content_range_end
                                                    %beg_content_range_el int eoh %set_content_range_el;
                                                    %beg_content_range_el int eoh %set_content_range_el;
-
+ 
 ################# accept-ranges ###################
 ################# accept-ranges ###################
 action beg_accept_ranges {
 action beg_accept_ranges {
     if (hd) {
     if (hd) {

+ 5 - 5
library/cpp/http/fetch/httpheader.h

@@ -79,7 +79,7 @@ public:
 
 
 public:
 public:
     void Init() {
     void Init() {
-        error = 0;
+        error = 0; 
         header_size = 0;
         header_size = 0;
         entity_size = 0;
         entity_size = 0;
         content_length = -1;
         content_length = -1;
@@ -90,9 +90,9 @@ public:
         compression_method = HTTP_COMPRESSION_UNSET;
         compression_method = HTTP_COMPRESSION_UNSET;
         transfer_chunked = -1;
         transfer_chunked = -1;
         connection_closed = HTTP_CONNECTION_UNDEFINED;
         connection_closed = HTTP_CONNECTION_UNDEFINED;
-        content_range_start = -1;
-        content_range_end = -1;
-        content_range_entity_length = -1;
+        content_range_start = -1; 
+        content_range_end = -1; 
+        content_range_entity_length = -1; 
         base.clear();
         base.clear();
     }
     }
 
 
@@ -153,7 +153,7 @@ public:
         retry_after = DEFAULT_RETRY_AFTER;
         retry_after = DEFAULT_RETRY_AFTER;
         x_robots_state = "xxxxx";
         x_robots_state = "xxxxx";
     }
     }
-
+ 
     void Print() const {
     void Print() const {
         THttpBaseHeader::Print();
         THttpBaseHeader::Print();
         printf("http_status: %" PRIi16 "\n", http_status);
         printf("http_status: %" PRIi16 "\n", http_status);

+ 3 - 3
library/cpp/http/fetch/httpzreader.h

@@ -96,9 +96,9 @@ public:
                 void* tmpin = Stream.next_in;
                 void* tmpin = Stream.next_in;
                 long res = TBase::Read(tmpin);
                 long res = TBase::Read(tmpin);
                 Stream.next_in = (Bytef*)tmpin;
                 Stream.next_in = (Bytef*)tmpin;
-                if (res <= 0)
-                    return res;
-                Stream.avail_in = (uInt)res;
+                if (res <= 0) 
+                    return res; 
+                Stream.avail_in = (uInt)res; 
             }
             }
 
 
             Stream.next_out = Buf;
             Stream.next_out = Buf;

+ 2 - 2
library/cpp/http/misc/httpdate.cpp

@@ -54,11 +54,11 @@ int format_http_date(char buf[], size_t size, time_t when) {
     GmTimeR(&when, &tms);
     GmTimeR(&when, &tms);
 
 
 #ifndef HTTP_DATE_ISO_8601
 #ifndef HTTP_DATE_ISO_8601
-    return snprintf(buf, size, "%s, %02d %s %04d %02d:%02d:%02d GMT",
+    return snprintf(buf, size, "%s, %02d %s %04d %02d:%02d:%02d GMT", 
         wkdays[tms.tm_wday], tms.tm_mday, months[tms.tm_mon],
         wkdays[tms.tm_wday], tms.tm_mday, months[tms.tm_mon],
         tms.tm_year + 1900, tms.tm_hour, tms.tm_min, tms.tm_sec);
         tms.tm_year + 1900, tms.tm_hour, tms.tm_min, tms.tm_sec);
 #else /* ISO 8601 */
 #else /* ISO 8601 */
-    return snprintf(buf, size, "%04d%02d%02dT%02d%02d%02d+0000",
+    return snprintf(buf, size, "%04d%02d%02dT%02d%02d%02d+0000", 
         tms.tm_year + 1900, tms.tm_mon + 1, tms.tm_mday,
         tms.tm_year + 1900, tms.tm_mon + 1, tms.tm_mday,
         tms.tm_hour, tms.tm_min, tms.tm_sec);
         tms.tm_hour, tms.tm_min, tms.tm_sec);
 #endif
 #endif

+ 1 - 1
library/cpp/http/misc/httpdate.h

@@ -15,7 +15,7 @@ inline time_t parse_http_date(const TStringBuf& datestring) {
     }
     }
 }
 }
 
 
-int format_http_date(char buf[], size_t size, time_t when);
+int format_http_date(char buf[], size_t size, time_t when); 
 char* format_http_date(time_t when, char* buf, size_t len);
 char* format_http_date(time_t when, char* buf, size_t len);
 
 
 TString FormatHttpDate(time_t when);
 TString FormatHttpDate(time_t when);

+ 3 - 3
util/charset/wide.cpp

@@ -602,9 +602,9 @@ void EscapeHtmlChars(TUtf16String& str) {
             case '&':
             case '&':
                 ent = &amp;
                 ent = &amp;
                 break;
                 break;
-            case '\"':
-                ent = &quot;
-                break;
+            case '\"': 
+                ent = &quot; 
+                break; 
             default:
             default:
                 if (insertBr && (cs[i] == '\r' || cs[i] == '\n')) {
                 if (insertBr && (cs[i] == '\r' || cs[i] == '\n')) {
                     ent = &br;
                     ent = &br;

+ 33 - 33
util/generic/bitmap.h

@@ -10,8 +10,8 @@
 #include <util/system/yassert.h>
 #include <util/system/yassert.h>
 #include <util/system/defaults.h>
 #include <util/system/defaults.h>
 #include <util/str_stl.h>
 #include <util/str_stl.h>
-#include <util/ysaveload.h>
-
+#include <util/ysaveload.h> 
+ 
 namespace NBitMapPrivate {
 namespace NBitMapPrivate {
     // Returns number of bits set; result is in most significatnt byte
     // Returns number of bits set; result is in most significatnt byte
     inline ui64 ByteSums(ui64 x) {
     inline ui64 ByteSums(ui64 x) {
@@ -275,7 +275,7 @@ namespace NBitMapPrivate {
             }
             }
             return true;
             return true;
         }
         }
-
+ 
         Y_FORCE_INLINE bool ExpandBitSize(size_t bitSize, bool keepData = true) {
         Y_FORCE_INLINE bool ExpandBitSize(size_t bitSize, bool keepData = true) {
             return ExpandSize((bitSize + 8 * sizeof(TChunk) - 1) / (8 * sizeof(TChunk)), keepData);
             return ExpandSize((bitSize + 8 * sizeof(TChunk) - 1) / (8 * sizeof(TChunk)), keepData);
         }
         }
@@ -509,7 +509,7 @@ public:
     }
     }
 
 
     Y_FORCE_INLINE TReference operator[](size_t pos) {
     Y_FORCE_INLINE TReference operator[](size_t pos) {
-        const bool fitStorage = Mask.ExpandBitSize(pos + 1);
+        const bool fitStorage = Mask.ExpandBitSize(pos + 1); 
         Y_ASSERT(fitStorage);
         Y_ASSERT(fitStorage);
         return TReference(&Mask.Data[pos >> DivCount], ModMask & pos);
         return TReference(&Mask.Data[pos >> DivCount], ModMask & pos);
     }
     }
@@ -519,7 +519,7 @@ public:
     }
     }
 
 
     Y_FORCE_INLINE TThis& Set(size_t pos) {
     Y_FORCE_INLINE TThis& Set(size_t pos) {
-        const bool fitStorage = Mask.ExpandBitSize(pos + 1);
+        const bool fitStorage = Mask.ExpandBitSize(pos + 1); 
         Y_ASSERT(fitStorage);
         Y_ASSERT(fitStorage);
         Mask.Data[pos >> DivCount] |= static_cast<TChunk>(1) << (pos & ModMask);
         Mask.Data[pos >> DivCount] |= static_cast<TChunk>(1) << (pos & ModMask);
         return *this;
         return *this;
@@ -552,7 +552,7 @@ public:
     }
     }
 
 
     Y_FORCE_INLINE TThis& Flip(size_t pos) {
     Y_FORCE_INLINE TThis& Flip(size_t pos) {
-        const bool fitStorage = Mask.ExpandBitSize(pos + 1);
+        const bool fitStorage = Mask.ExpandBitSize(pos + 1); 
         Y_ASSERT(fitStorage);
         Y_ASSERT(fitStorage);
         Mask.Data[pos >> DivCount] ^= static_cast<TChunk>(1) << (pos & ModMask);
         Mask.Data[pos >> DivCount] ^= static_cast<TChunk>(1) << (pos & ModMask);
         return *this;
         return *this;
@@ -617,8 +617,8 @@ public:
 
 
     Y_FORCE_INLINE void Reserve(size_t bitCount) {
     Y_FORCE_INLINE void Reserve(size_t bitCount) {
         Y_VERIFY(Mask.ExpandBitSize(bitCount), "Exceeding bitmap storage capacity");
         Y_VERIFY(Mask.ExpandBitSize(bitCount), "Exceeding bitmap storage capacity");
-    }
-
+    } 
+ 
     Y_FORCE_INLINE size_t ValueBitCount() const {
     Y_FORCE_INLINE size_t ValueBitCount() const {
         size_t nonZeroChunk = Mask.GetChunkCapacity() - 1;
         size_t nonZeroChunk = Mask.GetChunkCapacity() - 1;
         while (nonZeroChunk != 0 && !Mask.Data[nonZeroChunk])
         while (nonZeroChunk != 0 && !Mask.Data[nonZeroChunk])
@@ -722,7 +722,7 @@ public:
     }
     }
 
 
     TThis& Xor(const TThis& bitmap) {
     TThis& Xor(const TThis& bitmap) {
-        Reserve(bitmap.Size());
+        Reserve(bitmap.Size()); 
         for (size_t i = 0; i < bitmap.Mask.GetChunkCapacity(); ++i)
         for (size_t i = 0; i < bitmap.Mask.GetChunkCapacity(); ++i)
             Mask.Data[i] ^= bitmap.Mask.Data[i];
             Mask.Data[i] ^= bitmap.Mask.Data[i];
         return *this;
         return *this;
@@ -957,34 +957,34 @@ public:
             count += ::NBitMapPrivate::CountBitsPrivate(Mask.Data[i]);
             count += ::NBitMapPrivate::CountBitsPrivate(Mask.Data[i]);
         return count;
         return count;
     }
     }
-
+ 
     void Save(IOutputStream* out) const {
     void Save(IOutputStream* out) const {
-        ::Save(out, ui8(sizeof(TChunk)));
-        ::Save(out, ui64(Size()));
-        ::SavePodArray(out, Mask.Data, Mask.GetChunkCapacity());
-    }
-
+        ::Save(out, ui8(sizeof(TChunk))); 
+        ::Save(out, ui64(Size())); 
+        ::SavePodArray(out, Mask.Data, Mask.GetChunkCapacity()); 
+    } 
+ 
     void Load(IInputStream* inp) {
     void Load(IInputStream* inp) {
-        ui8 chunkSize = 0;
-        ::Load(inp, chunkSize);
+        ui8 chunkSize = 0; 
+        ::Load(inp, chunkSize); 
         Y_VERIFY(size_t(chunkSize) == sizeof(TChunk), "Chunk size is not the same");
         Y_VERIFY(size_t(chunkSize) == sizeof(TChunk), "Chunk size is not the same");
-
-        ui64 bitCount64 = 0;
-        ::Load(inp, bitCount64);
-        size_t bitCount = size_t(bitCount64);
-        Reserve(bitCount);
-
-        size_t chunkCount = 0;
-        if (bitCount > 0) {
-            chunkCount = ((bitCount - 1) >> DivCount) + 1;
-            ::LoadPodArray(inp, Mask.Data, chunkCount);
-        }
-
-        if (chunkCount < Mask.GetChunkCapacity()) {
-            ::memset(Mask.Data + chunkCount, 0, (Mask.GetChunkCapacity() - chunkCount) * sizeof(TChunk));
-        }
+ 
+        ui64 bitCount64 = 0; 
+        ::Load(inp, bitCount64); 
+        size_t bitCount = size_t(bitCount64); 
+        Reserve(bitCount); 
+ 
+        size_t chunkCount = 0; 
+        if (bitCount > 0) { 
+            chunkCount = ((bitCount - 1) >> DivCount) + 1; 
+            ::LoadPodArray(inp, Mask.Data, chunkCount); 
+        } 
+ 
+        if (chunkCount < Mask.GetChunkCapacity()) { 
+            ::memset(Mask.Data + chunkCount, 0, (Mask.GetChunkCapacity() - chunkCount) * sizeof(TChunk)); 
+        } 
         Mask.Sanitize();
         Mask.Sanitize();
-    }
+    } 
 
 
     inline size_t Hash() const {
     inline size_t Hash() const {
         THash<TChunk> chunkHasher;
         THash<TChunk> chunkHasher;

Некоторые файлы не были показаны из-за большого количества измененных файлов