From af29432635a30071e66c3ab219a6cc4386b4f156 Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Thu, 11 May 2006 07:53:19 +0000 Subject: [PATCH] Fixed a typo. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17420 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/build/os/game/DirectWindow.h | 6 ++--- headers/os/game/DirectWindow.h | 6 ++--- src/kits/game/DirectWindow.cpp | 24 +++++++++---------- .../kits/interface/NewRegion/DirectWindow.cpp | 24 +++++++++---------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/headers/build/os/game/DirectWindow.h b/headers/build/os/game/DirectWindow.h index d482b887ba..db0646ae3a 100644 --- a/headers/build/os/game/DirectWindow.h +++ b/headers/build/os/game/DirectWindow.h @@ -133,7 +133,7 @@ virtual void _ReservedDirectWindow4(); BDirectWindow(BDirectWindow &); BDirectWindow &operator=(BDirectWindow &); - bool deamon_killer; + bool daemon_killer; bool connection_enable; bool full_screen_enable; bool direct_driver_ready; @@ -151,13 +151,13 @@ virtual void _ReservedDirectWindow4(); uint32 direct_driver_token; area_id cloned_clipping_area; area_id source_clipping_area; - thread_id direct_deamon_id; + thread_id direct_daemon_id; direct_buffer_info *buffer_desc; BDirectDriver *direct_driver; struct priv_ext *extension; uint32 _reserved_[15]; -static int32 DirectDeamonFunc(void *arg); +static int32 DirectDaemonFunc(void *arg); bool LockDirect() const; void UnlockDirect() const; void InitData(); diff --git a/headers/os/game/DirectWindow.h b/headers/os/game/DirectWindow.h index d482b887ba..db0646ae3a 100644 --- a/headers/os/game/DirectWindow.h +++ b/headers/os/game/DirectWindow.h @@ -133,7 +133,7 @@ virtual void _ReservedDirectWindow4(); BDirectWindow(BDirectWindow &); BDirectWindow &operator=(BDirectWindow &); - bool deamon_killer; + bool daemon_killer; bool connection_enable; bool full_screen_enable; bool direct_driver_ready; @@ -151,13 +151,13 @@ virtual void _ReservedDirectWindow4(); uint32 direct_driver_token; area_id cloned_clipping_area; area_id source_clipping_area; - thread_id direct_deamon_id; + thread_id direct_daemon_id; direct_buffer_info *buffer_desc; BDirectDriver *direct_driver; struct priv_ext *extension; uint32 _reserved_[15]; -static int32 DirectDeamonFunc(void *arg); +static int32 DirectDaemonFunc(void *arg); bool LockDirect() const; void UnlockDirect() const; void InitData(); diff --git a/src/kits/game/DirectWindow.cpp b/src/kits/game/DirectWindow.cpp index 6bd2b2598f..b619ba7dcb 100644 --- a/src/kits/game/DirectWindow.cpp +++ b/src/kits/game/DirectWindow.cpp @@ -17,7 +17,7 @@ #include -// We don't need this kind of locking, since the directDeamonFunc +// We don't need this kind of locking, since the directDaemonFunc // doesn't access critical shared data. #define DW_NEEDS_LOCKING 0 @@ -308,11 +308,11 @@ BDirectWindow::SupportsWindowMode(screen_id id) int32 -BDirectWindow::DirectDeamonFunc(void *arg) +BDirectWindow::DirectDaemonFunc(void *arg) { BDirectWindow *object = static_cast(arg); - while (!object->deamon_killer) { + while (!object->daemon_killer) { // This sem is released by the app_server when our // clipping region changes, or when our window is moved, // resized, etc. etc. @@ -354,7 +354,7 @@ BDirectWindow::DirectDeamonFunc(void *arg) // I implemented them anyway, as they were the first methods I wrote // in this class (As you can see, I even needed to cast away their constness // to make them do something useful). -// They're not needed though, as the direct_deamon_thread doesn't change +// They're not needed though, as the direct_daemon_thread doesn't change // any shared data. They are probably here for future enhancements (see also the // comment in DriverSetup() bool @@ -447,15 +447,15 @@ BDirectWindow::InitData() if (cloned_clipping_area > 0) { dw_init_status |= DW_STATUS_AREA_CLONED; - direct_deamon_id = spawn_thread(DirectDeamonFunc, "direct deamon", + direct_daemon_id = spawn_thread(DirectDaemonFunc, "direct daemon", B_DISPLAY_PRIORITY, this); - if (direct_deamon_id > 0) { - deamon_killer = false; - if (resume_thread(direct_deamon_id) == B_OK) + if (direct_daemon_id > 0) { + daemon_killer = false; + if (resume_thread(direct_daemon_id) == B_OK) dw_init_status |= DW_STATUS_THREAD_STARTED; else - kill_thread(direct_deamon_id); + kill_thread(direct_daemon_id); } } } @@ -473,12 +473,12 @@ BDirectWindow::DisposeData() LockDirect(); if (dw_init_status & DW_STATUS_THREAD_STARTED) { - deamon_killer = true; - // Release this sem, otherwise the Direct deamon thread + daemon_killer = true; + // Release this sem, otherwise the Direct daemon thread // will wait forever on it release_sem(disable_sem); status_t retVal; - wait_for_thread(direct_deamon_id, &retVal); + wait_for_thread(direct_daemon_id, &retVal); } #if DW_NEEDS_LOCKING diff --git a/src/tests/kits/interface/NewRegion/DirectWindow.cpp b/src/tests/kits/interface/NewRegion/DirectWindow.cpp index 5c4eb4d118..bd7a0a7404 100644 --- a/src/tests/kits/interface/NewRegion/DirectWindow.cpp +++ b/src/tests/kits/interface/NewRegion/DirectWindow.cpp @@ -18,7 +18,7 @@ #include -// We don't need this kind of locking, since the directDeamonFunc +// We don't need this kind of locking, since the directDaemonFunc // doesn't access critical shared data. #define DW_NEEDS_LOCKING 0 @@ -301,11 +301,11 @@ BDirectWindow::SupportsWindowMode(screen_id id) int32 -BDirectWindow::DirectDeamonFunc(void *arg) +BDirectWindow::DirectDaemonFunc(void *arg) { BDirectWindow *object = static_cast(arg); - while (!object->deamon_killer) { + while (!object->daemon_killer) { // This sem is released by the app_server when our // clipping region changes, or when our window is moved, // resized, etc. etc. @@ -347,7 +347,7 @@ BDirectWindow::DirectDeamonFunc(void *arg) // I implemented them anyway, as they were the first methods I wrote // in this class (As you can see, I even needed to cast away their constness // to make them do something useful). -// They're not needed though, as the direct_deamon_thread doesn't change +// They're not needed though, as the direct_daemon_thread doesn't change // any shared data. They are probably here for future enhancements (see also the // comment in DriverSetup() bool @@ -440,15 +440,15 @@ BDirectWindow::InitData() if (cloned_clipping_area > 0) { dw_init_status |= DW_STATUS_AREA_CLONED; - direct_deamon_id = spawn_thread(DirectDeamonFunc, "direct deamon", + direct_daemon_id = spawn_thread(DirectDaemonFunc, "direct daemon", B_DISPLAY_PRIORITY, this); - if (direct_deamon_id > 0) { - deamon_killer = false; - if (resume_thread(direct_deamon_id) == B_OK) + if (direct_daemon_id > 0) { + daemon_killer = false; + if (resume_thread(direct_daemon_id) == B_OK) dw_init_status |= DW_STATUS_THREAD_STARTED; else - kill_thread(direct_deamon_id); + kill_thread(direct_daemon_id); } } } @@ -466,12 +466,12 @@ BDirectWindow::DisposeData() LockDirect(); if (dw_init_status & DW_STATUS_THREAD_STARTED) { - deamon_killer = true; - // Release this sem, otherwise the Direct deamon thread + daemon_killer = true; + // Release this sem, otherwise the Direct daemon thread // will wait forever on it release_sem(disable_sem); status_t retVal; - wait_for_thread(direct_deamon_id, &retVal); + wait_for_thread(direct_daemon_id, &retVal); } #if DW_NEEDS_LOCKING