From 06c917a55f872245dbe3abfb987707739373d43f Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Mon, 8 Dec 2008 09:37:51 +0000 Subject: [PATCH] Code tidy to remove compile errors. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@875 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/include/PrismHybridGlob.h | 6 +++--- prism/include/PrismSparseGlob.h | 8 ++++---- prism/src/hybrid/PrismHybrid.cc | 6 +++--- prism/src/sparse/PrismSparse.cc | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/prism/include/PrismHybridGlob.h b/prism/include/PrismHybridGlob.h index d9c3b429..729e4d75 100644 --- a/prism/include/PrismHybridGlob.h +++ b/prism/include/PrismHybridGlob.h @@ -84,9 +84,9 @@ extern double last_unif; // macros, function prototypes #define logtwo(X) log((double)X)/log(2.0) -void PH_PrintToMainLog(JNIEnv *env, char *str, ...); -void PH_PrintToTechLog(JNIEnv *env, char *str, ...); -void PH_SetErrorMessage(char *str, ...); +void PH_PrintToMainLog(JNIEnv *env, const char *str, ...); +void PH_PrintToTechLog(JNIEnv *env, const char *str, ...); +void PH_SetErrorMessage(const char *str, ...); char *PH_GetErrorMessage(); //------------------------------------------------------------------------------ diff --git a/prism/include/PrismSparseGlob.h b/prism/include/PrismSparseGlob.h index 4ee9a738..a6513395 100644 --- a/prism/include/PrismSparseGlob.h +++ b/prism/include/PrismSparseGlob.h @@ -82,11 +82,11 @@ extern JNIEnv *export_env; // macros, function prototypes #define logtwo(X) log((double)X)/log(2.0) -void PS_PrintToMainLog(JNIEnv *env, char *str, ...); -void PS_PrintToTechLog(JNIEnv *env, char *str, ...); -void PS_SetErrorMessage(char *str, ...); +void PS_PrintToMainLog(JNIEnv *env, const char *str, ...); +void PS_PrintToTechLog(JNIEnv *env, const char *str, ...); +void PS_SetErrorMessage(const char *str, ...); char *PS_GetErrorMessage(); int store_export_info(int type, jstring fn, JNIEnv *env); -void export_string(char *str, ...); +void export_string(const char *str, ...); //------------------------------------------------------------------------------ diff --git a/prism/src/hybrid/PrismHybrid.cc b/prism/src/hybrid/PrismHybrid.cc index afa5985d..964b6c28 100644 --- a/prism/src/hybrid/PrismHybrid.cc +++ b/prism/src/hybrid/PrismHybrid.cc @@ -132,7 +132,7 @@ JNIEXPORT void JNICALL Java_hybrid_PrismHybrid_PH_1SetTechLog(JNIEnv *env, jclas //------------------------------------------------------------------------------ -void PH_PrintToMainLog(JNIEnv *env, char *str, ...) +void PH_PrintToMainLog(JNIEnv *env, const char *str, ...) { va_list argptr; char full_string[MAX_LOG_STRING_LEN]; @@ -149,7 +149,7 @@ void PH_PrintToMainLog(JNIEnv *env, char *str, ...) //------------------------------------------------------------------------------ -void PH_PrintToTechLog(JNIEnv *env, char *str, ...) +void PH_PrintToTechLog(JNIEnv *env, const char *str, ...) { va_list argptr; char full_string[MAX_LOG_STRING_LEN]; @@ -255,7 +255,7 @@ JNIEXPORT void JNICALL Java_hybrid_PrismHybrid_PH_1SetDoSSDetect(JNIEnv *env, jc // error message handling //------------------------------------------------------------------------------ -void PH_SetErrorMessage(char *str, ...) +void PH_SetErrorMessage(const char *str, ...) { va_list argptr; diff --git a/prism/src/sparse/PrismSparse.cc b/prism/src/sparse/PrismSparse.cc index 055e6ca9..76f468d3 100644 --- a/prism/src/sparse/PrismSparse.cc +++ b/prism/src/sparse/PrismSparse.cc @@ -125,7 +125,7 @@ JNIEXPORT void JNICALL Java_sparse_PrismSparse_PS_1SetTechLog(JNIEnv *env, jclas //------------------------------------------------------------------------------ -void PS_PrintToMainLog(JNIEnv *env, char *str, ...) +void PS_PrintToMainLog(JNIEnv *env, const char *str, ...) { va_list argptr; char full_string[MAX_LOG_STRING_LEN]; @@ -142,7 +142,7 @@ void PS_PrintToMainLog(JNIEnv *env, char *str, ...) //------------------------------------------------------------------------------ -void PS_PrintToTechLog(JNIEnv *env, char *str, ...) +void PS_PrintToTechLog(JNIEnv *env, const char *str, ...) { va_list argptr; char full_string[MAX_LOG_STRING_LEN]; @@ -232,7 +232,7 @@ int store_export_info(int type, jstring fn, JNIEnv *env) // export string (either to file or main log) -void export_string(char *str, ...) +void export_string(const char *str, ...) { va_list argptr; char full_string[MAX_LOG_STRING_LEN]; @@ -261,7 +261,7 @@ JNIEXPORT void JNICALL Java_sparse_PrismSparse_PS_1SetDoSSDetect(JNIEnv *env, jc // error message handling //------------------------------------------------------------------------------ -void PS_SetErrorMessage(char *str, ...) +void PS_SetErrorMessage(const char *str, ...) { va_list argptr;