Skip to content

Commit

Permalink
Fixed|Clang|GCC: Various fixes for minor warnings output by Clang/GCC
Browse files Browse the repository at this point in the history
  • Loading branch information
@danij-deng
danij-deng committed Nov 9, 2012
1 parent 189a650 commit 591f7c3
Show file tree
Hide file tree
Showing 8 changed files with 109 additions and 109 deletions.
50 changes: 25 additions & 25 deletions doomsday/engine/api/doomsday.h
View file
Expand Up @@ -246,42 +246,42 @@ materialid_t DD_MaterialForTextureUniqueId(texturenamespaceid_t texNamespaceId,

/// @addtogroup console
///@{
void Con_Open(int yes);
void Con_AddCommand(const ccmdtemplate_t* cmd);
void Con_AddVariable(const cvartemplate_t* var);
void Con_AddCommandList(const ccmdtemplate_t* cmdList);
void Con_AddVariableList(const cvartemplate_t* varList);
void Con_Open(int yes);
void Con_AddCommand(ccmdtemplate_t const* cmd);
void Con_AddVariable(cvartemplate_t const* var);
void Con_AddCommandList(ccmdtemplate_t const* cmdList);
void Con_AddVariableList(cvartemplate_t const* varList);

cvartype_t Con_GetVariableType(const char* name);
cvartype_t Con_GetVariableType(char const* name);

byte Con_GetByte(const char* name);
int Con_GetInteger(const char* name);
float Con_GetFloat(const char* name);
char* Con_GetString(const char* name);
Uri* Con_GetUri(const char* name);
byte Con_GetByte(char const* name);
int Con_GetInteger(char const* name);
float Con_GetFloat(char const* name);
char const* Con_GetString(char const* name);
Uri const* Con_GetUri(char const* name);

void Con_SetInteger2(const char* name, int value, int svflags);
void Con_SetInteger(const char* name, int value);
void Con_SetInteger2(char const* name, int value, int svflags);
void Con_SetInteger(char const* name, int value);

void Con_SetFloat2(const char* name, float value, int svflags);
void Con_SetFloat(const char* name, float value);
void Con_SetFloat2(char const* name, float value, int svflags);
void Con_SetFloat(char const* name, float value);

void Con_SetString2(const char* name, const char* text, int svflags);
void Con_SetString(const char* name, const char* text);
void Con_SetString2(char const* name, char const* text, int svflags);
void Con_SetString(char const* name, char const* text);

void Con_SetUri2(const char* name, const Uri* uri, int svflags);
void Con_SetUri(const char* name, const Uri* uri);
void Con_SetUri2(char const* name, Uri const* uri, int svflags);
void Con_SetUri(char const* name, Uri const* uri);

void Con_Printf(const char* format, ...) PRINTF_F(1,2);
void Con_FPrintf(int flags, const char* format, ...) PRINTF_F(2,3);
void Con_Printf(char const* format, ...) PRINTF_F(1,2);
void Con_FPrintf(int flags, char const* format, ...) PRINTF_F(2,3);
void Con_PrintRuler(void);
void Con_Message(const char* message, ...) PRINTF_F(1,2);
void Con_Error(const char* error, ...) PRINTF_F(1,2);
void Con_Message(char const* message, ...) PRINTF_F(1,2);
void Con_Error(char const* error, ...) PRINTF_F(1,2);

void Con_SetPrintFilter(con_textfilter_t filter);

int DD_Execute(int silent, const char* command);
int DD_Executef(int silent, const char* command, ...);
int DD_Execute(int silent, char const* command);
int DD_Executef(int silent, char const* command, ...);
///@}

/// @addtogroup bindings
Expand Down
54 changes: 27 additions & 27 deletions doomsday/engine/portable/include/con_main.h
View file
Expand Up @@ -103,22 +103,22 @@ typedef struct cvar_s {
void (*notifyChanged)(void);
} cvar_t;

const ddstring_t* CVar_TypeName(cvartype_t type);
ddstring_t const* CVar_TypeName(cvartype_t type);

/// @return @see consoleVariableFlags
int CVar_Flags(const cvar_t* var);
int CVar_Flags(cvar_t const* var);

/// @return Type of the variable.
cvartype_t CVar_Type(const cvar_t* var);
cvartype_t CVar_Type(cvar_t const* var);

/// @return Symbolic name/path-to the variable.
AutoStr* CVar_ComposePath(const cvar_t* var);
AutoStr* CVar_ComposePath(cvar_t const* var);

int CVar_Integer(const cvar_t* var);
float CVar_Float(const cvar_t* var);
byte CVar_Byte(const cvar_t* var);
char* CVar_String(const cvar_t* var);
Uri* CVar_Uri(const cvar_t* var);
int CVar_Integer(cvar_t const* var);
float CVar_Float(cvar_t const* var);
byte CVar_Byte(cvar_t const* var);
char const* CVar_String(cvar_t const* var);
Uri const* CVar_Uri(cvar_t const* var);

/**
* Changes the value of an integer variable.
Expand All @@ -138,11 +138,11 @@ void CVar_SetInteger2(cvar_t* var, int value, int svflags);
void CVar_SetFloat2(cvar_t* var, float value, int svflags);
void CVar_SetFloat(cvar_t* var, float value);

void CVar_SetString2(cvar_t* var, const char* text, int svflags);
void CVar_SetString(cvar_t* var, const char* text);
void CVar_SetString2(cvar_t* var, char const* text, int svflags);
void CVar_SetString(cvar_t* var, char const* text);

void CVar_SetUri2(cvar_t* var, const Uri* uri, int svflags);
void CVar_SetUri(cvar_t* var, const Uri* uri);
void CVar_SetUri2(cvar_t* var, Uri const* uri, int svflags);
void CVar_SetUri(cvar_t* var, Uri const* uri);

typedef enum {
WT_ANY = -1,
Expand Down Expand Up @@ -258,25 +258,25 @@ void Con_AddVariableList(const cvartemplate_t* tplList);
cvar_t* Con_FindVariable(const char* path);

/// @return Type of the variable associated with @a path if found else @c CVT_NULL
cvartype_t Con_GetVariableType(const char* path);
cvartype_t Con_GetVariableType(char const* path);

int Con_GetInteger(const char* path);
float Con_GetFloat(const char* path);
byte Con_GetByte(const char* path);
char* Con_GetString(const char* path);
Uri* Con_GetUri(const char* path);
int Con_GetInteger(char const* path);
float Con_GetFloat(char const* path);
byte Con_GetByte(char const* path);
char const* Con_GetString(char const* path);
Uri const* Con_GetUri(char const* path);

void Con_SetInteger2(const char* path, int value, int svflags);
void Con_SetInteger(const char* path, int value);
void Con_SetInteger2(char const* path, int value, int svflags);
void Con_SetInteger(char const* path, int value);

void Con_SetFloat2(const char* path, float value, int svflags);
void Con_SetFloat(const char* path, float value);
void Con_SetFloat2(char const* path, float value, int svflags);
void Con_SetFloat(char const* path, float value);

void Con_SetString2(const char* path, const char* text, int svflags);
void Con_SetString(const char* path, const char* text);
void Con_SetString2(char const* path, char const* text, int svflags);
void Con_SetString(char const* path, char const* text);

void Con_SetUri2(const char* path, const Uri* uri, int svflags);
void Con_SetUri(const char* path, const Uri* uri);
void Con_SetUri2(char const* path, Uri const* uri, int svflags);
void Con_SetUri(char const* path, Uri const* uri);

calias_t* Con_AddAlias(const char* name, const char* command);

Expand Down
30 changes: 15 additions & 15 deletions doomsday/engine/portable/src/con_data.cpp
View file
Expand Up @@ -71,7 +71,7 @@ static knownword_t* knownWords;
static uint numKnownWords;
static boolean knownWordsNeedUpdate;

static char* emptyString = "";
static Str* emptyStr;
static Uri* emptyUri;

void Con_DataRegister(void)
Expand Down Expand Up @@ -127,7 +127,7 @@ static int clearVariable(CVarDirectory::Node& node, void* parameters)
ptr = (void**)var->ptr;
/// @note Multiple vars could be using the same pointer (so only free once).
cvarDirectory->iterate(PCF_NO_BRANCH, NULL, PATHTREE_NOHASH, markVariableUserDataFreed, ptr);
M_Free(*ptr); *ptr = emptyString;
M_Free(*ptr); *ptr = Str_Text(emptyStr);
break;

case CVT_URIPTR:
Expand Down Expand Up @@ -696,7 +696,7 @@ byte CVar_Byte(cvar_t const* var)
}
}

char* CVar_String(cvar_t const* var)
char const* CVar_String(cvar_t const* var)
{
DENG_ASSERT(var);
/// @todo Why not implement in-place value to string conversion?
Expand All @@ -709,12 +709,11 @@ char* CVar_String(cvar_t const* var)
Con_Message("Warning: CVar::String: Attempted on incompatible variable %s [%p type:%s], returning emptyString\n",
Str_Text(path), (void*)var, Str_Text(CVar_TypeName(CVar_Type(var))));
#endif
return emptyString;
}
return Str_Text(emptyStr); }
}
}

Uri* CVar_Uri(cvar_t const* var)
Uri const* CVar_Uri(cvar_t const* var)
{
DENG_ASSERT(var);
/// @todo Why not implement in-place string to uri conversion?
Expand All @@ -727,8 +726,7 @@ Uri* CVar_Uri(cvar_t const* var)
Con_Message("Warning: CVar::String: Attempted on incompatible variable %s [%p type:%s], returning emptyUri\n",
Str_Text(path), (void*)var, Str_Text(CVar_TypeName(CVar_Type(var))));
#endif
return emptyUri;
}
return emptyUri; }
}
}

Expand Down Expand Up @@ -1328,9 +1326,9 @@ int Con_IterateKnownWords(char const* pattern, knownwordtype_t type,
return result;
}

static int countMatchedWordWorker(knownword_t const* word, void* parameters)
static int countMatchedWordWorker(knownword_t const* /*word*/, void* parameters)
{
DENG_ASSERT(word && parameters);
DENG_ASSERT(parameters);
uint* count = (uint*) parameters;
++(*count);
return 0; // Continue iteration.
Expand Down Expand Up @@ -1393,6 +1391,7 @@ void Con_InitDatabases(void)
numKnownWords = 0;
knownWordsNeedUpdate = false;

emptyStr = Str_NewStd();
emptyUri = Uri_New();

inited = true;
Expand All @@ -1412,8 +1411,9 @@ void Con_ShutdownDatabases(void)
if(!inited) return;

Con_ClearDatabases();
delete cvarDirectory; cvarDirectory = NULL;
Uri_Delete(emptyUri); emptyUri = NULL;
delete cvarDirectory; cvarDirectory = 0;
Str_Delete(emptyStr); emptyStr = 0;
Uri_Delete(emptyUri); emptyUri = 0;
inited = false;
}

