abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-06 22:44:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused mem_reallocm

Browse Source
This commit is contained in:
curtmcd 2006-05-31 21:23:01 +00:00
parent b60b7cf8fe
commit b306594cad
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/mem.c
View File

@ -109,8 +109,8 @@ plug_holes(struct mem *mem)
pmem->next = mem->next; pmem->next = mem->next;
((struct mem *)&ram[mem->next])->prev = (u8_t *)pmem - ram; ((struct mem *)&ram[mem->next])->prev = (u8_t *)pmem - ram;
} }
} }
void void
mem_init(void) mem_init(void)
{ {
@ -134,6 +134,7 @@ mem_init(void)
lwip_stats.mem.avail = MEM_SIZE; lwip_stats.mem.avail = MEM_SIZE;
#endif /* MEM_STATS */ #endif /* MEM_STATS */
} }
void void
mem_free(void *rmem) mem_free(void *rmem)
{ {
@ -174,18 +175,6 @@ mem_free(void *rmem)
plug_holes(mem); plug_holes(mem);
sys_sem_signal(mem_sem); sys_sem_signal(mem_sem);
} }
void *
mem_reallocm(void *rmem, mem_size_t newsize)
{
void *nmem;
nmem = mem_malloc(newsize);
if (nmem == NULL) {
return mem_realloc(rmem, newsize);
}
memcpy(nmem, rmem, newsize);
mem_free(rmem);
return nmem;
}
void * void *
mem_realloc(void *rmem, mem_size_t newsize) mem_realloc(void *rmem, mem_size_t newsize)
@ -238,6 +227,7 @@ mem_realloc(void *rmem, mem_size_t newsize)
sys_sem_signal(mem_sem); sys_sem_signal(mem_sem);
return rmem; return rmem;
} }
void * void *
mem_malloc(mem_size_t size) mem_malloc(mem_size_t size)
{ {
@ -280,16 +270,16 @@ mem_malloc(mem_size_t size)
lwip_stats.mem.used += (size + SIZEOF_STRUCT_MEM); lwip_stats.mem.used += (size + SIZEOF_STRUCT_MEM);
/* if (lwip_stats.mem.max < lwip_stats.mem.used) { /* if (lwip_stats.mem.max < lwip_stats.mem.used) {
lwip_stats.mem.max = lwip_stats.mem.used; lwip_stats.mem.max = lwip_stats.mem.used;
} */ } */
if (lwip_stats.mem.max < ptr2) { if (lwip_stats.mem.max < ptr2) {
lwip_stats.mem.max = ptr2; lwip_stats.mem.max = ptr2;
} }
#endif /* MEM_STATS */ #endif /* MEM_STATS */
if (mem == lfree) { if (mem == lfree) {
/* Find next free block after mem */ /* Find next free block after mem */
while (lfree->used && lfree != ram_end) { while (lfree->used && lfree != ram_end) {
lfree = (struct mem *)&ram[lfree->next]; lfree = (struct mem *)&ram[lfree->next];
} }
LWIP_ASSERT("mem_malloc: !lfree->used", !lfree->used); LWIP_ASSERT("mem_malloc: !lfree->used", !lfree->used);
} }

1
src/include/lwip/mem.h
View File

@ -47,7 +47,6 @@ void mem_init(void);
void *mem_malloc(mem_size_t size); void *mem_malloc(mem_size_t size);
void mem_free(void *mem); void mem_free(void *mem);
void *mem_realloc(void *mem, mem_size_t size); void *mem_realloc(void *mem, mem_size_t size);
void *mem_reallocm(void *mem, mem_size_t size);
#ifndef MEM_ALIGN_SIZE #ifndef MEM_ALIGN_SIZE
#define MEM_ALIGN_SIZE(size) (((size) + MEM_ALIGNMENT - 1) & ~(MEM_ALIGNMENT-1)) #define MEM_ALIGN_SIZE(size) (((size) + MEM_ALIGNMENT - 1) & ~(MEM_ALIGNMENT-1))