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

1 files changed, 114 insertions, 114 deletions

diff --git a/contrib/tools/yasm/libyasm/xmalloc.c b/contrib/tools/yasm/libyasm/xmalloc.c
index 8931a42b30d..81b608c078b 100644
--- a/contrib/tools/yasm/libyasm/xmalloc.c
+++ b/contrib/tools/yasm/libyasm/xmalloc.c
@@ -1,114 +1,114 @@
-/* 
- * Memory allocation routines with error checking.  Idea from GNU libiberty. 
- * 
- *  Copyright (C) 2001-2007  Peter Johnson 
- * 
- * 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. 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND OTHER 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 AUTHOR OR OTHER 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" 
- 
-#include "coretype.h" 
-#include "errwarn.h" 
- 
- 
-#ifdef WITH_DMALLOC 
-#undef yasm_xmalloc 
-#undef yasm_xcalloc 
-#undef yasm_xrealloc 
-#undef yasm_xfree 
-#endif 
- 
-static /*@only@*/ /*@out@*/ void *def_xmalloc(size_t size); 
-static /*@only@*/ void *def_xcalloc(size_t nelem, size_t elsize); 
-static /*@only@*/ void *def_xrealloc 
-    (/*@only@*/ /*@out@*/ /*@returned@*/ /*@null@*/ void *oldmem, size_t size) 
-    /*@modifies oldmem@*/; 
-static void def_xfree(/*@only@*/ /*@out@*/ /*@null@*/ void *p) 
-    /*@modifies p@*/; 
- 
-/* storage for global function pointers */ 
-YASM_LIB_DECL 
-/*@only@*/ /*@out@*/ void * (*yasm_xmalloc) (size_t size) = def_xmalloc; 
-YASM_LIB_DECL 
-/*@only@*/ void * (*yasm_xcalloc) (size_t nelem, size_t elsize) = def_xcalloc; 
-YASM_LIB_DECL 
-/*@only@*/ void * (*yasm_xrealloc) 
-    (/*@only@*/ /*@out@*/ /*@returned@*/ /*@null@*/ void *oldmem, size_t size) 
-    /*@modifies oldmem@*/ = def_xrealloc; 
-YASM_LIB_DECL 
-void (*yasm_xfree) (/*@only@*/ /*@out@*/ /*@null@*/ void *p) 
-    /*@modifies p@*/ = def_xfree; 
- 
- 
-static void * 
-def_xmalloc(size_t size) 
-{ 
-    void *newmem; 
- 
-    if (size == 0) 
-        size = 1; 
-    newmem = malloc(size); 
-    if (!newmem) 
-        yasm__fatal(N_("out of memory")); 
- 
-    return newmem; 
-} 
- 
-static void * 
-def_xcalloc(size_t nelem, size_t elsize) 
-{ 
-    void *newmem; 
- 
-    if (nelem == 0 || elsize == 0) 
-        nelem = elsize = 1; 
- 
-    newmem = calloc(nelem, elsize); 
-    if (!newmem) 
-        yasm__fatal(N_("out of memory")); 
- 
-    return newmem; 
-} 
- 
-static void * 
-def_xrealloc(void *oldmem, size_t size) 
-{ 
-    void *newmem; 
- 
-    if (size == 0) 
-        size = 1; 
-    if (!oldmem) 
-        newmem = malloc(size); 
-    else 
-        newmem = realloc(oldmem, size); 
-    if (!newmem) 
-        yasm__fatal(N_("out of memory")); 
- 
-    return newmem; 
-} 
- 
-static void 
-def_xfree(void *p) 
-{ 
-    if (!p) 
-        return; 
-    free(p); 
-} 
+/*
+ * Memory allocation routines with error checking.  Idea from GNU libiberty.
+ *
+ *  Copyright (C) 2001-2007  Peter Johnson
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND OTHER 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 AUTHOR OR OTHER 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"
+
+#include "coretype.h"
+#include "errwarn.h"
+
+
+#ifdef WITH_DMALLOC
+#undef yasm_xmalloc
+#undef yasm_xcalloc
+#undef yasm_xrealloc
+#undef yasm_xfree
+#endif
+
+static /*@only@*/ /*@out@*/ void *def_xmalloc(size_t size);
+static /*@only@*/ void *def_xcalloc(size_t nelem, size_t elsize);
+static /*@only@*/ void *def_xrealloc
+    (/*@only@*/ /*@out@*/ /*@returned@*/ /*@null@*/ void *oldmem, size_t size)
+    /*@modifies oldmem@*/;
+static void def_xfree(/*@only@*/ /*@out@*/ /*@null@*/ void *p)
+    /*@modifies p@*/;
+
+/* storage for global function pointers */
+YASM_LIB_DECL
+/*@only@*/ /*@out@*/ void * (*yasm_xmalloc) (size_t size) = def_xmalloc;
+YASM_LIB_DECL
+/*@only@*/ void * (*yasm_xcalloc) (size_t nelem, size_t elsize) = def_xcalloc;
+YASM_LIB_DECL
+/*@only@*/ void * (*yasm_xrealloc)
+    (/*@only@*/ /*@out@*/ /*@returned@*/ /*@null@*/ void *oldmem, size_t size)
+    /*@modifies oldmem@*/ = def_xrealloc;
+YASM_LIB_DECL
+void (*yasm_xfree) (/*@only@*/ /*@out@*/ /*@null@*/ void *p)
+    /*@modifies p@*/ = def_xfree;
+
+
+static void *
+def_xmalloc(size_t size)
+{
+    void *newmem;
+
+    if (size == 0)
+        size = 1;
+    newmem = malloc(size);
+    if (!newmem)
+        yasm__fatal(N_("out of memory"));
+
+    return newmem;
+}
+
+static void *
+def_xcalloc(size_t nelem, size_t elsize)
+{
+    void *newmem;
+
+    if (nelem == 0 || elsize == 0)
+        nelem = elsize = 1;
+
+    newmem = calloc(nelem, elsize);
+    if (!newmem)
+        yasm__fatal(N_("out of memory"));
+
+    return newmem;
+}
+
+static void *
+def_xrealloc(void *oldmem, size_t size)
+{
+    void *newmem;
+
+    if (size == 0)
+        size = 1;
+    if (!oldmem)
+        newmem = malloc(size);
+    else
+        newmem = realloc(oldmem, size);
+    if (!newmem)
+        yasm__fatal(N_("out of memory"));
+
+    return newmem;
+}
+
+static void
+def_xfree(void *p)
+{
+    if (!p)
+        return;
+    free(p);
+}