From 7c337861005f866b1e9e5456686ddb5fd4e24dfc Mon Sep 17 00:00:00 2001 From: Bill Meltsner Date: Fri, 26 Feb 2010 03:55:21 -0500 Subject: [PATCH] fixed a ridiculous number of gcc warnings, nearly all of which were complaints about unused parameters - the remaining 199 warnings I get are from code that isn't ours (box2d is responsible for all but 8 of them) --- .../macosx/love.xcodeproj/project.pbxproj | 4 + src/common/runtime.h | 4 +- src/modules/audio/null/Audio.cpp | 26 ++-- src/modules/audio/null/Audio.h | 64 +++++----- src/modules/audio/null/Source.cpp | 118 +++++++++--------- src/modules/event/sdl/wrap_Event.cpp | 2 +- src/modules/font/ImageRasterizer.cpp | 4 +- src/modules/graphics/opengl/Graphics.cpp | 5 +- src/modules/graphics/opengl/wrap_Graphics.cpp | 10 +- src/modules/sound/lullaby/Mpg123Decoder.cpp | 28 ++--- src/modules/sound/lullaby/VorbisDecoder.cpp | 2 +- src/modules/thread/sdl/wrap_Thread.cpp | 12 +- src/modules/timer/sdl/wrap_Timer.cpp | 16 +-- 13 files changed, 153 insertions(+), 142 deletions(-) diff --git a/platform/macosx/love.xcodeproj/project.pbxproj b/platform/macosx/love.xcodeproj/project.pbxproj index 0771b77f4..951be913f 100644 --- a/platform/macosx/love.xcodeproj/project.pbxproj +++ b/platform/macosx/love.xcodeproj/project.pbxproj @@ -593,6 +593,7 @@ A9B4BA991045937F001DBC80 /* wrap_ParticleSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wrap_ParticleSystem.h; sourceTree = ""; }; A9B4BA9A1045937F001DBC80 /* ParticleSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParticleSystem.cpp; sourceTree = ""; }; A9B4BA9B1045937F001DBC80 /* wrap_ParticleSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wrap_ParticleSystem.cpp; sourceTree = ""; }; + A9BFAA851137C1CE005FE0AD /* ThreadModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadModule.h; sourceTree = ""; }; A9CF0E8410B9EB1000E6F37E /* utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8.h; sourceTree = ""; }; A9CF0E8510B9EB1000E6F37E /* utf8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8.cpp; sourceTree = ""; }; A9D307E9106635C3004FEDF8 /* physfs.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = physfs.framework; path = /Library/Frameworks/physfs.framework; sourceTree = ""; }; @@ -1393,6 +1394,7 @@ A986DEAF113249A700810279 /* thread */ = { isa = PBXGroup; children = ( + A9BFAA851137C1CE005FE0AD /* ThreadModule.h */, A986DEB0113249A800810279 /* sdl */, ); path = thread; @@ -1782,6 +1784,8 @@ GCC_WARN_SHADOW = NO; GCC_WARN_SIGN_COMPARE = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; + GCC_WARN_UNUSED_PARAMETER = NO; + GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( /Library/Frameworks/Lua.framework/Headers, diff --git a/src/common/runtime.h b/src/common/runtime.h index 9c337e97f..daad6e52b 100644 --- a/src/common/runtime.h +++ b/src/common/runtime.h @@ -252,7 +252,7 @@ namespace love **/ int luax_getregistry(lua_State * L, Registry r); - Type luax_type(lua_State * L, int idx); + Type luax_type(lua_State * L, int idx); /** * Converts the value at idx to the specified type without checking that @@ -264,7 +264,7 @@ namespace love * @param type The type bit. **/ template - T * luax_totype(lua_State * L, int idx, const char * name, love::bits type) + T * luax_totype(lua_State * L, int idx, const char *, love::bits) { return (T*)(((Proxy *)lua_touserdata(L, idx))->data); } diff --git a/src/modules/audio/null/Audio.cpp b/src/modules/audio/null/Audio.cpp index a85c7db61..2a42cd4f0 100644 --- a/src/modules/audio/null/Audio.cpp +++ b/src/modules/audio/null/Audio.cpp @@ -39,12 +39,12 @@ namespace null return "love.audio.null"; } - love::audio::Source * Audio::newSource(love::sound::Decoder * decoder) + love::audio::Source * Audio::newSource(love::sound::Decoder *) { return new Source(); } - love::audio::Source * Audio::newSource(love::sound::SoundData * soundData) + love::audio::Source * Audio::newSource(love::sound::SoundData *) { return new Source(); } @@ -59,7 +59,7 @@ namespace null return 0; } - void Audio::play(love::audio::Source * source) + void Audio::play(love::audio::Source *) { } @@ -67,7 +67,7 @@ namespace null { } - void Audio::stop(love::audio::Source * source) + void Audio::stop(love::audio::Source *) { } @@ -75,7 +75,7 @@ namespace null { } - void Audio::pause(love::audio::Source * source) + void Audio::pause(love::audio::Source *) { } @@ -83,7 +83,7 @@ namespace null { } - void Audio::resume(love::audio::Source * source) + void Audio::resume(love::audio::Source *) { } @@ -91,7 +91,7 @@ namespace null { } - void Audio::rewind(love::audio::Source * source) + void Audio::rewind(love::audio::Source *) { } @@ -109,27 +109,27 @@ namespace null return volume; } - void Audio::getPosition(float * v) const + void Audio::getPosition(float *) const { } - void Audio::setPosition(float * v) + void Audio::setPosition(float *) { } - void Audio::getOrientation(float * v) const + void Audio::getOrientation(float *) const { } - void Audio::setOrientation(float * v) + void Audio::setOrientation(float *) { } - void Audio::getVelocity(float * v) const + void Audio::getVelocity(float *) const { } - void Audio::setVelocity(float * v) + void Audio::setVelocity(float *) { } diff --git a/src/modules/audio/null/Audio.h b/src/modules/audio/null/Audio.h index 85da32faa..591eb8ea5 100644 --- a/src/modules/audio/null/Audio.h +++ b/src/modules/audio/null/Audio.h @@ -1,21 +1,21 @@ -/** -* Copyright (c) 2006-2010 LOVE Development Team -* -* This software is provided 'as-is', without any express or implied -* warranty. In no event will the authors be held liable for any damages -* arising from the use of this software. -* -* Permission is granted to anyone to use this software for any purpose, -* including commercial applications, and to alter it and redistribute it -* freely, subject to the following restrictions: -* -* 1. The origin of this software must not be misrepresented; you must not -* claim that you wrote the original software. If you use this software -* in a product, an acknowledgment in the product documentation would be -* appreciated but is not required. -* 2. Altered source versions must be plainly marked as such, and must not be -* misrepresented as being the original software. -* 3. This notice may not be removed or altered from any source distribution. +/** +* Copyright (c) 2006-2010 LOVE Development Team +* +* This software is provided 'as-is', without any express or implied +* warranty. In no event will the authors be held liable for any damages +* arising from the use of this software. +* +* Permission is granted to anyone to use this software for any purpose, +* including commercial applications, and to alter it and redistribute it +* freely, subject to the following restrictions: +* +* 1. The origin of this software must not be misrepresented; you must not +* claim that you wrote the original software. If you use this software +* in a product, an acknowledgment in the product documentation would be +* appreciated but is not required. +* 2. Altered source versions must be plainly marked as such, and must not be +* misrepresented as being the original software. +* 3. This notice may not be removed or altered from any source distribution. **/ #ifndef LOVE_AUDIO_NULL_AUDIO_H @@ -44,22 +44,22 @@ namespace null // Implements Module. const char * getName() const; - // Implements Audio. + // Implements Audio. love::audio::Source * newSource(love::sound::Decoder * decoder); - love::audio::Source * newSource(love::sound::SoundData * soundData); + love::audio::Source * newSource(love::sound::SoundData * soundData); int getNumSources() const; - int getMaxSources() const; - void play(love::audio::Source * source); - void play(); - void stop(love::audio::Source * source); - void stop(); - void pause(love::audio::Source * source); - void pause(); - void resume(love::audio::Source * source); - void resume(); - void rewind(love::audio::Source * source); - void rewind(); - void setVolume(float volume); + int getMaxSources() const; + void play(love::audio::Source * source); + void play(); + void stop(love::audio::Source * source); + void stop(); + void pause(love::audio::Source * source); + void pause(); + void resume(love::audio::Source * source); + void resume(); + void rewind(love::audio::Source * source); + void rewind(); + void setVolume(float volume); float getVolume() const; void getPosition(float * v) const; diff --git a/src/modules/audio/null/Source.cpp b/src/modules/audio/null/Source.cpp index 441ec2605..4043b4dbb 100644 --- a/src/modules/audio/null/Source.cpp +++ b/src/modules/audio/null/Source.cpp @@ -1,21 +1,21 @@ -/** -* Copyright (c) 2006-2010 LOVE Development Team -* -* This software is provided 'as-is', without any express or implied -* warranty. In no event will the authors be held liable for any damages -* arising from the use of this software. -* -* Permission is granted to anyone to use this software for any purpose, -* including commercial applications, and to alter it and redistribute it -* freely, subject to the following restrictions: -* -* 1. The origin of this software must not be misrepresented; you must not -* claim that you wrote the original software. If you use this software -* in a product, an acknowledgment in the product documentation would be -* appreciated but is not required. -* 2. Altered source versions must be plainly marked as such, and must not be -* misrepresented as being the original software. -* 3. This notice may not be removed or altered from any source distribution. +/** +* Copyright (c) 2006-2010 LOVE Development Team +* +* This software is provided 'as-is', without any express or implied +* warranty. In no event will the authors be held liable for any damages +* arising from the use of this software. +* +* Permission is granted to anyone to use this software for any purpose, +* including commercial applications, and to alter it and redistribute it +* freely, subject to the following restrictions: +* +* 1. The origin of this software must not be misrepresented; you must not +* claim that you wrote the original software. If you use this software +* in a product, an acknowledgment in the product documentation would be +* appreciated but is not required. +* 2. Altered source versions must be plainly marked as such, and must not be +* misrepresented as being the original software. +* 3. This notice may not be removed or altered from any source distribution. **/ #include "Source.h" @@ -34,22 +34,22 @@ namespace null Source::~Source() { - } - - love::audio::Source * Source::copy() - { - this->retain(); - return this; - } - + } + + love::audio::Source * Source::copy() + { + this->retain(); + return this; + } + void Source::play() { } - + void Source::stop() { } - + void Source::pause() { } @@ -61,7 +61,7 @@ namespace null void Source::rewind() { } - + bool Source::isStopped() const { return true; @@ -75,56 +75,56 @@ namespace null void Source::update() { } - + void Source::setPitch(float pitch) { this->pitch = pitch; } - + float Source::getPitch() const { return pitch; } - + void Source::setVolume(float volume) { this->volume = volume; } - + float Source::getVolume() const { return volume; } - void Source::setPosition(float * v) - { - } - - void Source::getPosition(float * v) const - { - } - - void Source::setVelocity(float * v) - { - } - - void Source::getVelocity(float * v) const - { - } - - void Source::setDirection(float * v) - { - } - - void Source::getDirection(float * v) const + void Source::setPosition(float *) { } - void Source::setLooping(bool looping) - { - this->looping = looping; - } - + void Source::getPosition(float *) const + { + } + + void Source::setVelocity(float *) + { + } + + void Source::getVelocity(float *) const + { + } + + void Source::setDirection(float *) + { + } + + void Source::getDirection(float *) const + { + } + + void Source::setLooping(bool looping) + { + this->looping = looping; + } + bool Source::isLooping() const { return looping; diff --git a/src/modules/event/sdl/wrap_Event.cpp b/src/modules/event/sdl/wrap_Event.cpp index 9b1c36182..d0043366d 100644 --- a/src/modules/event/sdl/wrap_Event.cpp +++ b/src/modules/event/sdl/wrap_Event.cpp @@ -132,7 +132,7 @@ namespace sdl return 0; } - int w_pump(lua_State * L) + int w_pump(lua_State *) { instance->pump(); return 0; diff --git a/src/modules/font/ImageRasterizer.cpp b/src/modules/font/ImageRasterizer.cpp index 5c74c7239..6a3a4821a 100644 --- a/src/modules/font/ImageRasterizer.cpp +++ b/src/modules/font/ImageRasterizer.cpp @@ -27,7 +27,7 @@ namespace love { namespace font { - ImageRasterizer::ImageRasterizer(love::image::ImageData * data, unsigned short * glyphs) + ImageRasterizer::ImageRasterizer(love::image::ImageData * data, unsigned short *) : imageData(data) { imageData->retain(); @@ -43,7 +43,7 @@ namespace font return getHeight(); } - GlyphData * ImageRasterizer::getGlyphData(unsigned short glyph) const + GlyphData * ImageRasterizer::getGlyphData(unsigned short) const { return 0; } diff --git a/src/modules/graphics/opengl/Graphics.cpp b/src/modules/graphics/opengl/Graphics.cpp index e3b1b059a..760229a98 100644 --- a/src/modules/graphics/opengl/Graphics.cpp +++ b/src/modules/graphics/opengl/Graphics.cpp @@ -38,7 +38,8 @@ namespace opengl currentMode.height = 0; // Window should be centered. - SDL_putenv("SDL_VIDEO_CENTERED=center"); + char * center = "SDL_VIDEO_CENTERED=center"; + SDL_putenv(center); if(SDL_InitSubSystem(SDL_INIT_VIDEO) < 0) throw Exception(SDL_GetError()); @@ -423,7 +424,7 @@ namespace opengl return font; } - Font * Graphics::newImageFont(Image * image, const char * glyphs, float spacing) + Font * Graphics::newImageFont(Image * image, const char * glyphs, float) { Font * font = new ImageFont(image, std::string(glyphs)); diff --git a/src/modules/graphics/opengl/wrap_Graphics.cpp b/src/modules/graphics/opengl/wrap_Graphics.cpp index c31123d1a..28472948e 100644 --- a/src/modules/graphics/opengl/wrap_Graphics.cpp +++ b/src/modules/graphics/opengl/wrap_Graphics.cpp @@ -58,19 +58,19 @@ namespace opengl return 1; } - int w_reset(lua_State * L) + int w_reset(lua_State *) { instance->reset(); return 0; } - int w_clear(lua_State * L) + int w_clear(lua_State *) { instance->clear(); return 0; } - int w_present(lua_State * L) + int w_present(lua_State *) { instance->present(); return 0; @@ -748,13 +748,13 @@ namespace opengl return instance->polygon(L); } - int w_push(lua_State * L) + int w_push(lua_State *) { instance->push(); return 0; } - int w_pop(lua_State * L) + int w_pop(lua_State *) { instance->pop(); return 0; diff --git a/src/modules/sound/lullaby/Mpg123Decoder.cpp b/src/modules/sound/lullaby/Mpg123Decoder.cpp index 60696340b..a7e526169 100644 --- a/src/modules/sound/lullaby/Mpg123Decoder.cpp +++ b/src/modules/sound/lullaby/Mpg123Decoder.cpp @@ -34,7 +34,7 @@ namespace lullaby bool Mpg123Decoder::inited = false; Mpg123Decoder::Mpg123Decoder(Data * data, const std::string & ext, int bufferSize, int sampleRate) - : Decoder(data, ext, bufferSize, sampleRate), channels(MPG123_STEREO), handle(0) + : Decoder(data, ext, bufferSize, sampleRate), handle(0), channels(MPG123_STEREO) { data_size = data->getSize(); @@ -195,17 +195,17 @@ namespace lullaby return true; } - int Mpg123Decoder::getChannels() const - { - return channels; - } - - int Mpg123Decoder::getBits() const - { - return 16; - } - - int Mpg123Decoder::feed(int bytes) + int Mpg123Decoder::getChannels() const + { + return channels; + } + + int Mpg123Decoder::getBits() const + { + return 16; + } + + int Mpg123Decoder::feed(int bytes) { int remaining = data_size - data_offset; @@ -219,8 +219,8 @@ namespace lullaby if(r == MPG123_OK || r == MPG123_DONE) data_offset += feed_bytes; - return r; - } + return r; + } } // lullaby } // sound diff --git a/src/modules/sound/lullaby/VorbisDecoder.cpp b/src/modules/sound/lullaby/VorbisDecoder.cpp index 20d65d341..8844ab58e 100644 --- a/src/modules/sound/lullaby/VorbisDecoder.cpp +++ b/src/modules/sound/lullaby/VorbisDecoder.cpp @@ -33,7 +33,7 @@ namespace lullaby /** * CALLBACK FUNCTIONS **/ - int vorbisClose(void * datasource /* ptr to the data that the vorbis files need*/) + int vorbisClose(void * /* ptr to the data that the vorbis files need*/) { // Does nothing (handled elsewhere) return 1; diff --git a/src/modules/thread/sdl/wrap_Thread.cpp b/src/modules/thread/sdl/wrap_Thread.cpp index 203b981c8..531a1907a 100644 --- a/src/modules/thread/sdl/wrap_Thread.cpp +++ b/src/modules/thread/sdl/wrap_Thread.cpp @@ -86,11 +86,13 @@ namespace sdl lua_pushlightuserdata(L, v->data.userdata); break; case FUSERDATA: - const char *name; + { + const char *name = NULL; love::types.find(v->udatatype, name); ((love::Object *) v->data.userdata)->retain(); luax_newtype(L, name, v->flags, v->data.userdata); break; + } default: lua_pushnil(L); break; @@ -126,11 +128,13 @@ namespace sdl lua_pushlightuserdata(L, v->data.userdata); break; case FUSERDATA: - const char *name; + { + const char *name = NULL; types.find(v->udatatype, name); ((love::Object *) v->data.userdata)->retain(); luax_newtype(L, name, v->flags, v->data.userdata); break; + } default: lua_pushnil(L); break; @@ -165,11 +169,13 @@ namespace sdl lua_pushlightuserdata(L, v->data.userdata); break; case FUSERDATA: - const char *name; + { + const char *name = NULL; types.find(v->udatatype, name); ((love::Object *) v->data.userdata)->retain(); luax_newtype(L, name, v->flags, v->data.userdata); break; + } default: lua_pushnil(L); break; diff --git a/src/modules/timer/sdl/wrap_Timer.cpp b/src/modules/timer/sdl/wrap_Timer.cpp index 2b42a5128..54170cc5c 100644 --- a/src/modules/timer/sdl/wrap_Timer.cpp +++ b/src/modules/timer/sdl/wrap_Timer.cpp @@ -29,7 +29,7 @@ namespace sdl { static Timer * instance = 0; - int w_step(lua_State * L) + int w_step(lua_State *) { instance->step(); return 0; @@ -94,13 +94,13 @@ namespace sdl else instance->retain(); - WrappedModule w; - w.module = instance; - w.name = "timer"; - w.flags = MODULE_T; - w.functions = functions; - w.types = 0; - + WrappedModule w; + w.module = instance; + w.name = "timer"; + w.flags = MODULE_T; + w.functions = functions; + w.types = 0; + return luax_register_module(L, w); }