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

5 files changed, 77 insertions, 77 deletions

diff --git a/contrib/tools/yasm/libyasm/dbgfmt.h b/contrib/tools/yasm/libyasm/dbgfmt.h
index 2e5ea867ee..fb5bf4cfbb 100644
--- a/contrib/tools/yasm/libyasm/dbgfmt.h
+++ b/contrib/tools/yasm/libyasm/dbgfmt.h
@@ -69,15 +69,15 @@ struct yasm_dbgfmt_module {
      */
     void (*generate) (yasm_object *object, yasm_linemap *linemap,
                       yasm_errwarns *errwarns);
-
-    /**
-     * --replace params
-     */
-    const char** replace_map;
-    /**
-     * Number of elements in replace_map
-     */
-    int replace_map_size;
+ 
+    /** 
+     * --replace params 
+     */ 
+    const char** replace_map; 
+    /** 
+     * Number of elements in replace_map 
+     */ 
+    int replace_map_size; 
 };
 
 /** Get the keyword used to select a debug format.
diff --git a/contrib/tools/yasm/libyasm/objfmt.h b/contrib/tools/yasm/libyasm/objfmt.h
index a8b5f8a161..48e26a7ce9 100644
--- a/contrib/tools/yasm/libyasm/objfmt.h
+++ b/contrib/tools/yasm/libyasm/objfmt.h
@@ -123,15 +123,15 @@ struct yasm_objfmt_module {
     /*@observer@*/ /*@null@*/ yasm_symrec *
         (*get_special_sym)(yasm_object *object, const char *name,
                            const char *parser);
-
-    /**
-     * --replace params
-     */
-    const char** replace_map;
-    /**
-     * Number of elements in replace_map
-     */
-    int replace_map_size;
+ 
+    /** 
+     * --replace params 
+     */ 
+    const char** replace_map; 
+    /** 
+     * Number of elements in replace_map 
+     */ 
+    int replace_map_size; 
 };
 
 /** Create object format.
diff --git a/contrib/tools/yasm/libyasm/replace_path.c b/contrib/tools/yasm/libyasm/replace_path.c
index 0deba70a6b..b0301ef705 100644
--- a/contrib/tools/yasm/libyasm/replace_path.c
+++ b/contrib/tools/yasm/libyasm/replace_path.c
@@ -1,54 +1,54 @@
-/*
- * Copyright (c) 1988, 1993, 2019
- *      The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include "util.h"
-
-char * yasm_replace_path(const char* replace_map[], int size, const char* str, int pref_len) {
-    int i;
-    for (i=0; i<size; i++) {
-        const char* pos = strchr(replace_map[i], '=');
-        if (!pos) {
-            continue;
-        }
-        int repl_size = pos - replace_map[i];
-        if (pref_len < repl_size) {
-            continue;
-        }
-        if (strncmp(replace_map[i], str, repl_size)) {
-            continue;
-        }
-        int subs_size = strlen(replace_map[i]) - (repl_size + 1);
-        int size = subs_size + pref_len - repl_size + 1;
-        char* out = yasm_xmalloc(size);
-        strncpy(out, pos + 1, subs_size);
-        strncpy(out + subs_size, str + repl_size, pref_len - repl_size);
-        out[size - 1] = '\0';
-        return out;
-    }
-    return yasm__xstrndup(str, pref_len);
-}
+/* 
+ * Copyright (c) 1988, 1993, 2019 
+ *      The Regents of the University of California.  All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions 
+ * are met: 
+ * 1. Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer. 
+ * 2. Redistributions in binary form must reproduce the above copyright 
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the distribution. 
+ * 3. Neither the name of the University nor the names of its contributors 
+ *    may be used to endorse or promote products derived from this software 
+ *    without specific prior written permission. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * SUCH DAMAGE. 
+ */ 
+#include "util.h" 
+ 
+char * yasm_replace_path(const char* replace_map[], int size, const char* str, int pref_len) { 
+    int i; 
+    for (i=0; i<size; i++) { 
+        const char* pos = strchr(replace_map[i], '='); 
+        if (!pos) { 
+            continue; 
+        } 
+        int repl_size = pos - replace_map[i]; 
+        if (pref_len < repl_size) { 
+            continue; 
+        } 
+        if (strncmp(replace_map[i], str, repl_size)) { 
+            continue; 
+        } 
+        int subs_size = strlen(replace_map[i]) - (repl_size + 1); 
+        int size = subs_size + pref_len - repl_size + 1; 
+        char* out = yasm_xmalloc(size); 
+        strncpy(out, pos + 1, subs_size); 
+        strncpy(out + subs_size, str + repl_size, pref_len - repl_size); 
+        out[size - 1] = '\0'; 
+        return out; 
+    } 
+    return yasm__xstrndup(str, pref_len); 
+} 
diff --git a/contrib/tools/yasm/libyasm/section.c b/contrib/tools/yasm/libyasm/section.c
index 729d7770a4..903d3eb1fe 100644
--- a/contrib/tools/yasm/libyasm/section.c
+++ b/contrib/tools/yasm/libyasm/section.c
@@ -220,7 +220,7 @@ yasm_object_create(const char *src_filename, const char *obj_filename,
     int matched, i;
 
     object->src_filename = yasm__xstrdup(src_filename);
-    object->deb_filename = NULL;
+    object->deb_filename = NULL; 
     object->obj_filename = yasm__xstrdup(obj_filename);
 
     /* No prefix/suffix */
@@ -385,8 +385,8 @@ yasm_object_set_source_fn(yasm_object *object, const char *src_filename)
 {
     yasm_xfree(object->src_filename);
     object->src_filename = yasm__xstrdup(src_filename);
-    yasm_xfree(object->deb_filename);
-    object->deb_filename = NULL;
+    yasm_xfree(object->deb_filename); 
+    object->deb_filename = NULL; 
 }
 
 void
@@ -483,7 +483,7 @@ yasm_object_destroy(yasm_object *object)
 
     /* Delete associated filenames */
     yasm_xfree(object->src_filename);
-    yasm_xfree(object->deb_filename);
+    yasm_xfree(object->deb_filename); 
     yasm_xfree(object->obj_filename);
 
     /* Delete symbol table */
diff --git a/contrib/tools/yasm/libyasm/section.h b/contrib/tools/yasm/libyasm/section.h
index 521031f3a5..7ed9696725 100644
--- a/contrib/tools/yasm/libyasm/section.h
+++ b/contrib/tools/yasm/libyasm/section.h
@@ -48,7 +48,7 @@ struct yasm_reloc {
 /** An object.  This is the internal representation of an object file. */
 struct yasm_object {
     /*@owned@*/ char *src_filename;     /**< Source filename */
-    /*@owned@*/ char *deb_filename;     /**< Debug filename */
+    /*@owned@*/ char *deb_filename;     /**< Debug filename */ 
     /*@owned@*/ char *obj_filename;     /**< Object filename */
 
     /*@owned@*/ yasm_symtab *symtab;    /**< Symbol table */