[U-Boot] what is the rationale for 900+ lines duplicated in common/dlmalloc.c and include/malloc.h?

Tom Rini trini at konsulko.com
Thu Apr 21 13:29:06 CEST 2016


On Thu, Apr 21, 2016 at 07:21:54AM -0400, Robert P. J. Day wrote:
> On Wed, 20 Apr 2016, Tom Rini wrote:
> 
> > On Sat, Apr 16, 2016 at 04:23:27AM -0400, Robert P. J. Day wrote:
> >
> > >   just noticed, in common/dlmalloc.c, the sizable chunk:
> > >
> > >     #if 0   /* Moved to malloc.h */
> > >     /* ---------- To make a malloc.h, start cutting here ------------ */
> > >
> > >     ... several hundred lines ...
> > >
> > >     #ifdef __cplusplus
> > >     };  /* end of extern "C" */
> > >     #endif
> > >
> > >     /* ---------- To make a malloc.h, end cutting here ------------ */
> > >     #endif  /* 0 */                 /* Moved to malloc.h */
> > >
> > > given that those lines appear to be duplicated in malloc.h, what is
> > > the purpose of them still being in dlmalloc.c? i'm just curious.
> >
> > Good point.  Something that could probably be cleaned up.
> 
>   i can submit a patch for that ... i can either remove the "if 0"
> stuff in its entirety, or leave a short comment to the effect that
> what was here has now been moved, if you think it's worth it. pick
> one, and i'll put together the patch.

I would remove all of it.  If we ever re-sync with upstream on that file
it'll still be obvious what we did.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160421/1ce0f920/attachment.sig>


More information about the U-Boot mailing list