diff options
author | jmallett <jmallett@FreeBSD.org> | 2002-06-12 04:11:01 +0000 |
---|---|---|
committer | jmallett <jmallett@FreeBSD.org> | 2002-06-12 04:11:01 +0000 |
commit | 7114af77d08dfd83ae340028b7cd96bdc4f7e2da (patch) | |
tree | 92cb514fba6e56888e53b5f34984fd3b4ed85ed6 /usr.bin | |
parent | b67cb93fe348fd9d04a64b43b7e40481ebafc62d (diff) | |
download | FreeBSD-src-7114af77d08dfd83ae340028b7cd96bdc4f7e2da.zip FreeBSD-src-7114af77d08dfd83ae340028b7cd96bdc4f7e2da.tar.gz |
The error functions take constant pointers to strings for their format.
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/make/job.c | 2 | ||||
-rw-r--r-- | usr.bin/make/job.h | 2 | ||||
-rw-r--r-- | usr.bin/make/main.c | 6 | ||||
-rw-r--r-- | usr.bin/make/nonints.h | 8 | ||||
-rw-r--r-- | usr.bin/make/parse.c | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c index bf98c91..7f7b3dc 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 98d7994..6cba4a6 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 6a03559..e8d3d6c 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -1110,7 +1110,7 @@ bad: */ /* 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 24e629b..9947560 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 730f51c..90bdaf0 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; |