[Emacs-diffs] trunk r113083: src/sound.c: Silence some warnings.

[Juanma Barranquero]

------------------------------------------------------------
revno: 113083
revision-id: address@hidden
parent: address@hidden
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Wed 2013-06-19 16:20:26 +0200
message:
  src/sound.c: Silence some warnings.
  (string_default): Move to !WINDOWSNT section.
  (Fplay_sound_internal) [WINDOWSNT]: Remove i_result to avoid warning.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/sound.c                    sound.c-20091113204419-o5vbwnq5f7feedwu-1323

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-06-19 07:36:20 +0000
+++ b/src/ChangeLog     2013-06-19 14:20:26 +0000
@@ -1,3 +1,8 @@
+2013-06-19  Juanma Barranquero  <address@hidden>
+
+       * sound.c (string_default): Move to !WINDOWSNT section.
+       (Fplay_sound_internal) [WINDOWSNT]: Remove i_result to avoid warning.
+
 2013-06-19  Paul Eggert  <address@hidden>
 
        * sound.c: Integer cleanups.

=== modified file 'src/sound.c'
--- a/src/sound.c       2013-06-19 07:36:20 +0000
+++ b/src/sound.c       2013-06-19 14:20:26 +0000
@@ -325,15 +325,6 @@
 }
 
 
-/* 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 @@
 /* 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 @@
   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 @@
     {
       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 */