diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c index bf98c9195598..7f7b3dc1c05b 100644 --- a/usr.bin/make/job.c +++ b/usr.bin/make/job.c @@ -1095,7 +1095,7 @@ Boolean Job_CheckCommands(gn, abortProc) GNode *gn; /* The target whose commands need * verifying */ - void (*abortProc)(char *, ...); + void (*abortProc)(const char *, ...); /* Function to abort with message */ { if (OP_NOP(gn->type) && Lst_IsEmpty(gn->commands) && diff --git a/usr.bin/make/job.h b/usr.bin/make/job.h index 98d7994bb013..6cba4a67d4f2 100644 --- a/usr.bin/make/job.h +++ b/usr.bin/make/job.h @@ -221,7 +221,7 @@ extern Boolean jobFull; /* Non-zero if no more jobs should/will start*/ void Job_Touch(GNode *, Boolean); -Boolean Job_CheckCommands(GNode *, void (*abortProc )(char *, ...)); +Boolean Job_CheckCommands(GNode *, void (*abortProc)(const char *, ...)); void Job_CatchChildren(Boolean); void Job_CatchOutput(void); void Job_Make(GNode *); diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index 6a035597e336..e8d3d6c64210 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -1110,7 +1110,7 @@ Cmd_Exec(cmd, err) */ /* VARARGS */ void -Error(char *fmt, ...) +Error(const char *fmt, ...) { va_list ap; @@ -1134,7 +1134,7 @@ Error(char *fmt, ...) */ /* VARARGS */ void -Fatal(char *fmt, ...) +Fatal(const char *fmt, ...) { va_list ap; @@ -1165,7 +1165,7 @@ Fatal(char *fmt, ...) */ /* VARARGS */ void -Punt(char *fmt, ...) +Punt(const char *fmt, ...) { va_list ap; diff --git a/usr.bin/make/nonints.h b/usr.bin/make/nonints.h index 24e629b1e570..994756074862 100644 --- a/usr.bin/make/nonints.h +++ b/usr.bin/make/nonints.h @@ -65,9 +65,9 @@ void For_Run(void); void Main_ParseArgLine(char *); int main(int, char **); char *Cmd_Exec(char *, char **); -void Error(char *, ...); -void Fatal(char *, ...); -void Punt(char *, ...); +void Error(const char *, ...); +void Fatal(const char *, ...); +void Punt(const char *, ...); void DieHorribly(void); int PrintAddr(void *, void *); void Finish(int); @@ -81,7 +81,7 @@ void enomem(void); int eunlink(const char *); /* parse.c */ -void Parse_Error(int, char *, ...); +void Parse_Error(int, const char *, ...); Boolean Parse_AnyExport(void); Boolean Parse_IsVar(char *); void Parse_DoVar(char *, GNode *); diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index 730f51c8dfbb..90bdaf0b9b85 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -306,7 +306,7 @@ ParseFindKeyword (str) */ /* VARARGS */ void -Parse_Error(int type, char *fmt, ...) +Parse_Error(int type, const char *fmt, ...) { va_list ap;