Properly pluralize some messages

2 files changed, 14 insertions, 8 deletions

diff --git a/Alc/ALc.c b/Alc/ALc.c
index 3a2ac287..1e501aec 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -2139,21 +2139,24 @@ static ALCvoid FreeDevice(ALCdevice *device)
 
     if(device->BufferMap.size > 0)
     {
-        WARN("(%p) Deleting %d Buffer(s)\n", device, device->BufferMap.size);
+        WARN("(%p) Deleting %d Buffer%s\n", device, device->BufferMap.size,
+             (device->BufferMap.size==1)?"":"s");
         ReleaseALBuffers(device);
     }
     ResetUIntMap(&device->BufferMap);
 
     if(device->EffectMap.size > 0)
     {
-        WARN("(%p) Deleting %d Effect(s)\n", device, device->EffectMap.size);
+        WARN("(%p) Deleting %d Effect%s\n", device, device->EffectMap.size,
+             (device->EffectMap.size==1)?"":"s");
         ReleaseALEffects(device);
     }
     ResetUIntMap(&device->EffectMap);
 
     if(device->FilterMap.size > 0)
     {
-        WARN("(%p) Deleting %d Filter(s)\n", device, device->FilterMap.size);
+        WARN("(%p) Deleting %d Filter%s\n", device, device->FilterMap.size,
+             (device->FilterMap.size==1)?"":"s");
         ReleaseALFilters(device);
     }
     ResetUIntMap(&device->FilterMap);
@@ -2300,14 +2303,16 @@ static void FreeContext(ALCcontext *context)
 
     if(context->SourceMap.size > 0)
     {
-        WARN("(%p) Deleting %d Source(s)\n", context, context->SourceMap.size);
+        WARN("(%p) Deleting %d Source%s\n", context, context->SourceMap.size,
+             (context->SourceMap.size==1)?"":"s");
         ReleaseALSources(context);
     }
     ResetUIntMap(&context->SourceMap);
 
     if(context->EffectSlotMap.size > 0)
     {
-        WARN("(%p) Deleting %d AuxiliaryEffectSlot(s)\n", context, context->EffectSlotMap.size);
+        WARN("(%p) Deleting %d AuxiliaryEffectSlot%s\n", context, context->EffectSlotMap.size,
+             (context->EffectSlotMap.size==1)?"":"s");
         ReleaseALAuxiliaryEffectSlots(context);
     }
     ResetUIntMap(&context->EffectSlotMap);
diff --git a/Alc/backends/mmdevapi.c b/Alc/backends/mmdevapi.c
index 8851678b..938488ac 100644
--- a/Alc/backends/mmdevapi.c
+++ b/Alc/backends/mmdevapi.c
@@ -1574,9 +1574,10 @@ static HRESULT ALCmmdevCapture_resetProxy(ALCmmdevCapture *self)
        wfx->nChannels != OutputType.Format.nChannels ||
        wfx->nBlockAlign != OutputType.Format.nBlockAlign)
     {
-        ERR("Did not get matching format, wanted: %s %s %uhz, got: %d channel(s) %d-bit %luhz\n",
-            DevFmtChannelsString(device->FmtChans), DevFmtTypeString(device->FmtType), device->Frequency,
-            wfx->nChannels, wfx->wBitsPerSample, wfx->nSamplesPerSec);
+        ERR("Failed to get matching format, wanted: %s %s %uhz, got: %d channel%s %d-bit %luhz\n",
+            DevFmtChannelsString(device->FmtChans), DevFmtTypeString(device->FmtType),
+            device->Frequency, wfx->nChannels, (wfx->nChannels==1)?"":"s", wfx->wBitsPerSample,
+            wfx->nSamplesPerSec);
         CoTaskMemFree(wfx);
         return E_FAIL;
     }