Wed Sep 2 06:10:44 2020 UTC ()
make(1): remove redundancy from comments in make_malloc.c


(rillig)
diff -r1.17 -r1.18 src/usr.bin/make/make_malloc.c
cvs diff -r1.17 -r1.18 src/usr.bin/make/make_malloc.c (expand / switch to unified diff)

--- src/usr.bin/make/make_malloc.c 2020/08/29 16:47:45 1.17
+++ src/usr.bin/make/make_malloc.c 2020/09/02 06:10:44 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: make_malloc.c,v 1.17 2020/08/29 16:47:45 rillig Exp $ */ 1/* $NetBSD: make_malloc.c,v 1.18 2020/09/02 06:10:44 rillig Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2009 The NetBSD Foundation, Inc. 4 * Copyright (c) 2009 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -18,96 +18,84 @@ @@ -18,96 +18,84 @@
18 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 18 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
19 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 19 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
20 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 20 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
26 * POSSIBILITY OF SUCH DAMAGE. 26 * POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29#ifdef MAKE_NATIVE 29#ifdef MAKE_NATIVE
30#include <sys/cdefs.h> 30#include <sys/cdefs.h>
31__RCSID("$NetBSD: make_malloc.c,v 1.17 2020/08/29 16:47:45 rillig Exp $"); 31__RCSID("$NetBSD: make_malloc.c,v 1.18 2020/09/02 06:10:44 rillig Exp $");
32#endif 32#endif
33 33
34#include <stdio.h> 34#include <stdio.h>
35#include <stdlib.h> 35#include <stdlib.h>
36#include <string.h> 36#include <string.h>
37#include <errno.h> 37#include <errno.h>
38 38
39#include "make.h" 39#include "make.h"
40 40
41#ifndef USE_EMALLOC 41#ifndef USE_EMALLOC
42static MAKE_ATTR_DEAD void enomem(void); 42static MAKE_ATTR_DEAD void enomem(void);
43 43
44/* 44/* die when out of memory. */
45 * enomem -- 
46 * die when out of memory. 
47 */ 
48static MAKE_ATTR_DEAD void 45static MAKE_ATTR_DEAD void
49enomem(void) 46enomem(void)
50{ 47{
51 (void)fprintf(stderr, "%s: %s.\n", progname, strerror(ENOMEM)); 48 (void)fprintf(stderr, "%s: %s.\n", progname, strerror(ENOMEM));
52 exit(2); 49 exit(2);
53} 50}
54 51
55/* 52/* malloc, but die on error. */
56 * bmake_malloc -- 
57 * malloc, but die on error. 
58 */ 
59void * 53void *
60bmake_malloc(size_t len) 54bmake_malloc(size_t len)
61{ 55{
62 void *p; 56 void *p;
63 57
64 if ((p = malloc(len)) == NULL) 58 if ((p = malloc(len)) == NULL)
65 enomem(); 59 enomem();
66 return p; 60 return p;
67} 61}
68 62
69/* 63/* strdup, but die on error. */
70 * bmake_strdup -- 
71 * strdup, but die on error. 
72 */ 
73char * 64char *
74bmake_strdup(const char *str) 65bmake_strdup(const char *str)
75{ 66{
76 size_t len; 67 size_t len;
77 char *p; 68 char *p;
78 69
79 len = strlen(str) + 1; 70 len = strlen(str) + 1;
80 if ((p = malloc(len)) == NULL) 71 if ((p = malloc(len)) == NULL)
81 enomem(); 72 enomem();
82 return memcpy(p, str, len); 73 return memcpy(p, str, len);
83} 74}
84 75
85/* Allocate a string starting from str with exactly len characters. */ 76/* Allocate a string starting from str with exactly len characters. */
86char * 77char *
87bmake_strldup(const char *str, size_t len) 78bmake_strldup(const char *str, size_t len)
88{ 79{
89 char *p = bmake_malloc(len + 1); 80 char *p = bmake_malloc(len + 1);
90 memcpy(p, str, len); 81 memcpy(p, str, len);
91 p[len] = '\0'; 82 p[len] = '\0';
92 return p; 83 return p;
93} 84}
94 85
95/* 86/* realloc, but die on error. */
96 * bmake_realloc -- 
97 * realloc, but die on error. 
98 */ 
99void * 87void *
100bmake_realloc(void *ptr, size_t size) 88bmake_realloc(void *ptr, size_t size)
101{ 89{
102 if ((ptr = realloc(ptr, size)) == NULL) 90 if ((ptr = realloc(ptr, size)) == NULL)
103 enomem(); 91 enomem();
104 return ptr; 92 return ptr;
105} 93}
106#endif 94#endif
107 95
108/* Allocate a string from start up to but excluding end. */ 96/* Allocate a string from start up to but excluding end. */
109char * 97char *
110bmake_strsedup(const char *start, const char *end) 98bmake_strsedup(const char *start, const char *end)
111{ 99{
112 return bmake_strldup(start, (size_t)(end - start)); 100 return bmake_strldup(start, (size_t)(end - start));
113} 101}