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

11 files changed, 44 insertions, 44 deletions

diff --git a/contrib/tools/bison/gnulib/src/c-strcasecmp.c b/contrib/tools/bison/gnulib/src/c-strcasecmp.c
index 2671c10fd7..cd4e4d49cb 100644
--- a/contrib/tools/bison/gnulib/src/c-strcasecmp.c
+++ b/contrib/tools/bison/gnulib/src/c-strcasecmp.c
@@ -26,8 +26,8 @@
 int
 c_strcasecmp (const char *s1, const char *s2)
 {
-  const unsigned char *p1 = (const unsigned char *) s1; 
-  const unsigned char *p2 = (const unsigned char *) s2; 
+  const unsigned char *p1 = (const unsigned char *) s1;
+  const unsigned char *p2 = (const unsigned char *) s2;
   unsigned char c1, c2;
 
   if (p1 == p2)
diff --git a/contrib/tools/bison/gnulib/src/c-strncasecmp.c b/contrib/tools/bison/gnulib/src/c-strncasecmp.c
index fe827f8196..053c70a73a 100644
--- a/contrib/tools/bison/gnulib/src/c-strncasecmp.c
+++ b/contrib/tools/bison/gnulib/src/c-strncasecmp.c
@@ -26,8 +26,8 @@
 int
 c_strncasecmp (const char *s1, const char *s2, size_t n)
 {
-  const unsigned char *p1 = (const unsigned char *) s1; 
-  const unsigned char *p2 = (const unsigned char *) s2; 
+  const unsigned char *p1 = (const unsigned char *) s1;
+  const unsigned char *p2 = (const unsigned char *) s2;
   unsigned char c1, c2;
 
   if (p1 == p2 || n == 0)
diff --git a/contrib/tools/bison/gnulib/src/getopt.c b/contrib/tools/bison/gnulib/src/getopt.c
index a5d23c097e..4b3d267067 100644
--- a/contrib/tools/bison/gnulib/src/getopt.c
+++ b/contrib/tools/bison/gnulib/src/getopt.c
@@ -181,7 +181,7 @@ exchange (char **argv, struct _getopt_data *d)
         {
           /* Bottom segment is the short one.  */
           int len = middle - bottom;
-          int i; 
+          int i;
 
           /* Swap it with the top part of the top segment.  */
           for (i = 0; i < len; i++)
@@ -198,7 +198,7 @@ exchange (char **argv, struct _getopt_data *d)
         {
           /* Top segment is the short one.  */
           int len = top - middle;
-          int i; 
+          int i;
 
           /* Swap it with the bottom part of the bottom segment.  */
           for (i = 0; i < len; i++)
diff --git a/contrib/tools/bison/gnulib/src/obstack.c b/contrib/tools/bison/gnulib/src/obstack.c
index c78ff8255f..9b2883e4ac 100644
--- a/contrib/tools/bison/gnulib/src/obstack.c
+++ b/contrib/tools/bison/gnulib/src/obstack.c
@@ -143,7 +143,7 @@ _obstack_begin (struct obstack *h,
                 void *(*chunkfun) (long),
                 void (*freefun) (void *))
 {
-  struct _obstack_chunk *chunk; /* points to new chunk */ 
+  struct _obstack_chunk *chunk; /* points to new chunk */
 
   if (alignment == 0)
     alignment = DEFAULT_ALIGNMENT;
@@ -190,7 +190,7 @@ _obstack_begin_1 (struct obstack *h, int size, int alignment,
                   void (*freefun) (void *, void *),
                   void *arg)
 {
-  struct _obstack_chunk *chunk; /* points to new chunk */ 
+  struct _obstack_chunk *chunk; /* points to new chunk */
 
   if (alignment == 0)
     alignment = DEFAULT_ALIGNMENT;
@@ -241,11 +241,11 @@ _obstack_begin_1 (struct obstack *h, int size, int alignment,
 void
 _obstack_newchunk (struct obstack *h, int length)
 {
-  struct _obstack_chunk *old_chunk = h->chunk; 
-  struct _obstack_chunk *new_chunk; 
-  long new_size; 
-  long obj_size = h->next_free - h->object_base; 
-  long i; 
+  struct _obstack_chunk *old_chunk = h->chunk;
+  struct _obstack_chunk *new_chunk;
+  long new_size;
+  long obj_size = h->next_free - h->object_base;
+  long i;
   long already;
   char *object_base;
 
@@ -318,8 +318,8 @@ int _obstack_allocated_p (struct obstack *h, void *obj);
 int
 _obstack_allocated_p (struct obstack *h, void *obj)
 {
-  struct _obstack_chunk *lp;   /* below addr of any objects in this chunk */ 
-  struct _obstack_chunk *plp;  /* point to previous chunk if any */ 
+  struct _obstack_chunk *lp;   /* below addr of any objects in this chunk */
+  struct _obstack_chunk *plp;  /* point to previous chunk if any */
 
   lp = (h)->chunk;
   /* We use >= rather than > since the object cannot be exactly at
@@ -341,8 +341,8 @@ _obstack_allocated_p (struct obstack *h, void *obj)
 void
 __obstack_free (struct obstack *h, void *obj)
 {
-  struct _obstack_chunk *lp;   /* below addr of any objects in this chunk */ 
-  struct _obstack_chunk *plp;  /* point to previous chunk if any */ 
+  struct _obstack_chunk *lp;   /* below addr of any objects in this chunk */
+  struct _obstack_chunk *plp;  /* point to previous chunk if any */
 
   lp = h->chunk;
   /* We use >= because there cannot be an object at the beginning of a chunk.
@@ -377,8 +377,8 @@ strong_alias (obstack_free, _obstack_free)
 int
 _obstack_memory_used (struct obstack *h)
 {
-  struct _obstack_chunk* lp; 
-  int nbytes = 0; 
+  struct _obstack_chunk* lp;
+  int nbytes = 0;
 
   for (lp = h->chunk; lp != 0; lp = lp->prev)
     {
diff --git a/contrib/tools/bison/gnulib/src/stpcpy.c b/contrib/tools/bison/gnulib/src/stpcpy.c
index 690a1b1178..f5aa8d67e9 100644
--- a/contrib/tools/bison/gnulib/src/stpcpy.c
+++ b/contrib/tools/bison/gnulib/src/stpcpy.c
@@ -36,8 +36,8 @@
 char *
 __stpcpy (char *dest, const char *src)
 {
-  char *d = dest; 
-  const char *s = src; 
+  char *d = dest;
+  const char *s = src;
 
   do
     *d++ = *s;
diff --git a/contrib/tools/bison/gnulib/src/strtol.c b/contrib/tools/bison/gnulib/src/strtol.c
index 9d102cf887..2962505554 100644
--- a/contrib/tools/bison/gnulib/src/strtol.c
+++ b/contrib/tools/bison/gnulib/src/strtol.c
@@ -239,11 +239,11 @@ INTERNAL (strtol) (const STRING_TYPE *nptr, STRING_TYPE **endptr,
                    int base, int group LOCALE_PARAM_PROTO)
 {
   int negative;
-  unsigned LONG int cutoff; 
-  unsigned int cutlim; 
-  unsigned LONG int i; 
-  const STRING_TYPE *s; 
-  UCHAR_TYPE c; 
+  unsigned LONG int cutoff;
+  unsigned int cutlim;
+  unsigned LONG int i;
+  const STRING_TYPE *s;
+  UCHAR_TYPE c;
   const STRING_TYPE *save, *end;
   int overflow;
 
diff --git a/contrib/tools/bison/m4/src/symtab.c b/contrib/tools/bison/m4/src/symtab.c
index 37e3827b36..7448c272cc 100644
--- a/contrib/tools/bison/m4/src/symtab.c
+++ b/contrib/tools/bison/m4/src/symtab.c
@@ -123,10 +123,10 @@ symtab_init (void)
 static size_t M4_GNUC_PURE
 hash (const char *s)
 {
-  size_t val = 0; 
+  size_t val = 0;
 
-  const char *ptr = s; 
-  char ch; 
+  const char *ptr = s;
+  char ch;
 
   while ((ch = *ptr++) != '\0')
     val = (val << 7) + (val >> (sizeof (val) * CHAR_BIT - 7)) + ch;
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp b/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp
index 4595442989..cd96aa0565 100644
--- a/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp
+++ b/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp
@@ -157,19 +157,19 @@ namespace NPlugins {
 
                 switch(desc->cpp_type()) {
                     case FieldDescriptor::CPPTYPE_STRING:
-                        printer->Print(TString::Join("::google::protobuf::io::PrintJSONString(out, ", scopeName , ");\n").data()); 
+                        printer->Print(TString::Join("::google::protobuf::io::PrintJSONString(out, ", scopeName , ");\n").data());
                         break;
                     case FieldDescriptor::CPPTYPE_ENUM:
-                        printer->Print(TString::Join("out << int(", scopeName, ");\n").data()); 
+                        printer->Print(TString::Join("out << int(", scopeName, ");\n").data());
                         break;
                     case FieldDescriptor::CPPTYPE_MESSAGE:
-                        printer->Print(TString::Join(scopeName, ".PrintJSON(out);\n").data()); 
+                        printer->Print(TString::Join(scopeName, ".PrintJSON(out);\n").data());
                         break;
                     default:
                         if (isKey) {
-                            printer->Print(TString::Join("out << '\"' << ", scopeName, " << '\"';\n").data()); 
+                            printer->Print(TString::Join("out << '\"' << ", scopeName, " << '\"';\n").data());
                         } else {
-                            printer->Print(TString::Join("out << ", scopeName, ";\n").data()); 
+                            printer->Print(TString::Join("out << ", scopeName, ";\n").data());
                         }
                 }
             }
diff --git a/contrib/tools/yasm/libyasm/md5.c b/contrib/tools/yasm/libyasm/md5.c
index 25fa61aec2..b009842f5c 100644
--- a/contrib/tools/yasm/libyasm/md5.c
+++ b/contrib/tools/yasm/libyasm/md5.c
@@ -187,7 +187,7 @@ yasm_md5_final(unsigned char digest[16], yasm_md5_context *ctx)
 void
 yasm_md5_transform(unsigned long buf[4], const unsigned char inraw[64])
 {
-        unsigned long a, b, c, d; 
+        unsigned long a, b, c, d;
         unsigned long in[16];
         int i;
 
diff --git a/contrib/tools/yasm/libyasm/phash.c b/contrib/tools/yasm/libyasm/phash.c
index 5bc8826ab1..29e073aae1 100644
--- a/contrib/tools/yasm/libyasm/phash.c
+++ b/contrib/tools/yasm/libyasm/phash.c
@@ -97,9 +97,9 @@ phash_lookup(
     register size_t length,   /* the length of the key */
     register unsigned long level) /* the previous hash, or an arbitrary value */
 {
-    unsigned long a,b,c; 
-    size_t len; 
-    const unsigned char *k = (const unsigned char *)sk; 
+    unsigned long a,b,c;
+    size_t len;
+    const unsigned char *k = (const unsigned char *)sk;
 
     /* Set up the internal state */
     len = length;
@@ -194,9 +194,9 @@ phash_checksum(
     register size_t len,
     register unsigned long *state)
 {
-    unsigned long a,b,c,d,e,f,g,h; 
-    size_t length; 
-    const unsigned char *k = (const unsigned char *)sk; 
+    unsigned long a,b,c,d,e,f,g,h;
+    size_t length;
+    const unsigned char *k = (const unsigned char *)sk;
 
     /* Use the length and level; add in the golden ratio. */
     length = len;
diff --git a/contrib/tools/yasm/libyasm/strsep.c b/contrib/tools/yasm/libyasm/strsep.c
index d8460ecbbc..5688a60879 100644
--- a/contrib/tools/yasm/libyasm/strsep.c
+++ b/contrib/tools/yasm/libyasm/strsep.c
@@ -58,9 +58,9 @@ yasm__strsep(char **stringp, const char *delim)
 #ifdef HAVE_STRSEP
     return strsep(stringp, delim);
 #else
-        char *s; 
-        const char *spanp; 
-        int c, sc; 
+        char *s;
+        const char *spanp;
+        int c, sc;
         char *tok;
 
         if ((s = *stringp) == NULL)