The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=db7f7446b5bcb26c7aaf13c8151b4ae8051c5732
commit db7f7446b5bcb26c7aaf13c8151b4ae8051c5732 Author: Kyle Evans <[email protected]> AuthorDate: 2021-08-19 06:13:13 +0000 Commit: Kyle Evans <[email protected]> CommitDate: 2021-08-19 17:47:08 +0000 crunchgen: sprinkle some const-poisoning around Reviewed by: arichardson, imp Differential Revision: https://reviews.freebsd.org/D31607 --- usr.sbin/crunch/crunchgen/crunchgen.c | 10 +++++----- usr.sbin/crunch/crunchgen/mkskel.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c index 95ed5ca6636a..c6cf2a08cc7b 100644 --- a/usr.sbin/crunch/crunchgen/crunchgen.c +++ b/usr.sbin/crunch/crunchgen/crunchgen.c @@ -96,8 +96,8 @@ char outmkname[MAXPATHLEN], outcfname[MAXPATHLEN], execfname[MAXPATHLEN]; char tempfname[MAXPATHLEN], cachename[MAXPATHLEN], curfilename[MAXPATHLEN]; bool tempfname_initialized = false; char outhdrname[MAXPATHLEN] ; /* user-supplied header for *.mk */ -char *objprefix; /* where are the objects ? */ -char *path_make; +const char *objprefix; /* where are the objects ? */ +const char *path_make; int linenum = -1; int goterror = 0; @@ -123,7 +123,7 @@ void usage(void); void parse_conf_file(void); void gen_outputs(void); -extern char *crunched_skel[]; +extern const char *crunched_skel[]; int @@ -721,7 +721,7 @@ fillin_program_objs(prog_t *p, char *path) char *obj, *cp; int fd, rc; FILE *f; - char *objvar="OBJS"; + const char *objvar="OBJS"; strlst_t *s; char line[MAXLINELEN]; @@ -912,7 +912,7 @@ gen_output_makefile(void) void gen_output_cfile(void) { - char **cp; + const char **cp; FILE *outcf; prog_t *p; strlst_t *s; diff --git a/usr.sbin/crunch/crunchgen/mkskel.sh b/usr.sbin/crunch/crunchgen/mkskel.sh index fd53d78bbbac..274bb7274cbd 100644 --- a/usr.sbin/crunch/crunchgen/mkskel.sh +++ b/usr.sbin/crunch/crunchgen/mkskel.sh @@ -4,7 +4,7 @@ cat <<!EOF /* File created via mkskel.sh */ -char *crunched_skel[] = { +const char *crunched_skel[] = { !EOF sed 's/\\/&&/g' $* | sed 's/"/\\"/g' | sed 's/.*/ "&",/' _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "[email protected]"
