On 05/03/2016 07:46 PM, Donald Sharp wrote:
> You are right for the upstream behavior.  The version that we have in
> the cumulus tree is this:
> 
> 106 void *
> 107 zrealloc (int type, void *ptr, size_t size)
> 108 {
> 109   void *memory;
> 110 
> 111   memory = realloc (ptr, size);
> 112   if (memory == NULL)
> 113     zerror ("realloc", type, size);
> 114   if (ptr == NULL)
> 115     alloc_inc (type);
> 116 
> 117   return memory;
> 118 }
> 
> 
> Which would not work too well with your patch :)
> 
> ah well.  My mistake.  
> 
> acked-by: Donald Sharp <[email protected]
> <mailto:[email protected]>>

Then let's stick with your version. Imho, either is fine and it's
probably good to keep merge conflicts low.

-Christian


_______________________________________________
Quagga-dev mailing list
[email protected]
https://lists.quagga.net/mailman/listinfo/quagga-dev

Reply via email to