system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-23 02:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

str_concat() doesn't really take const arguments.

Browse source 
Submitted by:	bde
Pointy hat to:	jmallett
This commit is contained in:
Juli Mallett 2002-05-22 15:34:00 +00:00
parent ea98f295f7
commit 8eccf3b248
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=97123
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr.bin/make/nonints.h
View file

@ -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 *);

6
usr.bin/make/str.c
View file

@ -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);
}