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

[Andrew Eikum]

Signed-off-by: Andrew Eikum

On Wed, Jul 11, 2018 at 10:06:16PM +0200, Michael Stefaniuc wrote:
> Signed-off-by: Michael Stefaniuc
>
> v2: Keep the <TAB> indentation
>
> dlls/l3codeca.acm/mpegl3.c | 11 ++++-------
>  1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c
> index 0e419bd66d..f71aac307f 100644
> --- a/dlls/l3codeca.acm/mpegl3.c
> +++ b/dlls/l3codeca.acm/mpegl3.c
> @@ -89,9 +89,6 @@ static const Format MPEG3_Formats[] =
>      {1,  0, 48000}, {2,  0, 48000}
>  };
>
> -#define	NUM_PCM_FORMATS		(sizeof(PCM_Formats) / sizeof(PCM_Formats[0]))
> -#define	NUM_MPEG3_FORMATS	(sizeof(MPEG3_Formats) / sizeof(MPEG3_Formats[0]))
> -
>
> /***********************************************************************
> -
>       MPEG3_GetFormatIndex
>
> */
> @@ -103,12 +100,12 @@ static	DWORD	MPEG3_GetFormatIndex(LPWAVEFORMATEX wfx)
>      switch (wfx->wFormatTag)
>      {
>      case WAVE_FORMAT_PCM:
> - hi = NUM_PCM_FORMATS;
> - hi = ARRAY_SIZE(PCM_Formats);
> fmts = PCM_Formats;
> break;
> case WAVE_FORMAT_MPEG:
> case WAVE_FORMAT_MPEGLAYER3:
> - hi = NUM_MPEG3_FORMATS;
> - hi = ARRAY_SIZE(MPEG3_Formats);
> fmts = MPEG3_Formats;
> break;
> default:
>
> @@ -733,7 +730,7 @@ static	LRESULT	MPEG3_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:
>
> @@ -768,7 +765,7 @@ static	LRESULT	MPEG3_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;
>
> -- 
> 2.14.4