Expand Down Expand Up @@ -1706,15 +1706,15 @@ byte Con_GetByte(char const* path)
}

/// @note Part of the Doomsday public API.
char* Con_GetString(char const* path)
char const* Con_GetString(char const* path)
{
cvar_t* var = Con_FindVariable(path);
if(!var) return emptyString;
if(!var) return Str_Text(emptyStr);
return CVar_String(var);
}

/// @note Part of the Doomsday public API.
Uri* Con_GetUri(char const* path)
Uri const* Con_GetUri(char const* path)
{
cvar_t* var = Con_FindVariable(path);
if(!var) return emptyUri;
Expand Down
2 changes: 1 addition & 1 deletion doomsday/engine/portable/src/dam_main.cpp
View file
Expand Up @@ -37,7 +37,7 @@
static void freeArchivedMap(archivedmap_t* dam);

// Should we be caching successfully loaded maps?
extern "C" byte mapCache = true;
byte mapCache = true;

static const char* mapCacheDir = "mapcache/";

Expand Down
2 changes: 0 additions & 2 deletions doomsday/engine/portable/src/dd_games.cpp
View file
Expand Up @@ -30,8 +30,6 @@

namespace de {

static bool validateResource(ResourceRecord& rec);

struct GameCollection::Instance
{
GameCollection& self;
Expand Down

0 comments on commit 591f7c3

Please sign in to comment.