diff options
| author |   Dave Barach <dave@barachs.net> | 2016-10-13 10:53:26 -0400 |
|---|---|---|
| committer | Dave Barach <dave@barachs.net> | 2016-10-13 10:56:20 -0400 |
| commit | 241e52222e5e5579516494a8d979b6cc282f4799 (patch) | |
| tree | 9e188c588358eb559529d51bf97bd06f46f0c843 /vppinfra/vppinfra/vec.c | |
| parent | 0683c9cc130d45f1246be78fa4ebf3f8d7f322bb (diff) | |
Add clib_mem_alloc_or_null(...)
Change-Id: I5177d6d3349384beb551b4f2f52b30b044ce335b
Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'vppinfra/vppinfra/vec.c')
| -rw-r--r-- | vppinfra/vppinfra/vec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vppinfra/vppinfra/vec.c b/vppinfra/vppinfra/vec.c index f711679b0a4..2d7ae1d4dc6 100644 --- a/vppinfra/vppinfra/vec.c +++ b/vppinfra/vppinfra/vec.c @@ -56,9 +56,8 @@ vec_resize_allocate_memory (void *v, if (!v) { - new = - clib_mem_alloc_aligned_at_offset (data_bytes, data_align, - header_bytes); + new = clib_mem_alloc_aligned_at_offset (data_bytes, data_align, header_bytes, 1 /* yes, call os_out_of_memory */ + ); data_bytes = clib_mem_size (new); memset (new, 0, data_bytes); v = new + header_bytes; @@ -84,7 +83,8 @@ vec_resize_allocate_memory (void *v, new = clib_mem_alloc_aligned_at_offset (new_alloc_bytes, data_align, - header_bytes); + header_bytes, + 1 /* yes, call os_out_of_memory */ ); /* FIXME fail gracefully. */ if (!new) |