Re: [PATCH] cabinet: Turn some ERR into WARN and improved or fix messages.

[Nikolay Sivov]

On 11/27/2012 11:14, Christian Costa wrote:
> ---
>   dlls/cabinet/fdi.c |   15 ++++++---------
>   1 file changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c
> index 0690b38..809a5c0 100644
> --- a/dlls/cabinet/fdi.c
> +++ b/dlls/cabinet/fdi.c
> @@ -710,7 +710,7 @@ static BOOL FDI_read_entries(
>   }
>
> /***********************************************************************
> - *		FDIIsCabinet (CABINET.21)
> + * FDIIsCabinet (CABINET.21)
>    *
>    * Informs the caller as to whether or not the provided file handle is
>    * really a cabinet or not, filling out the provided PFDICABINETINFO
> @@ -725,7 +725,7 @@ static BOOL FDI_read_entries(
>    *               be filled out with information about the cabinet
>    *               file indicated by hf if, indeed, it is determined
>    *               to be a cabinet.
> - *
> + *
>    * RETURNS
>    *   TRUE  if the file is a cabinet.  The info pointed to by pfdici will
>    *         be provided.
> @@ -736,10 +736,7 @@ static BOOL FDI_read_entries(
>    * INCLUDES
>    *   fdi.c
>    */
> -BOOL __cdecl FDIIsCabinet(
> -	HFDI            hfdi,
> -	INT_PTR         hf,
> -	PFDICABINETINFO pfdici)
> +BOOL __cdecl FDIIsCabinet(HFDI hfdi, INT_PTR hf, PFDICABINETINFO pfdici)
>   {
>     BOOL rv;
>     FDI_Int *fdi = get_fdi_ptr( hfdi );
> @@ -749,13 +746,13 @@ BOOL __cdecl FDIIsCabinet(
>     if (!fdi) return FALSE;
>
> if (!hf) {
> -    ERR("(!hf)!\n");
> +    WARN("No file handle\n");
>       SetLastError(ERROR_INVALID_HANDLE);
>       return FALSE;
>     }
>
> if (!pfdici) {
> -    ERR("(!pfdici)!\n");
> +    WARN("No cab info pointer\n");
>       SetLastError(ERROR_BAD_ARGUMENTS);
>       return FALSE;
>     }
> This call already has a TRACE earlier, I don't see a point in tracing 
> input parameters multiple times.
> @@ -2532,7 +2529,7 @@ BOOL __cdecl FDICopy(
>
> /* check if it's really a cabfile. Note that this doesn't implement the bug */
>     if (!FDI_read_entries(fdi, cabhf, &fdici, &(CAB(mii)))) {
> -    ERR("FDIIsCabinet failed: %u.\n", fdi->perf->erfOper);
> +    WARN("FDI_read_entries failed: %u\n", fdi->perf->erfOper);
>       fdi->free(decomp_state);
>       fdi->close(cabhf);
>       return FALSE;

[PATCH] cabinet: Turn some ERR into WARN and improved or fix messages.

[Christian Costa]

> -BOOL __cdecl FDIIsCabinet(
> > -       HFDI            hfdi,
> > -       INT_PTR         hf,
> > -       PFDICABINETINFO pfdici)
> > +BOOL __cdecl FDIIsCabinet(HFDI hfdi, INT_PTR hf, PFDICABINETINFO pfdici)
> >   {
> >     BOOL rv;
> >     FDI_Int *fdi = get_fdi_ptr( hfdi );
> > @@ -749,13 +746,13 @@ BOOL __cdecl FDIIsCabinet(
> >     if (!fdi) return FALSE;
> >       if (!hf) {
> > -    ERR("(!hf)!\n");
> > +    WARN("No file handle\n");
> >       SetLastError(ERROR_INVALID_**HANDLE);
> >       return FALSE;
> >     }
> >       if (!pfdici) {
> > -    ERR("(!pfdici)!\n");
> > +    WARN("No cab info pointer\n");
> >       SetLastError(ERROR_BAD_**ARGUMENTS);
> >       return FALSE;
> >     }
>
> This call already has a TRACE earlier, I don't see a point in tracing
> input parameters multiple times.
> >
>
> Indeed. That would be better to remove them. Thanks.