Commit f07c4a15 authored by Simon Marlow's avatar Simon Marlow

add 'const' modifiers to types where appropriate

parent 82783802
......@@ -57,7 +57,7 @@ extern "C" {
#define ASSERT(predicate) /* nothing */
#else
extern void _assertFail (char *, unsigned int);
extern void _assertFail (const char *, unsigned int);
#define ASSERT(predicate) \
if (predicate) \
......
......@@ -26,13 +26,13 @@
* barf() invokes (*fatalInternalErrorFn)(). This function is not
* expected to return.
*/
extern void barf(char *s, ...)
extern void barf(const char *s, ...)
GNUC3_ATTRIBUTE(__noreturn__);
extern void vbarf(char *s, va_list ap)
extern void vbarf(const char *s, va_list ap)
GNUC3_ATTRIBUTE(__noreturn__);
extern void _assertFail(char *filename, unsigned int linenum)
extern void _assertFail(const char *filename, unsigned int linenum)
GNUC3_ATTRIBUTE(__noreturn__);
/*
......@@ -41,10 +41,10 @@ extern void _assertFail(char *filename, unsigned int linenum)
*
* errorBelch() invokes (*errorMsgFn)().
*/
extern void errorBelch(char *s, ...)
extern void errorBelch(const char *s, ...)
GNUC3_ATTRIBUTE(format (printf, 1, 2));
extern void verrorBelch(char *s, va_list ap);
extern void verrorBelch(const char *s, va_list ap);
/*
* A debugging message. Debugging messages are generated either as a
......@@ -53,15 +53,15 @@ extern void verrorBelch(char *s, va_list ap);
*
* debugBelch() invokes (*debugMsgFn)().
*/
extern void debugBelch(char *s, ...)
extern void debugBelch(const char *s, ...)
GNUC3_ATTRIBUTE(format (printf, 1, 2));
extern void vdebugBelch(char *s, va_list ap);
extern void vdebugBelch(const char *s, va_list ap);
/* Hooks for redirecting message generation: */
typedef void RtsMsgFunction(char *, va_list);
typedef void RtsMsgFunction(const char *, va_list);
extern RtsMsgFunction *fatalInternalErrorFn;
extern RtsMsgFunction *debugMsgFn;
......
......@@ -30,7 +30,7 @@ RtsMsgFunction *debugMsgFn = rtsDebugMsgFn;
RtsMsgFunction *errorMsgFn = rtsErrorMsgFn;
void
barf(char *s, ...)
barf(const char*s, ...)
{
va_list ap;
va_start(ap,s);
......@@ -40,20 +40,20 @@ barf(char *s, ...)
}
void
vbarf(char *s, va_list ap)
vbarf(const char*s, va_list ap)
{
(*fatalInternalErrorFn)(s,ap);
stg_exit(EXIT_INTERNAL_ERROR); // just in case fatalInternalErrorFn() returns
}
void
_assertFail(char *filename, unsigned int linenum)
_assertFail(const char*filename, unsigned int linenum)
{
barf("ASSERTION FAILED: file %s, line %u\n", filename, linenum);
}
void
errorBelch(char *s, ...)
errorBelch(const char*s, ...)
{
va_list ap;
va_start(ap,s);
......@@ -62,13 +62,13 @@ errorBelch(char *s, ...)
}
void
verrorBelch(char *s, va_list ap)
verrorBelch(const char*s, va_list ap)
{
(*errorMsgFn)(s,ap);
}
void
debugBelch(char *s, ...)
debugBelch(const char*s, ...)
{
va_list ap;
va_start(ap,s);
......@@ -77,7 +77,7 @@ debugBelch(char *s, ...)
}
void
vdebugBelch(char *s, va_list ap)
vdebugBelch(const char*s, va_list ap)
{
(*debugMsgFn)(s,ap);
}
......@@ -111,7 +111,7 @@ isGUIApp()
#define str(s) #s
void
rtsFatalInternalErrorFn(char *s, va_list ap)
rtsFatalInternalErrorFn(const char *s, va_list ap)
{
#if defined(cygwin32_HOST_OS) || defined (mingw32_HOST_OS)
if (isGUIApp())
......@@ -148,7 +148,7 @@ rtsFatalInternalErrorFn(char *s, va_list ap)
}
void
rtsErrorMsgFn(char *s, va_list ap)
rtsErrorMsgFn(const char *s, va_list ap)
{
#if defined(cygwin32_HOST_OS) || defined (mingw32_HOST_OS)
if (isGUIApp())
......@@ -178,7 +178,7 @@ rtsErrorMsgFn(char *s, va_list ap)
}
void
rtsDebugMsgFn(char *s, va_list ap)
rtsDebugMsgFn(const char *s, va_list ap)
{
#if defined(cygwin32_HOST_OS) || defined (mingw32_HOST_OS)
if (isGUIApp())
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment