Update copyright headers

[strace] / tests / hexdump_strdup.c

diff --git a/tests/hexdump_strdup.c b/tests/hexdump_strdup.c
index d7e083a4d7a936759e2e30f9bb8b9eabac05f637..d2b8344872c8376d41ef766fc9fc544114eb8de3 100644 (file)
--- a/tests/hexdump_strdup.c
+++ b/tests/hexdump_strdup.c
@@ -1,30 +1,10 @@
 /*
  * Make a hexdump copy of C string
  *
- * Copyright (c) 2016 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2016-2018 Dmitry V. Levin <ldv@altlinux.org>
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "tests.h"
@@ -34,11 +14,10 @@
 #include <string.h>
 
 const char *
-hexdump_strdup(const char *src)
+hexdump_memdup(const char *src, size_t len)
 {
-       size_t src_len = strlen(src);
-       size_t dst_size = 3 * src_len + 2;
-       assert(dst_size > src_len);
+       size_t dst_size = 3 * len + 2;
+       assert(dst_size > len);
 
        char *dst = malloc(dst_size);
        if (!dst)
@@ -46,8 +25,8 @@ hexdump_strdup(const char *src)
 
        char *p = dst;
        const unsigned char *usrc = (const unsigned char *) src;
-       unsigned int i;
-       for (i = 0; usrc[i]; ++i) {
+       size_t i;
+       for (i = 0; i < len; ++i) {
                unsigned int c = usrc[i];
                *(p++) = ' ';
                if (i == 8)
@@ -59,3 +38,9 @@ hexdump_strdup(const char *src)
 
        return dst;
 }
+
+const char *
+hexdump_strdup(const char *src)
+{
+       return hexdump_memdup(src, strlen(src));
+}