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

7 files changed, 114 insertions, 114 deletions

diff --git a/contrib/libs/openssl/crypto/dso/dso_dl.c b/contrib/libs/openssl/crypto/dso/dso_dl.c
index 3f4d11b353..3bbb10e5ca 100644
--- a/contrib/libs/openssl/crypto/dso/dso_dl.c
+++ b/contrib/libs/openssl/crypto/dso/dso_dl.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "dso_local.h" 
+#include "dso_local.h"
 
 #ifdef DSO_DL
 
diff --git a/contrib/libs/openssl/crypto/dso/dso_dlfcn.c b/contrib/libs/openssl/crypto/dso/dso_dlfcn.c
index 430553438f..b926cb3021 100644
--- a/contrib/libs/openssl/crypto/dso/dso_dlfcn.c
+++ b/contrib/libs/openssl/crypto/dso/dso_dlfcn.c
@@ -16,7 +16,7 @@
 # define _GNU_SOURCE            /* make sure dladdr is declared */
 #endif
 
-#include "dso_local.h" 
+#include "dso_local.h"
 #include "e_os.h"
 
 #ifdef DSO_DLFCN
@@ -324,7 +324,7 @@ static int dladdr(void *address, Dl_info *dl)
  *  Base Operating System and Extensions, Volume 1 and 2
  *  https://www.ibm.com/support/knowledgecenter/ssw_aix_72/com.ibm.aix.base/technicalreferences.htm
  */
-#  error #include <sys/ldr.h> 
+#  error #include <sys/ldr.h>
 #  include <errno.h>
 /* ~ 64 * (sizeof(struct ld_info) + _XOPEN_PATH_MAX + _XOPEN_NAME_MAX) */
 #  define DLFCN_LDINFO_SIZE 86976
diff --git a/contrib/libs/openssl/crypto/dso/dso_lib.c b/contrib/libs/openssl/crypto/dso/dso_lib.c
index 1d5bdee4a5..50a39bb7d5 100644
--- a/contrib/libs/openssl/crypto/dso/dso_lib.c
+++ b/contrib/libs/openssl/crypto/dso/dso_lib.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "dso_local.h" 
+#include "dso_local.h"
 #include "internal/refcount.h"
 
 static DSO_METHOD *default_DSO_meth = NULL;
