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

3 files changed, 109 insertions, 109 deletions

diff --git a/contrib/libs/openssl/crypto/dso/dso_dlfcn.c b/contrib/libs/openssl/crypto/dso/dso_dlfcn.c
index b926cb3021..96ae1fac4d 100644
--- a/contrib/libs/openssl/crypto/dso/dso_dlfcn.c
+++ b/contrib/libs/openssl/crypto/dso/dso_dlfcn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2019 The OpenSSL Project Authors. All Rights Reserved. 
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -27,7 +27,7 @@
 #  endif
 #  include <dlfcn.h>
 #  define HAVE_DLINFO 1
-#  if defined(__SCO_VERSION__) || defined(_SCO_ELF) || \
+#  if defined(__SCO_VERSION__) || defined(_SCO_ELF) || \ 
      (defined(__osf__) && !defined(RTLD_NEXT))     || \
      (defined(__OpenBSD__) && !defined(RTLD_SELF)) || \
         defined(__ANDROID__)
diff --git a/contrib/libs/openssl/crypto/dso/dso_openssl.c b/contrib/libs/openssl/crypto/dso/dso_openssl.c
index c76a04db23..aded0f5906 100644
--- a/contrib/libs/openssl/crypto/dso/dso_openssl.c
+++ b/contrib/libs/openssl/crypto/dso/dso_openssl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2019 The OpenSSL Project Authors. All Rights Reserved. 
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -9,7 +9,7 @@
 
 #include "dso_local.h"
 
