gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

fix warnings

Browse Source 
This was SVN commit r5106.
This commit is contained in:
janwas
2007-05-28 14:25:07 +00:00
parent 52ae284a7e
commit 29610672f4
8 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/ColladaManager.cpp
+1 -1
View File
@@ -25,7 +25,7 @@ namespace
{
FileIOBuf buf = (FileIOBuf)data;
const ssize_t ret = vfs_io(hf, length, &buf);
// TODO: handle errors sensibly
WARN_ERR(ret);
}
Handle hf;
source/lib/module_init.cpp
+1 -6
View File
@@ -49,12 +49,7 @@ bool ModuleShouldShutdown(volatile ModuleInitState* pInitState)
// decrement reference count - unless already in a final state.
retry:
ModuleInitState latchedInitState = *pInitState;
if(latchedInitState == MODULE_UNINITIALIZED)
{
debug_warn("shutting down before initialization");
return false;
}
if(latchedInitState == MODULE_ERROR)
if(latchedInitState == MODULE_UNINITIALIZED || latchedInitState == MODULE_ERROR)
return false;
if(!cpu_CAS(pInitState, latchedInitState, latchedInitState-1))
goto retry;
source/lib/path_util.cpp
+1 -1
View File
@@ -15,7 +15,7 @@
#include <errno.h>
ERROR_ASSOCIATE(ERR::PATH_LENGTH, "Path exceeds PATH_MAX characters", ENAMETOOLONG, -1);
ERROR_ASSOCIATE(ERR::PATH_LENGTH, "Path exceeds PATH_MAX characters", ENAMETOOLONG);
ERROR_ASSOCIATE(ERR::PATH_EMPTY, "Path is an empty string", -1);
ERROR_ASSOCIATE(ERR::PATH_NOT_RELATIVE, "Path is not relative", -1);
ERROR_ASSOCIATE(ERR::PATH_NON_PORTABLE, "Path contains OS-specific dir separator", -1);
source/lib/res/file/trace.cpp
+1 -1
View File
@@ -18,7 +18,7 @@
#include "file_internal.h"
ERROR_ASSOCIATE(ERR::TRACE_EMPTY, "No valid entries in trace");
ERROR_ASSOCIATE(ERR::TRACE_EMPTY, "No valid entries in trace", -1);
static uintptr_t trace_initialized; // set via CAS
source/lib/res/graphics/ogl_shader.cpp
+5 -5
View File
@@ -19,11 +19,11 @@
#define LOG_CATEGORY "shaders"
ERROR_ASSOCIATE(ERR::SHDR_CREATE, "Shader creation failed");
ERROR_ASSOCIATE(ERR::SHDR_COMPILE, "Shader compile failed");
ERROR_ASSOCIATE(ERR::SHDR_NO_SHADER, "Invalid shader reference");
ERROR_ASSOCIATE(ERR::SHDR_LINK, "Shader linking failed");
ERROR_ASSOCIATE(ERR::SHDR_NO_PROGRAM, "Invalid shader program reference");
ERROR_ASSOCIATE(ERR::SHDR_CREATE, "Shader creation failed", -1);
ERROR_ASSOCIATE(ERR::SHDR_COMPILE, "Shader compile failed", -1);
ERROR_ASSOCIATE(ERR::SHDR_NO_SHADER, "Invalid shader reference", -1);
ERROR_ASSOCIATE(ERR::SHDR_LINK, "Shader linking failed", -1);
ERROR_ASSOCIATE(ERR::SHDR_NO_PROGRAM, "Invalid shader program reference", -1);
// Convert a shader object type into a descriptive string.
source/lib/res/graphics/tex.cpp
+8 -8
View File
@@ -22,14 +22,14 @@
#include "tex_codec.h"
ERROR_ASSOCIATE(ERR::TEX_FMT_INVALID, "Invalid/unsupported texture format");
ERROR_ASSOCIATE(ERR::TEX_INVALID_COLOR_TYPE, "Invalid color type");
ERROR_ASSOCIATE(ERR::TEX_NOT_8BIT_PRECISION, "Not 8-bit channel precision");
ERROR_ASSOCIATE(ERR::TEX_INVALID_LAYOUT, "Unsupported texel layout, e.g. right-to-left");
ERROR_ASSOCIATE(ERR::TEX_COMPRESSED, "Unsupported texture compression");
ERROR_ASSOCIATE(WARN::TEX_INVALID_DATA, "Warning: invalid texel data encountered");
ERROR_ASSOCIATE(ERR::TEX_INVALID_SIZE, "Texture size is incorrect");
ERROR_ASSOCIATE(INFO::TEX_CODEC_CANNOT_HANDLE, "Texture codec cannot handle the given format");
ERROR_ASSOCIATE(ERR::TEX_FMT_INVALID, "Invalid/unsupported texture format", -1);
ERROR_ASSOCIATE(ERR::TEX_INVALID_COLOR_TYPE, "Invalid color type", -1);
ERROR_ASSOCIATE(ERR::TEX_NOT_8BIT_PRECISION, "Not 8-bit channel precision", -1);
ERROR_ASSOCIATE(ERR::TEX_INVALID_LAYOUT, "Unsupported texel layout, e.g. right-to-left", -1);
ERROR_ASSOCIATE(ERR::TEX_COMPRESSED, "Unsupported texture compression", -1);
ERROR_ASSOCIATE(WARN::TEX_INVALID_DATA, "Warning: invalid texel data encountered", -1);
ERROR_ASSOCIATE(ERR::TEX_INVALID_SIZE, "Texture size is incorrect", -1);
ERROR_ASSOCIATE(INFO::TEX_CODEC_CANNOT_HANDLE, "Texture codec cannot handle the given format", -1);
//-----------------------------------------------------------------------------
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PlaceObject.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
using AtlasMessage::Position;
static float g_DefaultAngle = M_PI*3.0/4.0;
static float g_DefaultAngle = (float)(M_PI*3.0/4.0);
class PlaceObject : public StateDrivenTool<PlaceObject>
{
source/tools/atlas/GameInterface/Handlers/TriggerHandler.cpp
+1
View File
@@ -340,6 +340,7 @@ END_COMMAND(SetAllTriggers)
MESSAGEHANDLER(TriggerToggleSelector)
{
//TODO: Draw stuff
UNUSED2(msg);
}
}