diff --git a/contrib/libs/openssl/crypto/dso/dso_local.h b/contrib/libs/openssl/crypto/dso/dso_local.h
index 209e5bcb04..43b7df9d78 100644
--- a/contrib/libs/openssl/crypto/dso/dso_local.h
+++ b/contrib/libs/openssl/crypto/dso/dso_local.h
@@ -1,107 +1,107 @@
-/* 
- * Copyright 2016 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 
- * in the file LICENSE in the source distribution or at 
- * https://www.openssl.org/source/license.html 
- */ 
- 
-#include <stdio.h> 
-#include "internal/cryptlib.h" 
-#include "internal/dso.h" 
-#include "crypto/dso_conf.h" 
-#include "internal/refcount.h" 
- 
-/**********************************************************************/ 
-/* The low-level handle type used to refer to a loaded shared library */ 
- 
-struct dso_st { 
-    DSO_METHOD *meth; 
-    /* 
-     * Standard dlopen uses a (void *). Win32 uses a HANDLE. VMS doesn't use 
-     * anything but will need to cache the filename for use in the dso_bind 
-     * handler. All in all, let each method control its own destiny. 
-     * "Handles" and such go in a STACK. 
-     */ 
-    STACK_OF(void) *meth_data; 
-    CRYPTO_REF_COUNT references; 
-    int flags; 
-    /* 
-     * For use by applications etc ... use this for your bits'n'pieces, don't 
-     * touch meth_data! 
-     */ 
-    CRYPTO_EX_DATA ex_data; 
-    /* 
-     * If this callback function pointer is set to non-NULL, then it will be 
-     * used in DSO_load() in place of meth->dso_name_converter. NB: This 
-     * should normally set using DSO_set_name_converter(). 
-     */ 
-    DSO_NAME_CONVERTER_FUNC name_converter; 
-    /* 
-     * If this callback function pointer is set to non-NULL, then it will be 
-     * used in DSO_load() in place of meth->dso_merger. NB: This should 
-     * normally set using DSO_set_merger(). 
-     */ 
-    DSO_MERGER_FUNC merger; 
-    /* 
-     * This is populated with (a copy of) the platform-independent filename 
-     * used for this DSO. 
-     */ 
-    char *filename; 
-    /* 
-     * This is populated with (a copy of) the translated filename by which 
-     * the DSO was actually loaded. It is NULL iff the DSO is not currently 
-     * loaded. NB: This is here because the filename translation process may 
-     * involve a callback being invoked more than once not only to convert to 
-     * a platform-specific form, but also to try different filenames in the 
-     * process of trying to perform a load. As such, this variable can be 
-     * used to indicate (a) whether this DSO structure corresponds to a 
-     * loaded library or not, and (b) the filename with which it was actually 
-     * loaded. 
-     */ 
-    char *loaded_filename; 
-    CRYPTO_RWLOCK *lock; 
-}; 
- 
-struct dso_meth_st { 
-    const char *name; 
-    /* 
-     * Loads a shared library, NB: new DSO_METHODs must ensure that a 
-     * successful load populates the loaded_filename field, and likewise a 
-     * successful unload OPENSSL_frees and NULLs it out. 
-     */ 
-    int (*dso_load) (DSO *dso); 
-    /* Unloads a shared library */ 
-    int (*dso_unload) (DSO *dso); 
-    /* 
-     * Binds a function - assumes a return type of DSO_FUNC_TYPE. This should 
-     * be cast to the real function prototype by the caller. Platforms that 
-     * don't have compatible representations for different prototypes (this 
-     * is possible within ANSI C) are highly unlikely to have shared 
-     * libraries at all, let alone a DSO_METHOD implemented for them. 
-     */ 
-    DSO_FUNC_TYPE (*dso_bind_func) (DSO *dso, const char *symname); 
-    /* 
-     * The generic (yuck) "ctrl()" function. NB: Negative return values 
-     * (rather than zero) indicate errors. 
-     */ 
-    long (*dso_ctrl) (DSO *dso, int cmd, long larg, void *parg); 
-    /* 
-     * The default DSO_METHOD-specific function for converting filenames to a 
-     * canonical native form. 
-     */ 
-    DSO_NAME_CONVERTER_FUNC dso_name_converter; 
-    /* 
-     * The default DSO_METHOD-specific function for converting filenames to a 
-     * canonical native form. 
-     */ 
-    DSO_MERGER_FUNC dso_merger; 
-    /* [De]Initialisation handlers. */ 
-    int (*init) (DSO *dso); 
-    int (*finish) (DSO *dso); 
-    /* Return pathname of the module containing location */ 
-    int (*pathbyaddr) (void *addr, char *path, int sz); 
-    /* Perform global symbol lookup, i.e. among *all* modules */ 
-    void *(*globallookup) (const char *symname); 
-}; 
+/*
+ * Copyright 2016 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
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#include <stdio.h>
+#include "internal/cryptlib.h"
+#include "internal/dso.h"
+#include "crypto/dso_conf.h"
+#include "internal/refcount.h"
+
+/**********************************************************************/
+/* The low-level handle type used to refer to a loaded shared library */
+
+struct dso_st {
+    DSO_METHOD *meth;
+    /*
+     * Standard dlopen uses a (void *). Win32 uses a HANDLE. VMS doesn't use
+     * anything but will need to cache the filename for use in the dso_bind
+     * handler. All in all, let each method control its own destiny.
+     * "Handles" and such go in a STACK.
+     */
+    STACK_OF(void) *meth_data;
+    CRYPTO_REF_COUNT references;
+    int flags;
+    /*
+     * For use by applications etc ... use this for your bits'n'pieces, don't
+     * touch meth_data!
+     */
+    CRYPTO_EX_DATA ex_data;
+    /*
+     * If this callback function pointer is set to non-NULL, then it will be
+     * used in DSO_load() in place of meth->dso_name_converter. NB: This
+     * should normally set using DSO_set_name_converter().
+     */
+    DSO_NAME_CONVERTER_FUNC name_converter;
+    /*
+     * If this callback function pointer is set to non-NULL, then it will be
+     * used in DSO_load() in place of meth->dso_merger. NB: This should
+     * normally set using DSO_set_merger().
+     */
+    DSO_MERGER_FUNC merger;
+    /*
+     * This is populated with (a copy of) the platform-independent filename
+     * used for this DSO.
+     */
+    char *filename;
+    /*
+     * This is populated with (a copy of) the translated filename by which
+     * the DSO was actually loaded. It is NULL iff the DSO is not currently
+     * loaded. NB: This is here because the filename translation process may
+     * involve a callback being invoked more than once not only to convert to
+     * a platform-specific form, but also to try different filenames in the
+     * process of trying to perform a load. As such, this variable can be
+     * used to indicate (a) whether this DSO structure corresponds to a
+     * loaded library or not, and (b) the filename with which it was actually
+     * loaded.
+     */
+    char *loaded_filename;
+    CRYPTO_RWLOCK *lock;
+};
+
+struct dso_meth_st {
+    const char *name;
+    /*
+     * Loads a shared library, NB: new DSO_METHODs must ensure that a
+     * successful load populates the loaded_filename field, and likewise a
+     * successful unload OPENSSL_frees and NULLs it out.
+     */
+    int (*dso_load) (DSO *dso);
+    /* Unloads a shared library */
+    int (*dso_unload) (DSO *dso);
+    /*
+     * Binds a function - assumes a return type of DSO_FUNC_TYPE. This should
+     * be cast to the real function prototype by the caller. Platforms that
+     * don't have compatible representations for different prototypes (this
+     * is possible within ANSI C) are highly unlikely to have shared
+     * libraries at all, let alone a DSO_METHOD implemented for them.
+     */
+    DSO_FUNC_TYPE (*dso_bind_func) (DSO *dso, const char *symname);
+    /*
+     * The generic (yuck) "ctrl()" function. NB: Negative return values
+     * (rather than zero) indicate errors.
+     */
+    long (*dso_ctrl) (DSO *dso, int cmd, long larg, void *parg);
+    /*
+     * The default DSO_METHOD-specific function for converting filenames to a
+     * canonical native form.
+     */
+    DSO_NAME_CONVERTER_FUNC dso_name_converter;
+    /*
+     * The default DSO_METHOD-specific function for converting filenames to a
+     * canonical native form.
+     */
+    DSO_MERGER_FUNC dso_merger;
+    /* [De]Initialisation handlers. */
+    int (*init) (DSO *dso);
+    int (*finish) (DSO *dso);
+    /* Return pathname of the module containing location */
+    int (*pathbyaddr) (void *addr, char *path, int sz);
+    /* Perform global symbol lookup, i.e. among *all* modules */
+    void *(*globallookup) (const char *symname);
+};
diff --git a/contrib/libs/openssl/crypto/dso/dso_openssl.c b/contrib/libs/openssl/crypto/dso/dso_openssl.c
index a456706e00..c76a04db23 100644
--- a/contrib/libs/openssl/crypto/dso/dso_openssl.c
+++ b/contrib/libs/openssl/crypto/dso/dso_openssl.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "dso_local.h" 
+#include "dso_local.h"
 
 #ifdef DSO_NONE
 
diff --git a/contrib/libs/openssl/crypto/dso/dso_vms.c b/contrib/libs/openssl/crypto/dso/dso_vms.c
index 945544708e..9d1066f915 100644
--- a/contrib/libs/openssl/crypto/dso/dso_vms.c
+++ b/contrib/libs/openssl/crypto/dso/dso_vms.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "dso_local.h" 
+#include "dso_local.h"
 
 #ifdef OPENSSL_SYS_VMS
 
diff --git a/contrib/libs/openssl/crypto/dso/dso_win32.c b/contrib/libs/openssl/crypto/dso/dso_win32.c
index 2dfd9de70b..af1e559d76 100644
--- a/contrib/libs/openssl/crypto/dso/dso_win32.c
+++ b/contrib/libs/openssl/crypto/dso/dso_win32.c
@@ -8,7 +8,7 @@
  */
 
 #include "e_os.h"
-#include "dso_local.h" 
+#include "dso_local.h"
 
 #if defined(DSO_WIN32)