diff options
| author | jmallett <jmallett@FreeBSD.org> | 2002-05-22 15:34:00 +0000 |
|---|---|---|
| committer | jmallett <jmallett@FreeBSD.org> | 2002-05-22 15:34:00 +0000 |
| commit | a743481874ce384bc57c84574361b94b99991ee8 (patch) | |
| tree | fdb8dce7a688f2f2ae79850004bbdb84318499ae /usr.bin/make | |
| parent | 7d529109a8eef4f08e3bc6a3f4776582eab7765f (diff) | |
| download | FreeBSD-src-a743481874ce384bc57c84574361b94b99991ee8.zip FreeBSD-src-a743481874ce384bc57c84574361b94b99991ee8.tar.gz | |
str_concat() doesn't really take const arguments.
Submitted by: bde
Pointy hat to: jmallett
Diffstat (limited to 'usr.bin/make')
| -rw-r--r-- | usr.bin/make/nonints.h | 2 | ||||
| -rw-r--r-- | usr.bin/make/str.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/make/nonints.h b/usr.bin/make/nonints.h index ad1e46d..24e629b 100644 --- a/usr.bin/make/nonints.h +++ b/usr.bin/make/nonints.h @@ -95,7 +95,7 @@ Lst Parse_MainName(void); /* str.c */ void str_init(void); void str_end(void); -char *str_concat(const char *, const char *, int); +char *str_concat(char *, char *, int); char **brk_string(char *, int *, Boolean); char *Str_FindSubstring(char *, char *); int Str_Match(char *, char *); diff --git a/usr.bin/make/str.c b/usr.bin/make/str.c index 1b14426..0475759 100644 --- a/usr.bin/make/str.c +++ b/usr.bin/make/str.c @@ -87,7 +87,7 @@ str_end() */ char * str_concat(s1, s2, flags) - const char *s1, *s2; + char *s1, *s2; int flags; { int len1, len2; @@ -117,8 +117,8 @@ str_concat(s1, s2, flags) /* free original strings */ if (flags & STR_DOFREE) { - (void)efree((void *)s1); - (void)efree((void *)s2); + (void)efree(s1); + (void)efree(s2); } return(result); } |
