[egoboo] Remove extra parameter in snprintf call

Bruno Wolff III bruno at fedoraproject.org
Tue Mar 13 02:51:04 UTC 2012


commit c2374706d06c90649661b6039462ad74db86bd26
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sun Mar 11 13:35:21 2012 -0500

    Remove extra parameter in snprintf call
    
    This parameter probably would be just unused, but it shouldn't
    be there.

 egoboo-badprint.patch |   17 +++++++++++++++++
 egoboo.spec           |    2 ++
 2 files changed, 19 insertions(+), 0 deletions(-)
---
diff --git a/egoboo-badprint.patch b/egoboo-badprint.patch
new file mode 100644
index 0000000..41b2f30
--- /dev/null
+++ b/egoboo-badprint.patch
@@ -0,0 +1,17 @@
+--- src/game/sound.c.orig	2012-03-11 13:31:38.707361533 -0500
++++ src/game/sound.c	2012-03-11 13:33:13.063353693 -0500
+@@ -791,12 +791,12 @@
+     //Special xmas theme, override the default menu theme song
+     if ( check_time( SEASON_CHRISTMAS ) )
+     {
+-        snprintf( loadpath, SDL_arraysize( loadpath ), ( "mp_data/music/special/xmas.ogg" ), songname );
++        snprintf( loadpath, SDL_arraysize( loadpath ), ( "mp_data/music/special/xmas.ogg" ) );
+         musictracksloaded[MENU_SONG] = Mix_LoadMUS( vfs_resolveReadFilename( loadpath ) );
+     }
+     else if ( check_time( SEASON_HALLOWEEN ) )
+     {
+-        snprintf( loadpath, SDL_arraysize( loadpath ), ( "mp_data/music/special/halloween.ogg" ), songname );
++        snprintf( loadpath, SDL_arraysize( loadpath ), ( "mp_data/music/special/halloween.ogg" ) );
+         musictracksloaded[MENU_SONG] = Mix_LoadMUS( vfs_resolveReadFilename( loadpath ) );
+     }
+ 
diff --git a/egoboo.spec b/egoboo.spec
index 37bd99b..05fa9b6 100644
--- a/egoboo.spec
+++ b/egoboo.spec
@@ -10,6 +10,7 @@ Source1:        %{name}.desktop
 Patch0:         egoboo-opts.patch
 Patch1:         egoboo-noenet.patch
 Patch2:         egoboo-enet13.patch
+Patch3:         egoboo-badprint.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel SDL_ttf-devel SDL_image-devel enet-devel
 BuildRequires:  desktop-file-utils
@@ -28,6 +29,7 @@ dimension.
 %patch0 -b .opts
 %patch1 -b .noenet
 %patch2 -b .enet13
+%patch3 -b .badprint
 
 %build
 make -C src


More information about the scm-commits mailing list