-#ifdef DSO_NONE
+#ifdef DSO_NONE 
 
 static DSO_METHOD dso_meth_null = {
     "NULL shared library method"
diff --git a/contrib/libs/openssl/crypto/dso/dso_win32.c b/contrib/libs/openssl/crypto/dso/dso_win32.c
index af1e559d76..aa29313763 100644
--- a/contrib/libs/openssl/crypto/dso/dso_win32.c
+++ b/contrib/libs/openssl/crypto/dso/dso_win32.c
@@ -64,7 +64,7 @@ static DSO_FUNC_TYPE win32_bind_func(DSO *dso, const char *symname);
 static char *win32_name_converter(DSO *dso, const char *filename);
 static char *win32_merger(DSO *dso, const char *filespec1,
                           const char *filespec2);
-static int win32_pathbyaddr(void *addr, char *path, int sz);
+static int win32_pathbyaddr(void *addr, char *path, int sz); 
 static void *win32_globallookup(const char *name);
 
 static const char *openssl_strnchr(const char *string, int c, size_t len);
@@ -79,7 +79,7 @@ static DSO_METHOD dso_meth_win32 = {
     win32_merger,
     NULL,                       /* init */
     NULL,                       /* finish */
-    win32_pathbyaddr,           /* pathbyaddr */
+    win32_pathbyaddr,           /* pathbyaddr */ 
     win32_globallookup
 };
 
@@ -501,111 +501,111 @@ typedef HANDLE(WINAPI *CREATETOOLHELP32SNAPSHOT) (DWORD, DWORD);
 typedef BOOL(WINAPI *CLOSETOOLHELP32SNAPSHOT) (HANDLE);
 typedef BOOL(WINAPI *MODULE32) (HANDLE, MODULEENTRY32 *);
 
-static int win32_pathbyaddr(void *addr, char *path, int sz)
-{
-    HMODULE dll;
-    HANDLE hModuleSnap = INVALID_HANDLE_VALUE;
-    MODULEENTRY32 me32;
-    CREATETOOLHELP32SNAPSHOT create_snap;
-    CLOSETOOLHELP32SNAPSHOT close_snap;
-    MODULE32 module_first, module_next;
-
-    if (addr == NULL) {
-        union {
-            int (*f) (void *, char *, int);
-            void *p;
-        } t = {
-            win32_pathbyaddr
-        };
-        addr = t.p;
-    }
-
-    dll = LoadLibrary(TEXT(DLLNAME));
-    if (dll == NULL) {
-        DSOerr(DSO_F_WIN32_PATHBYADDR, DSO_R_UNSUPPORTED);
-        return -1;
-    }
-
-    create_snap = (CREATETOOLHELP32SNAPSHOT)
-        GetProcAddress(dll, "CreateToolhelp32Snapshot");
-    if (create_snap == NULL) {
-        FreeLibrary(dll);
-        DSOerr(DSO_F_WIN32_PATHBYADDR, DSO_R_UNSUPPORTED);
-        return -1;
-    }
-    /* We take the rest for granted... */
-# ifdef _WIN32_WCE
-    close_snap = (CLOSETOOLHELP32SNAPSHOT)
-        GetProcAddress(dll, "CloseToolhelp32Snapshot");
-# else
-    close_snap = (CLOSETOOLHELP32SNAPSHOT) CloseHandle;
-# endif
-    module_first = (MODULE32) GetProcAddress(dll, "Module32First");
-    module_next = (MODULE32) GetProcAddress(dll, "Module32Next");
-
-    /*
-     * Take a snapshot of current process which includes
-     * list of all involved modules.
-     */
-    hModuleSnap = (*create_snap) (TH32CS_SNAPMODULE, 0);
-    if (hModuleSnap == INVALID_HANDLE_VALUE) {
-        FreeLibrary(dll);
-        DSOerr(DSO_F_WIN32_PATHBYADDR, DSO_R_UNSUPPORTED);
-        return -1;
-    }
-
-    me32.dwSize = sizeof(me32);
-
-    if (!(*module_first) (hModuleSnap, &me32)) {
-        (*close_snap) (hModuleSnap);
-        FreeLibrary(dll);
-        DSOerr(DSO_F_WIN32_PATHBYADDR, DSO_R_FAILURE);
-        return -1;
-    }
-
-    /* Enumerate the modules to find one which includes me. */
-    do {
+static int win32_pathbyaddr(void *addr, char *path, int sz) 
+{ 
+    HMODULE dll; 
+    HANDLE hModuleSnap = INVALID_HANDLE_VALUE; 
+    MODULEENTRY32 me32; 
+    CREATETOOLHELP32SNAPSHOT create_snap; 
+    CLOSETOOLHELP32SNAPSHOT close_snap; 
+    MODULE32 module_first, module_next; 
+ 
+    if (addr == NULL) { 
+        union { 
+            int (*f) (void *, char *, int); 
+            void *p; 
+        } t = { 
+            win32_pathbyaddr 
+        }; 
+        addr = t.p; 
+    } 
+ 
+    dll = LoadLibrary(TEXT(DLLNAME)); 
+    if (dll == NULL) { 
+        DSOerr(DSO_F_WIN32_PATHBYADDR, DSO_R_UNSUPPORTED); 
+        return -1; 
+    } 
+ 
+    create_snap = (CREATETOOLHELP32SNAPSHOT) 
+        GetProcAddress(dll, "CreateToolhelp32Snapshot"); 
+    if (create_snap == NULL) { 
+        FreeLibrary(dll); 
+        DSOerr(DSO_F_WIN32_PATHBYADDR, DSO_R_UNSUPPORTED); 
+        return -1; 
+    } 
+    /* We take the rest for granted... */ 
+# ifdef _WIN32_WCE 
+    close_snap = (CLOSETOOLHELP32SNAPSHOT) 
+        GetProcAddress(dll, "CloseToolhelp32Snapshot"); 
+# else 
+    close_snap = (CLOSETOOLHELP32SNAPSHOT) CloseHandle; 
+# endif 
+    module_first = (MODULE32) GetProcAddress(dll, "Module32First"); 
+    module_next = (MODULE32) GetProcAddress(dll, "Module32Next"); 
+ 
+    /* 
+     * Take a snapshot of current process which includes 
+     * list of all involved modules. 
+     */ 
+    hModuleSnap = (*create_snap) (TH32CS_SNAPMODULE, 0); 
+    if (hModuleSnap == INVALID_HANDLE_VALUE) { 
+        FreeLibrary(dll); 
+        DSOerr(DSO_F_WIN32_PATHBYADDR, DSO_R_UNSUPPORTED); 
+        return -1; 
+    } 
+ 
+    me32.dwSize = sizeof(me32); 
+ 
+    if (!(*module_first) (hModuleSnap, &me32)) { 
+        (*close_snap) (hModuleSnap); 
+        FreeLibrary(dll); 
+        DSOerr(DSO_F_WIN32_PATHBYADDR, DSO_R_FAILURE); 
+        return -1; 
+    } 
+ 
+    /* Enumerate the modules to find one which includes me. */ 
+    do { 
         if ((size_t) addr >= (size_t) me32.modBaseAddr &&
             (size_t) addr < (size_t) (me32.modBaseAddr + me32.modBaseSize)) {
-            (*close_snap) (hModuleSnap);
-            FreeLibrary(dll);
-# ifdef _WIN32_WCE
-#  if _WIN32_WCE >= 101
-            return WideCharToMultiByte(CP_ACP, 0, me32.szExePath, -1,
-                                       path, sz, NULL, NULL);
-#  else
-            {
-                int i, len = (int)wcslen(me32.szExePath);
-                if (sz <= 0)
-                    return len + 1;
-                if (len >= sz)
-                    len = sz - 1;
-                for (i = 0; i < len; i++)
-                    path[i] = (char)me32.szExePath[i];
-                path[len++] = '\0';
-                return len;
-            }
-#  endif
-# else
-            {
-                int len = (int)strlen(me32.szExePath);
-                if (sz <= 0)
-                    return len + 1;
-                if (len >= sz)
-                    len = sz - 1;
-                memcpy(path, me32.szExePath, len);
-                path[len++] = '\0';
-                return len;
-            }
-# endif
-        }
-    } while ((*module_next) (hModuleSnap, &me32));
-
-    (*close_snap) (hModuleSnap);
-    FreeLibrary(dll);
-    return 0;
-}
-
+            (*close_snap) (hModuleSnap); 
+            FreeLibrary(dll); 
+# ifdef _WIN32_WCE 
+#  if _WIN32_WCE >= 101 
+            return WideCharToMultiByte(CP_ACP, 0, me32.szExePath, -1, 
+                                       path, sz, NULL, NULL); 
+#  else 
+            { 
+                int i, len = (int)wcslen(me32.szExePath); 
+                if (sz <= 0) 
+                    return len + 1; 
+                if (len >= sz) 
+                    len = sz - 1; 
+                for (i = 0; i < len; i++) 
+                    path[i] = (char)me32.szExePath[i]; 
+                path[len++] = '\0'; 
+                return len; 
+            } 
+#  endif 
+# else 
+            { 
+                int len = (int)strlen(me32.szExePath); 
+                if (sz <= 0) 
+                    return len + 1; 
+                if (len >= sz) 
+                    len = sz - 1; 
+                memcpy(path, me32.szExePath, len); 
+                path[len++] = '\0'; 
+                return len; 
+            } 
+# endif 
+        } 
+    } while ((*module_next) (hModuleSnap, &me32)); 
+ 
+    (*close_snap) (hModuleSnap); 
+    FreeLibrary(dll); 
+    return 0; 
+} 
+ 
 static void *win32_globallookup(const char *name)
 {
     HMODULE dll;