From e9bb5614d06ccd27a6c85952b1ca209e0cc400c0 Mon Sep 17 00:00:00 2001 From: mmichalek Date: Fri, 9 Oct 2015 11:22:26 -0400 Subject: [PATCH] Fix warnings around log statements related to char* vs. const char*. --- symmetric-client-clib/inc/common/Log.h | 2 +- symmetric-client-clib/src/common/SymLog.c | 2 +- symmetric-client-clib/src/db/platform/sqlite/SqlitePlatform.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/symmetric-client-clib/inc/common/Log.h b/symmetric-client-clib/inc/common/Log.h index 30baa5a2ca..f164d250eb 100644 --- a/symmetric-client-clib/inc/common/Log.h +++ b/symmetric-client-clib/inc/common/Log.h @@ -26,4 +26,4 @@ typedef enum {DEBUG, INFO, WARN, ERROR} LogLevel; #define SymLog_warn(M, ...) SymLog_log(2, __func__, __FILE__, __LINE__, M, ##__VA_ARGS__) #define SymLog_error(M, ...) SymLog_log(3, __func__, __FILE__, __LINE__, M, ##__VA_ARGS__) -void SymLog_log(LogLevel logLevel, char *functionName, char *filename, int lineNumber, char* message, ...); +void SymLog_log(LogLevel logLevel, const char *functionName, const char *filename, int lineNumber, const char* message, ...); diff --git a/symmetric-client-clib/src/common/SymLog.c b/symmetric-client-clib/src/common/SymLog.c index eba80ab825..d33739ddbf 100644 --- a/symmetric-client-clib/src/common/SymLog.c +++ b/symmetric-client-clib/src/common/SymLog.c @@ -55,7 +55,7 @@ char *generateTimestamp() { } /** This is the central place where all logging funnels through. */ -void SymLog_log(LogLevel logLevel, char *functionName, char *fileName, int lineNumber, char* message, ...) { +void SymLog_log(LogLevel logLevel, const char *functionName, const char *fileName, int lineNumber, const char* message, ...) { FILE *destination; if (logLevel <= INFO) { destination = stdin; diff --git a/symmetric-client-clib/src/db/platform/sqlite/SqlitePlatform.c b/symmetric-client-clib/src/db/platform/sqlite/SqlitePlatform.c index ab542f0901..14a63b5ac5 100644 --- a/symmetric-client-clib/src/db/platform/sqlite/SqlitePlatform.c +++ b/symmetric-client-clib/src/db/platform/sqlite/SqlitePlatform.c @@ -81,7 +81,7 @@ SymSqlitePlatform * SymSqlitePlatform_new(SymSqlitePlatform *this, SymProperties if (sqlite3_open_v2(filename, &this->db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_URI, NULL)) { - SymLog_info(stderr, "Can't open database: %s", sqlite3_errmsg(this->db)); + SymLog_info("Can't open database: %s", sqlite3_errmsg(this->db)); sqlite3_close(this->db); return NULL; }