Re: [PATCH] msg711.acm: Avoid ARRAY_SIZE-like macros

[Andrew Eikum]

Signed-off-by: Andrew Eikum

On Wed, Jul 11, 2018 at 10:06:10PM +0200, Michael Stefaniuc wrote:
> Signed-off-by: Michael Stefaniuc
>
> dlls/msg711.acm/msg711.c | 22 +++++++++-------------
>  1 file changed, 9 insertions(+), 13 deletions(-)
>
> diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c
> index dc1661c7db..cb8b76240a 100644
> --- a/dlls/msg711.acm/msg711.c
> +++ b/dlls/msg711.acm/msg711.c
> @@ -87,10 +87,6 @@ static const Format ULaw_Formats[] =
>      {1,  8, 22050}, {2,	8, 22050},  {1,  8, 44100}, {2,	 8, 44100},
>  };
>
> -#define	NUM_PCM_FORMATS		(sizeof(PCM_Formats) / sizeof(PCM_Formats[0]))
> -#define	NUM_ALAW_FORMATS	(sizeof(ALaw_Formats) / sizeof(ALaw_Formats[0]))
> -#define	NUM_ULAW_FORMATS	(sizeof(ULaw_Formats) / sizeof(ULaw_Formats[0]))
> -
>
> /***********************************************************************
> -
>       G711_GetFormatIndex
>
> */
> @@ -102,15 +98,15 @@ static	DWORD	G711_GetFormatIndex(const WAVEFORMATEX *wfx)
>      switch (wfx->wFormatTag)
>      {
>      case WAVE_FORMAT_PCM:
> - hi = NUM_PCM_FORMATS;
> - hi = ARRAY_SIZE(PCM_Formats);
> fmts = PCM_Formats;
> break;
> case WAVE_FORMAT_ALAW:
> - hi = NUM_ALAW_FORMATS;
> - hi = ARRAY_SIZE(ALaw_Formats);
> fmts = ALaw_Formats;
> break;
> case WAVE_FORMAT_MULAW:
> - hi = NUM_ULAW_FORMATS;
> - hi = ARRAY_SIZE(ULaw_Formats);
> fmts = ULaw_Formats;
> break;
> default:
>
> @@ -716,19 +712,19 @@ static	LRESULT	G711_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
>      case 0:
>    aftd->dwFormatTag = WAVE_FORMAT_PCM;
>    aftd->cbFormatSize = sizeof(PCMWAVEFORMAT);
> - aftd->cStandardFormats = NUM_PCM_FORMATS;
> - aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats);
>     lstrcpyW(aftd->szFormatTag, szPcm);
>     break;
> case 1:
> aftd->dwFormatTag = WAVE_FORMAT_ALAW;
> aftd->cbFormatSize = sizeof(WAVEFORMATEX);
> - aftd->cStandardFormats = NUM_ALAW_FORMATS;
> - aftd->cStandardFormats = ARRAY_SIZE(ALaw_Formats);
>     lstrcpyW(aftd->szFormatTag, szALaw);
> break;
> case 2:
> aftd->dwFormatTag = WAVE_FORMAT_MULAW;
> aftd->cbFormatSize = sizeof(WAVEFORMATEX);
> - aftd->cStandardFormats = NUM_ULAW_FORMATS;
> - aftd->cStandardFormats = ARRAY_SIZE(ULaw_Formats);
>     lstrcpyW(aftd->szFormatTag, szULaw);
> break;
> }
>
> @@ -751,7 +747,7 @@ static	LRESULT	G711_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery)
>    switch (afd->dwFormatTag)
>          {
>    case WAVE_FORMAT_PCM:
> -
>    if (afd->dwFormatIndex >= NUM_PCM_FORMATS) return ACMERR_NOTPOSSIBLE;
> -
>    if (afd->dwFormatIndex >= ARRAY_SIZE(PCM_Formats)) return ACMERR_NOTPOSSIBLE;
>  afd->pwfx->nChannels = PCM_Formats[afd->dwFormatIndex].nChannels;
>  afd->pwfx->nSamplesPerSec = PCM_Formats[afd->dwFormatIndex].rate;
>  afd->pwfx->wBitsPerSample = PCM_Formats[afd->dwFormatIndex].nBits;
>
> @@ -759,7 +755,7 @@ static	LRESULT	G711_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery)
>        afd->pwfx->nAvgBytesPerSec = afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign;
>        break;
>    case WAVE_FORMAT_ALAW:
> -
>    if (afd->dwFormatIndex >= NUM_ALAW_FORMATS) return ACMERR_NOTPOSSIBLE;
> -
>    if (afd->dwFormatIndex >= ARRAY_SIZE(ALaw_Formats)) return ACMERR_NOTPOSSIBLE;
>  afd->pwfx->nChannels = ALaw_Formats[afd->dwFormatIndex].nChannels;
>  afd->pwfx->nSamplesPerSec = ALaw_Formats[afd->dwFormatIndex].rate;
>  afd->pwfx->wBitsPerSample = ALaw_Formats[afd->dwFormatIndex].nBits;
>
> @@ -768,7 +764,7 @@ static	LRESULT	G711_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery)
>              afd->pwfx->cbSize = 0;
>        break;
>    case WAVE_FORMAT_MULAW:
> -
>    if (afd->dwFormatIndex >= NUM_ULAW_FORMATS) return ACMERR_NOTPOSSIBLE;
> -
>    if (afd->dwFormatIndex >= ARRAY_SIZE(ULaw_Formats)) return ACMERR_NOTPOSSIBLE;
>  afd->pwfx->nChannels = ULaw_Formats[afd->dwFormatIndex].nChannels;
>  afd->pwfx->nSamplesPerSec = ULaw_Formats[afd->dwFormatIndex].rate;
>  afd->pwfx->wBitsPerSample = ULaw_Formats[afd->dwFormatIndex].nBits;
>
> -- 
> 2.14.4