From 98cc3276608be6f36fe38617e0b15e934128ea92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 8 Nov 2004 14:11:46 +0000 Subject: [PATCH] Replaced region_id with area_id. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9857 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/apps/rld/rldelf.c | 4 ++-- src/kernel/core/cbuf.c | 6 +++--- src/kernel/core/elf.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/kernel/apps/rld/rldelf.c b/src/kernel/apps/rld/rldelf.c index 622cda02a6..d0f4945ce3 100644 --- a/src/kernel/apps/rld/rldelf.c +++ b/src/kernel/apps/rld/rldelf.c @@ -66,7 +66,7 @@ enum { typedef struct elf_region_t { - region_id id; + area_id id; addr_t start; addr_t size; addr_t vmstart; @@ -858,7 +858,7 @@ search_path_for_type(image_type type) if (path != NULL) return path; - switch(type) { + switch (type) { case B_APP_IMAGE: return "/boot/home/config/bin:" "/bin:" diff --git a/src/kernel/core/cbuf.c b/src/kernel/core/cbuf.c index b10f440006..1993bcd262 100644 --- a/src/kernel/core/cbuf.c +++ b/src/kernel/core/cbuf.c @@ -1,5 +1,5 @@ /* -** Copyright 2002-2004, The Haiku Team. All rights reserved. +** Copyright 2002-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. ** Distributed under the terms of the Haiku License. ** ** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. @@ -47,9 +47,9 @@ static cbuf *sFreeBufferNoBlockList; static spinlock sNoBlockSpinlock; static spinlock sLowlevelSpinlock; -static region_id sBufferArea; +static area_id sBufferArea; static cbuf *sBuffer; -static region_id sBitmapArea; +static area_id sBitmapArea; static uint8 *sBitmap; diff --git a/src/kernel/core/elf.c b/src/kernel/core/elf.c index 0e3ab7aeec..7d6847ff16 100644 --- a/src/kernel/core/elf.c +++ b/src/kernel/core/elf.c @@ -1,5 +1,5 @@ /* -** Copyright 2002-2004, The Haiku Team. All rights reserved. +** Copyright 2002-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. ** Distributed under the terms of the Haiku License. ** ** Copyright 2001, Travis Geiselbrecht. All rights reserved. @@ -1071,7 +1071,7 @@ elf_load_user_image(const char *path, struct team *p, int flags, addr_t *entry) for (i = 0; i < eheader.e_phnum; i++) { char regionName[64]; char *regionAddress; - region_id id; + area_id id; if (pheaders[i].p_type != PT_LOAD) continue;