Fixed: Compiler warnings about converting string literals to char*

skyjake · Nov 15, 2012 · fd9a14c · fd9a14c
1 parent fe22f4a
commit fd9a14c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/doomsday/engine/include/con_main.h b/doomsday/engine/include/con_main.h
@@ -389,7 +389,7 @@ void Con_PrintPathList3(const char* pathList, char delimiter, const char* separa
 void Con_PrintPathList2(const char* pathList, char delimiter); /* separator = " " */
 void Con_PrintPathList(const char* pathList); /* delimiter = ';' */
 
-void Con_PrintCVar(cvar_t* cvar, char* prefix);
+void Con_PrintCVar(cvar_t* cvar, const char* prefix);
 
 /**
  * Outputs the usage information for the given ccmd to the console if the

diff --git a/doomsday/engine/include/m_misc.h b/doomsday/engine/include/m_misc.h
@@ -94,7 +94,7 @@ char*           M_StrnCat(char* buf, const char* str, size_t nChars, size_t bufS
 char*           M_LimitedStrCat(char* buf, const char* str, size_t maxWidth,
                                 char separator, size_t bufLength);
 char*           M_StrCatQuoted(char* dest, const char* src, size_t len);
-char*           M_StrTok(char** cursor, char* delimiters);
+char*           M_StrTok(char** cursor, const char *delimiters);
 char*           M_TrimmedFloat(float val);
 
 // Random numbers.

diff --git a/doomsday/engine/src/con_data.cpp b/doomsday/engine/src/con_data.cpp
@@ -794,7 +794,7 @@ cvartype_t Con_GetVariableType(char const* path)
     return var->type;
 }
 
-void Con_PrintCVar(cvar_t* var, char* prefix)
+void Con_PrintCVar(cvar_t* var, const char* prefix)
 {
     DENG_ASSERT(inited);
 

diff --git a/doomsday/engine/src/def_read.cpp b/doomsday/engine/src/def_read.cpp
@@ -209,7 +209,7 @@ static void SkipComment(void)
 
     if(ch != '>') // Single-line comment?
     {
-        while(FGetC() != '\n' && !source->atEnd);
+        while(FGetC() != '\n' && !source->atEnd) {}
     }
     else // Multiline comment?
     {

diff --git a/doomsday/engine/src/m_misc.c b/doomsday/engine/src/m_misc.c
@@ -1085,9 +1085,9 @@ char* M_StrCatQuoted(char* dest, const char* src, size_t len)
 /**
  * Somewhat similar to strtok().
  */
-char* M_StrTok(char** cursor, char* delimiters)
+char* M_StrTok(char** cursor, const char* delimiters)
 {
-    char*               begin = *cursor;
+    char* begin = *cursor;
 
     while(**cursor && !strchr(delimiters, **cursor))
         (*cursor)++;