mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-26 07:11:34 -08:00
Code Issues Projects Releases Wiki Activity

src/sound.c: Silence some warnings.

Browse source 
(string_default): Move to !WINDOWSNT section.
(Fplay_sound_internal) [WINDOWSNT]: Remove i_result to avoid warning.
This commit is contained in:
Juanma Barranquero 2013-06-19 16:20:26 +02:00
parent 9716fedb62
commit 983aeb9aff
2 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2013-06-19 Juanma Barranquero <lekktu@gmail.com>
* sound.c (string_default): Move to !WINDOWSNT section.
(Fplay_sound_internal) [WINDOWSNT]: Remove i_result to avoid warning.
2013-06-19 Paul Eggert <eggert@cs.ucla.edu>
* sound.c: Integer cleanups.

21
src/sound.c
View file

@ -325,15 +325,6 @@ sound_warning (const char *msg)
}
/* Return S's value as a string if S is a string, otherwise DEFAULT_VALUE. */
static char const *
string_default (Lisp_Object s, char const *default_value)
{
return STRINGP (s) ? SSDATA (s) : default_value;
}
/* Parse sound specification SOUND, and fill ATTRS with what is
found. Value is non-zero if SOUND Is a valid sound specification.
A valid sound specification is a list starting with the symbol
@ -426,6 +417,15 @@ parse_sound (Lisp_Object sound, Lisp_Object *attrs)
/* BEGIN: Non Windows functions */
#ifndef WINDOWSNT
/* Return S's value as a string if S is a string, otherwise DEFAULT_VALUE. */
static char const *
string_default (Lisp_Object s, char const *default_value)
{
return STRINGP (s) ? SSDATA (s) : default_value;
}
/* Find out the type of the sound file whose file descriptor is FD.
S is the sound file structure to fill in. */
@ -1335,7 +1335,6 @@ Internal use only, use `play-sound' instead. */)
char * psz_file = NULL;
unsigned long ui_volume_tmp = UINT_MAX;
unsigned long ui_volume = UINT_MAX;
int i_result = 0;
#endif /* WINDOWSNT */
/* Parse the sound specification. Give up if it is invalid. */
@ -1430,7 +1429,7 @@ Internal use only, use `play-sound' instead. */)
{
ui_volume = ui_volume_tmp * (UINT_MAX / 100);
}
i_result = do_play_sound (psz_file, ui_volume);
do_play_sound (psz_file, ui_volume);
#endif /* WINDOWSNT */