Re: cvs commit: src/usr.bin/make

[Max Okumoto <okumoto@home>]

Hi Mat,

The patch to str.c causes a syntax error.  __DEFCONT is not defined.
Ether we cast the s1 pointer to "void *" or we have to change the
str_concat(const char *s1, char *s2, int flags) proto type to pass
s1 as a "char *".

str_concat() does not modify the strings  s1 and s2, but may call
free() on those two strings.  So I think the prototype should be
changed to  str_concat(char *s1, char *s2, int flags).

				Max


Matthew Dillon wrote:
> dillon      2004/11/12 14:02:51 PST
>
> DragonFly src repository
>
>   Modified files:
>     usr.bin/make         arch.c buf.c buf.h compat.c cond.c 
>                          config.h dir.c dir.h for.c hash.c hash.h 
>                          job.c job.h list.h lst.h main.c make.1 
>                          make.c nonints.h parse.c str.c suff.c 
>                          targ.c var.c 
>   Log:
>   Do some deregisterization.
>   
>   Taken-From: FreeBSD/obrien.
>   
>   Revision  Changes    Path
>   1.7       +1 -1      src/usr.bin/make/arch.c
>   1.3       +12 -11    src/usr.bin/make/buf.c
>   1.4       +2 -1      src/usr.bin/make/buf.h
>   1.6       +3 -2      src/usr.bin/make/compat.c
>   1.7       +6 -5      src/usr.bin/make/cond.c
>   1.3       +3 -2      src/usr.bin/make/config.h
>   1.6       +10 -9     src/usr.bin/make/dir.c
>   1.5       +2 -1      src/usr.bin/make/dir.h
>   1.5       +5 -2      src/usr.bin/make/for.c
>   1.5       +22 -22    src/usr.bin/make/hash.c
>   1.5       +2 -1      src/usr.bin/make/hash.h
>   1.8       +26 -23    src/usr.bin/make/job.c
>   1.5       +3 -2      src/usr.bin/make/job.h
>   1.4       +2 -1      src/usr.bin/make/list.h
>   1.6       +2 -1      src/usr.bin/make/lst.h
>   1.10      +2 -1      src/usr.bin/make/main.c
>   1.5       +1 -0      src/usr.bin/make/make.1
>   1.6       +14 -14    src/usr.bin/make/make.c
>   1.7       +1 -1      src/usr.bin/make/nonints.h
>   1.7       +11 -11    src/usr.bin/make/parse.c
>   1.5       +12 -12    src/usr.bin/make/str.c
>   1.8       +12 -12    src/usr.bin/make/suff.c
>   1.6       +6 -6      src/usr.bin/make/targ.c
>   1.7       +15 -15    src/usr.bin/make/var.c
>
>
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/arch.c.diff?r1=1.6&r2=1.7&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/buf.c.diff?r1=1.2&r2=1.3&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/buf.h.diff?r1=1.3&r2=1.4&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/compat.c.diff?r1=1.5&r2=1.6&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/cond.c.diff?r1=1.6&r2=1.7&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/config.h.diff?r1=1.2&r2=1.3&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/dir.c.diff?r1=1.5&r2=1.6&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/dir.h.diff?r1=1.4&r2=1.5&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/for.c.diff?r1=1.4&r2=1.5&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/hash.c.diff?r1=1.4&r2=1.5&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/hash.h.diff?r1=1.4&r2=1.5&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/job.c.diff?r1=1.7&r2=1.8&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/job.h.diff?r1=1.4&r2=1.5&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/list.h.diff?r1=1.3&r2=1.4&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/lst.h.diff?r1=1.5&r2=1.6&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/main.c.diff?r1=1.9&r2=1.10&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/make.1.diff?r1=1.4&r2=1.5&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/make.c.diff?r1=1.5&r2=1.6&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/nonints.h.diff?r1=1.6&r2=1.7&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/parse.c.diff?r1=1.6&r2=1.7&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/str.c.diff?r1=1.4&r2=1.5&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/suff.c.diff?r1=1.7&r2=1.8&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/targ.c.diff?r1=1.5&r2=1.6&f=u
> http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/var.c.diff?r1=1.6&r2=1.7&f=u