HelenOSHelenOS-docHelenOS-historic

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /trunk/ @ 4641

  → /trunk/ @ 4642

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 4641 → Rev 4642

/trunk/uspace/lib/libc/generic/malloc.c
384,7 → 384,7
assert(!head->free);
void *ptr = NULL;
size_t real_size = GROSS_SIZE(size);
size_t real_size = GROSS_SIZE(ALIGN_UP(size, BASE_ALIGN));
size_t orig_size = head->size;
if (orig_size > real_size) {
409,7 → 409,7
&& (head->size + next_head->size >= real_size)) {
block_check(next_head);
block_init(head, head->size + next_head->size, false);
split_mark(head, size);
split_mark(head, ALIGN_UP(size, BASE_ALIGN));
ptr = ((void *) head) + sizeof(heap_block_head_t);
} else {