michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel: heap: rename resereved 'rewind'

Browse source 
This symbol is reserved and usage of reserved symbols violates the
coding guidelines. (MISRA 21.2)

NAME
   fgetpos, fseek, fsetpos, ftell, rewind - reposition a stream

SYNOPSIS
   #include <stdio.h>

   void rewind(FILE *stream);

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2021-03-22 07:58:19 -04:00
commit 21d3225317
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/os/heap.c
View file

@ -246,7 +246,7 @@ void *sys_heap_alloc(struct sys_heap *heap, size_t bytes)
void *sys_heap_aligned_alloc(struct sys_heap *heap, size_t align, size_t bytes) void *sys_heap_aligned_alloc(struct sys_heap *heap, size_t align, size_t bytes)
{ {
struct z_heap *h = heap->heap; struct z_heap *h = heap->heap;
size_t gap, rewind; size_t gap, rew;
/* /*
* Split align and rewind values (if any). * Split align and rewind values (if any).
@ -255,15 +255,15 @@ void *sys_heap_aligned_alloc(struct sys_heap *heap, size_t align, size_t bytes)
* So if e.g. align = 0x28 (32 | 8) this means we align to a 32-byte * So if e.g. align = 0x28 (32 | 8) this means we align to a 32-byte
* boundary and then rewind 8 bytes. * boundary and then rewind 8 bytes.
*/ */
rewind = align & -align; rew = align & -align;
if (align != rewind) { if (align != rew) {
align -= rewind; align -= rew;
gap = MIN(rewind, chunk_header_bytes(h)); gap = MIN(rew, chunk_header_bytes(h));
} else { } else {
if (align <= chunk_header_bytes(h)) { if (align <= chunk_header_bytes(h)) {
return sys_heap_alloc(heap, bytes); return sys_heap_alloc(heap, bytes);
} }
rewind = 0; rew = 0;
gap = chunk_header_bytes(h); gap = chunk_header_bytes(h);
} }
__ASSERT((align & (align - 1)) == 0, "align must be a power of 2"); __ASSERT((align & (align - 1)) == 0, "align must be a power of 2");
@ -286,7 +286,7 @@ void *sys_heap_aligned_alloc(struct sys_heap *heap, size_t align, size_t bytes)
uint8_t *mem = chunk_mem(h, c0); uint8_t *mem = chunk_mem(h, c0);
/* Align allocated memory */ /* Align allocated memory */
mem = (uint8_t *) ROUND_UP(mem + rewind, align) - rewind; mem = (uint8_t *) ROUND_UP(mem + rew, align) - rew;
chunk_unit_t *end = (chunk_unit_t *) ROUND_UP(mem + bytes, CHUNK_UNIT); chunk_unit_t *end = (chunk_unit_t *) ROUND_UP(mem + bytes, CHUNK_UNIT);
/* Get corresponding chunks */ /* Get corresponding chunks */