Re: [PATCH edk2-platforms 5/5] Platform/RDKQemu: stop using deprecated string conversion routines

["Ard Biesheuvel" <ard.biesheuvel@linaro.org>]

On Mon, 10 Jun 2019 at 21:01, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>
> On Mon, Jun 10, 2019 at 08:55:03PM +0200, Ard Biesheuvel wrote:
> > On Mon, 10 Jun 2019 at 20:06, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> > >
> > > On Mon, Jun 10, 2019 at 04:20:06PM +0200, Ard Biesheuvel wrote:
> > > > Stop using deprecated string conversion routines so we can stop
> > > > un'#define'ing the DISABLE_NEW_DEPRECATED_INTERFACES macro in this code.
> > > >
> > > > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > > > ---
> > > >  Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c  | 12 +++++++--
> > > >  Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c | 28 +++++++++++---------
> > > >  Platform/Comcast/RDKQemu/RDKQemu.dsc                 |  3 ---
> > > >  3 files changed, 26 insertions(+), 17 deletions(-)
> > > >
> > > > diff --git a/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c b/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
> > > > index ed893bd5af6a..df16c326cc57 100644
> > > > --- a/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
> > > > +++ b/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
> > > > @@ -90,6 +90,7 @@ ListBlockIos (
> > > >    UINTN                             NumHandles;
> > > >    UINT16                            *DeviceFullPath;
> > > >    DISKIO_PARTITION_LIST             *Entry;
> > > > +  RETURN_STATUS                     RetStatus;
> > > >
> > > >    InitializeListHead (&mPartitionListHead);
> > > >
> > > > @@ -146,11 +147,13 @@ ListBlockIos (
> > > >
> > > >        // Copy handle and partition name
> > > >        Entry->PartitionHandle = AllHandles[LoopIndex];
> > > > -      StrnCpy (
> > > > +      RetStatus = StrnCpyS (
> > > >          Entry->PartitionName,
> > > > +        PARTITION_NAME_MAX_LENGTH,
> > > >          PartitionName,
> > > >          PARTITION_NAME_MAX_LENGTH
> > > >        );
> > > > +      ASSERT_RETURN_ERROR (RetStatus);
> > >
> > > Would we not want to return an error here, for non-DEBUG builds?
> > >
> >
> > Actually, I think I should just change the last arg to
> > PARTITION_NAME_MAX_LENGTH - 1, in which case no input length based
> > error is ever returned.
>
> Thats works for me.
> With that, and the below style fixes:
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
>


Thanks

Series pushed as  cf5d0a48c1d9..9f814bbee5d5