[FFmpeg-cvslog] r19742 - trunk/libavutil/internal.h

[Baptiste Coudurier]

On 8/29/2009 5:48 PM, Michael Niedermayer wrote:
> On Sat, Aug 29, 2009 at 11:44:29PM +0100, M?ns Rullg?rd wrote:
>> ramiro<subversion at mplayerhq.hu>  writes:
>>
>>> Author: ramiro
>>> Date: Sun Aug 30 00:38:48 2009
>>> New Revision: 19742
>>>
>>> Log:
>>> Add CHECKED_ALLOC macro.
>>> It works the same as CHECKED_ALLOCZ except that it does not zero the allocated
>>> memory.
>>>
>>> Modified:
>>>     trunk/libavutil/internal.h
>>>
>>> Modified: trunk/libavutil/internal.h
>>> ==============================================================================
>>> --- trunk/libavutil/internal.h	Sat Aug 29 23:04:18 2009	(r19741)
>>> +++ trunk/libavutil/internal.h	Sun Aug 30 00:38:48 2009	(r19742)
>>> @@ -249,6 +249,15 @@ if((y)<(x)){\
>>>   #define perror please_use_av_log_instead_of_perror
>>>   #endif
>>>
>>> +#define CHECKED_ALLOC(p, size)\
>>> +{\
>>> +    p= av_malloc(size);\
>>> +    if(p==NULL&&  (size)!=0){\
>>> +        av_log(NULL, AV_LOG_ERROR, "Cannot allocate memory.");\
>>> +        goto fail;\
>>> +    }\
>>> +}
>> Looks like I missed some discussions...  This should be wrapped in
>> do { } while(0) so if (foo) CHECKED_ALLOC(); else blah; can work.
>
> if + else should always have a {} as it makes future patches simpler
> and costs no line of code.

FYI, I prefer not using them for only one line of code.

[...]

-- 
Baptiste COUDURIER                              GnuPG Key Id: 0x5C1ABAAA
Key fingerprint                 8D77134D20CC9220201FC5DB0AC9325C5C1ABAAA
FFmpeg maintainer                                  http://www.ffmpeg.org