--- a/src/audio/SDL_wave.c	Fri Aug 05 01:44:15 2016 -0400
+++ b/src/audio/SDL_wave.c	Fri Aug 05 01:59:06 2016 -0400
@@ -504,7 +504,7 @@
         was_error = 1;
         goto done;
     }
-    SDL_memset(spec, 0, (sizeof *spec));
+    SDL_zerop(spec);
     spec->freq = SDL_SwapLE32(format->frequency);
 
     if (IEEE_float_encoded) {

--- a/src/audio/alsa/SDL_alsa_audio.c	Fri Aug 05 01:44:15 2016 -0400
+++ b/src/audio/alsa/SDL_alsa_audio.c	Fri Aug 05 01:59:06 2016 -0400
@@ -539,7 +539,7 @@
     if (this->hidden == NULL) {
         return SDL_OutOfMemory();
     }
-    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+    SDL_zerop(this->hidden);
 
     /* Open the audio device */
     /* Name of device should depend on # channels in spec */

--- a/src/audio/arts/SDL_artsaudio.c	Fri Aug 05 01:44:15 2016 -0400
+++ b/src/audio/arts/SDL_artsaudio.c	Fri Aug 05 01:59:06 2016 -0400
@@ -235,7 +235,7 @@
     if (this->hidden == NULL) {
         return SDL_OutOfMemory();
     }
-    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+    SDL_zerop(this->hidden);
 
     /* Try for a closest match on audio format */
     for (test_format = SDL_FirstAudioFormat(this->spec.format);

--- a/src/audio/bsd/SDL_bsdaudio.c	Fri Aug 05 01:44:15 2016 -0400
+++ b/src/audio/bsd/SDL_bsdaudio.c	Fri Aug 05 01:59:06 2016 -0400
@@ -297,7 +297,7 @@
     if (this->hidden == NULL) {
         return SDL_OutOfMemory();
     }
-    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+    SDL_zerop(this->hidden);
 
     /* Open the audio device */
     this->hidden->audio_fd = open(devname, flags, 0);

--- a/src/audio/directsound/SDL_directsound.c	Fri Aug 05 01:44:15 2016 -0400
+++ b/src/audio/directsound/SDL_directsound.c	Fri Aug 05 01:59:06 2016 -0400
@@ -431,7 +431,7 @@
     if (this->hidden == NULL) {
         return SDL_OutOfMemory();
     }
-    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+    SDL_zerop(this->hidden);
 
     /* Open the audio device */
     result = pDirectSoundCreate8(guid, &this->hidden->sound, NULL);

--- a/src/audio/disk/SDL_diskaudio.c	Fri Aug 05 01:44:15 2016 -0400
+++ b/src/audio/disk/SDL_diskaudio.c	Fri Aug 05 01:59:06 2016 -0400
@@ -105,7 +105,7 @@
     if (this->hidden == NULL) {
         return SDL_OutOfMemory();
     }
-    SDL_memset(this->hidden, 0, sizeof(*this->hidden));
+    SDL_zerop(this->hidden);
 
     this->hidden->mixlen = this->spec.size;
     this->hidden->write_delay =

--- a/src/audio/dsp/SDL_dspaudio.c	Fri Aug 05 01:44:15 2016 -0400
+++ b/src/audio/dsp/SDL_dspaudio.c	Fri Aug 05 01:59:06 2016 -0400
@@ -100,7 +100,7 @@
     if (this->hidden == NULL) {
         return SDL_OutOfMemory();
     }
-    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+    SDL_zerop(this->hidden);
 
     /* Open the audio device */
     this->hidden->audio_fd = open(devname, flags, 0);

--- a/src/audio/emscripten/SDL_emscriptenaudio.c	Fri Aug 05 01:44:15 2016 -0400
+++ b/src/audio/emscripten/SDL_emscriptenaudio.c	Fri Aug 05 01:59:06 2016 -0400
@@ -171,7 +171,7 @@
     if (this->hidden == NULL) {
         return SDL_OutOfMemory();
     }
-    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+    SDL_zerop(this->hidden);
 
     /* based on parts of library_sdl.js */
 

--- a/src/audio/esd/SDL_esdaudio.c	Fri Aug 05 01:44:15 2016 -0400
+++ b/src/audio/esd/SDL_esdaudio.c	Fri Aug 05 01:59:06 2016 -0400
@@ -220,7 +220,7 @@
     if (this->hidden == NULL) {
         return SDL_OutOfMemory();
     }
-    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+    SDL_zerop(this->hidden);
     this->hidden->audio_fd = -1;
 
     /* Convert audio spec to the ESD audio format */

--- a/src/audio/fusionsound/SDL_fsaudio.c	Fri Aug 05 01:44:15 2016 -0400
+++ b/src/audio/fusionsound/SDL_fsaudio.c	Fri Aug 05 01:59:06 2016 -0400
@@ -195,7 +195,7 @@
     if (this->hidden == NULL) {
         return SDL_OutOfMemory();
     }
-    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+    SDL_zerop(this->hidden);
 
     /* Try for a closest match on audio format */
     for (test_format = SDL_FirstAudioFormat(this->spec.format);

--- a/src/audio/haiku/SDL_haikuaudio.cc	Fri Aug 05 01:44:15 2016 -0400
+++ b/src/audio/haiku/SDL_haikuaudio.cc	Fri Aug 05 01:59:06 2016 -0400
@@ -118,10 +118,10 @@
     if (_this->hidden == NULL) {
         return SDL_OutOfMemory();
     }
-    SDL_memset(_this->hidden, 0, (sizeof *_this->hidden));
+    SDL_zerop(this->hidden);
 
     /* Parse the audio format and fill the Be raw audio format */
-    SDL_memset(&format, '\0', sizeof(media_raw_audio_format));
+    SDL_zero(format);
     format.byte_order = B_MEDIA_LITTLE_ENDIAN;
     format.frame_rate = (float) _this->spec.freq;
     format.channel_count = _this->spec.channels;        /* !!! FIXME: support > 2? */

--- a/src/audio/nacl/SDL_naclaudio.c	Fri Aug 05 01:44:15 2016 -0400
+++ b/src/audio/nacl/SDL_naclaudio.c	Fri Aug 05 01:59:06 2016 -0400
@@ -65,7 +65,7 @@
             SDL_UnlockMutex(_this->mixer_lock);
         }
     } else {
-        SDL_memset(samples, 0, buffer_size);
+        SDL_memset(samples, _this->spec.silence, buffer_size);
     }
     
     SDL_UnlockMutex(private->mutex);

--- a/src/audio/nas/SDL_nasaudio.c	Fri Aug 05 01:44:15 2016 -0400
+++ b/src/audio/nas/SDL_nasaudio.c	Fri Aug 05 01:59:06 2016 -0400
@@ -282,7 +282,7 @@
     if (this->hidden == NULL) {
         return SDL_OutOfMemory();
     }
-    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+    SDL_zerop(this->hidden);
 
     /* Try for a closest match on audio format */
     format = 0;

--- a/src/audio/paudio/SDL_paudio.c	Fri Aug 05 01:44:15 2016 -0400
+++ b/src/audio/paudio/SDL_paudio.c	Fri Aug 05 01:59:06 2016 -0400
@@ -256,7 +256,7 @@
     if (this->hidden == NULL) {
         return SDL_OutOfMemory();
     }
-    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+    SDL_zerop(this->hidden);
 
     /* Open the audio device */
     fd = OpenAudioPath(audiodev, sizeof(audiodev), OPEN_FLAGS, 0);

--- a/src/audio/psp/SDL_pspaudio.c	Fri Aug 05 01:44:15 2016 -0400
+++ b/src/audio/psp/SDL_pspaudio.c	Fri Aug 05 01:59:06 2016 -0400
@@ -50,7 +50,7 @@
     if (this->hidden == NULL) {
         return SDL_OutOfMemory();
     }
-    SDL_memset(this->hidden, 0, sizeof(*this->hidden));
+    SDL_zerop(this->hidden);
     switch (this->spec.format & 0xff) {
         case 8:
         case 16:

--- a/src/audio/pulseaudio/SDL_pulseaudio.c	Fri Aug 05 01:44:15 2016 -0400
+++ b/src/audio/pulseaudio/SDL_pulseaudio.c	Fri Aug 05 01:59:06 2016 -0400
@@ -529,13 +529,12 @@
     int rc = 0;
 
     /* Initialize all variables that we clean on shutdown */
-    this->hidden = (struct SDL_PrivateAudioData *)
+    h = this->hidden = (struct SDL_PrivateAudioData *)
         SDL_malloc((sizeof *this->hidden));
     if (this->hidden == NULL) {
         return SDL_OutOfMemory();
     }
-    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
-    h = this->hidden;
+    SDL_zerop(this->hidden);
 
     paspec.format = PA_SAMPLE_INVALID;
 

--- a/src/audio/qsa/SDL_qsa_audio.c	Fri Aug 05 01:44:15 2016 -0400
+++ b/src/audio/qsa/SDL_qsa_audio.c	Fri Aug 05 01:59:06 2016 -0400
@@ -137,8 +137,7 @@
 static void
 QSA_InitAudioParams(snd_pcm_channel_params_t * cpars)
 {
-    SDL_memset(cpars, 0, sizeof(snd_pcm_channel_params_t));
-
+    SDL_zerop(cpars);
     cpars->channel = SND_PCM_CHANNEL_PLAYBACK;
     cpars->mode = SND_PCM_MODE_BLOCK;
     cpars->start_mode = SND_PCM_START_DATA;
@@ -261,7 +260,7 @@
                 continue;
             } else {
                 if ((errno == EINVAL) || (errno == EIO)) {
-                    SDL_memset(&cstatus, 0, sizeof(cstatus));
+                    SDL_zero(cstatus);
                     if (!this->hidden->iscapture) {
                         cstatus.channel = SND_PCM_CHANNEL_PLAYBACK;
                     } else {
@@ -358,7 +357,7 @@
     if (this->hidden == NULL) {
         return SDL_OutOfMemory();
     }
-    SDL_memset(this->hidden, 0, sizeof(struct SDL_PrivateAudioData));
+    SDL_zerop(this->hidden);
 
     /* Initialize channel transfer parameters to default */
     QSA_InitAudioParams(&cparams);
@@ -499,7 +498,7 @@
     }
 
     /* Make sure channel is setup right one last time */
-    SDL_memset(&csetup, 0, sizeof(csetup));
+    SDL_zero(csetup);
     if (!this->hidden->iscapture) {
         csetup.channel = SND_PCM_CHANNEL_PLAYBACK;
     } else {
@@ -731,10 +730,9 @@
 QSA_Deinitialize(void)
 {
     /* Clear devices array on shutdown */
-    SDL_memset(qsa_playback_device, 0x00,
-               sizeof(QSA_Device) * QSA_MAX_DEVICES);
-    SDL_memset(qsa_capture_device, 0x00,
-               sizeof(QSA_Device) * QSA_MAX_DEVICES);
+    /* !!! FIXME: we zero these on init...any reason to do it here? */
+    SDL_zero(qsa_playback_device);
+    SDL_zero(qsa_capture_device);
     qsa_playback_devices = 0;
     qsa_capture_devices = 0;
 }
@@ -746,10 +744,8 @@
     int32_t status = 0;
 
     /* Clear devices array */
-    SDL_memset(qsa_playback_device, 0x00,
-               sizeof(QSA_Device) * QSA_MAX_DEVICES);
-    SDL_memset(qsa_capture_device, 0x00,
-               sizeof(QSA_Device) * QSA_MAX_DEVICES);
+    SDL_zero(qsa_playback_device);
+    SDL_zero(qsa_capture_device);
     qsa_playback_devices = 0;
     qsa_capture_devices = 0;
 

--- a/src/audio/sndio/SDL_sndioaudio.c	Fri Aug 05 01:44:15 2016 -0400
+++ b/src/audio/sndio/SDL_sndioaudio.c	Fri Aug 05 01:59:06 2016 -0400
@@ -198,7 +198,7 @@
     if (this->hidden == NULL) {
         return SDL_OutOfMemory();
     }
-    SDL_memset(this->hidden, 0, sizeof(*this->hidden));
+    SDL_zerop(this->hidden);
 
     this->hidden->mixlen = this->spec.size;
 

--- a/src/audio/sun/SDL_sunaudio.c	Fri Aug 05 01:44:15 2016 -0400
+++ b/src/audio/sun/SDL_sunaudio.c	Fri Aug 05 01:59:06 2016 -0400
@@ -212,7 +212,7 @@
     if (this->hidden == NULL) {
         return SDL_OutOfMemory();
     }
-    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+    SDL_zerop(this->hidden);
 
     /* Open the audio device */
     this->hidden->audio_fd = open(devname, flags, 0);

--- a/src/audio/winmm/SDL_winmm.c	Fri Aug 05 01:44:15 2016 -0400
+++ b/src/audio/winmm/SDL_winmm.c	Fri Aug 05 01:59:06 2016 -0400
@@ -228,7 +228,7 @@
     if (this->hidden == NULL) {
         return SDL_OutOfMemory();
     }
-    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+    SDL_zerop(this->hidden);
 
     /* Initialize the wavebuf structures for closing */
     for (i = 0; i < NUM_BUFFERS; ++i)
@@ -305,9 +305,9 @@
     if (this->hidden->mixbuf == NULL) {
         return SDL_OutOfMemory();
     }
+
+    SDL_zero(this->hidden->wavebuf);
     for (i = 0; i < NUM_BUFFERS; ++i) {
-        SDL_memset(&this->hidden->wavebuf[i], 0,
-                   sizeof(this->hidden->wavebuf[i]));
         this->hidden->wavebuf[i].dwBufferLength = this->spec.size;
         this->hidden->wavebuf[i].dwFlags = WHDR_DONE;
         this->hidden->wavebuf[i].lpData =

--- a/src/audio/xaudio2/SDL_xaudio2.c	Fri Aug 05 01:44:15 2016 -0400
+++ b/src/audio/xaudio2/SDL_xaudio2.c	Fri Aug 05 01:59:06 2016 -0400
@@ -342,7 +342,7 @@
         IXAudio2_Release(ixa2);
         return SDL_OutOfMemory();
     }
-    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+    SDL_zerop(this->hidden);
 
     this->hidden->ixa2 = ixa2;
     this->hidden->semaphore = SDL_CreateSemaphore(1);
@@ -377,7 +377,7 @@
         return SDL_OutOfMemory();
     }
     this->hidden->nextbuf = this->hidden->mixbuf;
-    SDL_memset(this->hidden->mixbuf, 0, 2 * this->hidden->mixlen);
+    SDL_memset(this->hidden->mixbuf, this->spec.silence, 2 * this->hidden->mixlen);
 
     /* We use XAUDIO2_DEFAULT_CHANNELS instead of this->spec.channels. On
        Xbox360, this means 5.1 output, but on Windows, it means "figure out