From 2b10280985738c74efa2aa0fb956a837c69acee6 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Tue, 2 Aug 2016 15:13:56 +0100 Subject: [PATCH] Added missing newline chars to logging commands Change-Id: Iabec9a41aaead0f8fac0b0ec8c93cb2a80b54be7 --- dali/devel-api/threading/conditional-wait.cpp | 16 ++++++++-------- dali/devel-api/threading/mutex.cpp | 4 ++-- dali/internal/common/core-impl.cpp | 2 +- dali/internal/common/mutex-impl.cpp | 4 ++-- dali/internal/event/actors/image-actor-impl.cpp | 8 ++++---- dali/internal/event/animation/constraint-base.cpp | 2 +- dali/internal/event/common/stage-impl.cpp | 4 ++-- dali/internal/event/common/type-info-impl.cpp | 4 ++-- dali/internal/event/rendering/texture-impl.cpp | 10 +++++----- dali/internal/event/rendering/texture-set-impl.cpp | 10 +++++----- dali/internal/event/resources/archive.cpp | 2 +- dali/internal/event/resources/resource-client.cpp | 2 +- dali/internal/render/gl-resources/bitmap-texture.cpp | 4 ++-- .../render/gl-resources/compressed-bitmap-texture.cpp | 2 +- .../render/gl-resources/frame-buffer-texture.cpp | 2 +- dali/internal/render/gl-resources/native-texture.cpp | 2 +- dali/internal/render/renderers/render-renderer.cpp | 2 +- dali/internal/update/manager/update-manager-debug.cpp | 4 ++-- dali/internal/update/render-tasks/scene-graph-camera.cpp | 4 ++-- dali/public-api/object/ref-object.cpp | 2 +- dali/public-api/signals/base-signal.cpp | 2 +- 21 files changed, 46 insertions(+), 46 deletions(-) diff --git a/dali/devel-api/threading/conditional-wait.cpp b/dali/devel-api/threading/conditional-wait.cpp index 4a1ed8b..adc5760 100644 --- a/dali/devel-api/threading/conditional-wait.cpp +++ b/dali/devel-api/threading/conditional-wait.cpp @@ -52,11 +52,11 @@ ConditionalWait::ConditionalWait() { if( pthread_mutex_init( &mImpl->mutex, NULL ) ) { - DALI_LOG_ERROR( "Unable to initialise mutex in ConditionalWait" ); + DALI_LOG_ERROR( "Unable to initialise mutex in ConditionalWait\n" ); } if( pthread_cond_init( &mImpl->condition, NULL ) ) { - DALI_LOG_ERROR( "Unable to initialise conditional" ); + DALI_LOG_ERROR( "Unable to initialise conditional\n" ); } mImpl->count = 0; } @@ -65,11 +65,11 @@ ConditionalWait::~ConditionalWait() { if( pthread_cond_destroy( &mImpl->condition ) ) { - DALI_LOG_ERROR( "Unable to destroy conditional" ); + DALI_LOG_ERROR( "Unable to destroy conditional\n" ); } if( pthread_mutex_destroy( &mImpl->mutex ) ) { - DALI_LOG_ERROR( "Unable to destroy mutex in ConditionalWait" ); + DALI_LOG_ERROR( "Unable to destroy mutex in ConditionalWait\n" ); } delete mImpl; } @@ -86,7 +86,7 @@ void ConditionalWait::Notify() { if( pthread_cond_broadcast( &mImpl->condition ) ) { - DALI_LOG_ERROR( "Error calling pthread_cond_broadcast" ); + DALI_LOG_ERROR( "Error calling pthread_cond_broadcast\n" ); } } Internal::Mutex::Unlock( &mImpl->mutex ); @@ -105,7 +105,7 @@ void ConditionalWait::Notify( const ScopedLock& scope ) { if( pthread_cond_broadcast( &mImpl->condition ) ) { - DALI_LOG_ERROR( "Error calling pthread_cond_broadcast" ); + DALI_LOG_ERROR( "Error calling pthread_cond_broadcast\n" ); } } } @@ -121,7 +121,7 @@ void ConditionalWait::Wait() // wait while condition changes if( pthread_cond_wait( &mImpl->condition, &mImpl->mutex ) ) // releases the lock whilst waiting { - DALI_LOG_ERROR( "Error calling pthread_cond_wait" ); + DALI_LOG_ERROR( "Error calling pthread_cond_wait\n" ); break; } } @@ -144,7 +144,7 @@ void ConditionalWait::Wait( const ScopedLock& scope ) // wait while condition changes if( pthread_cond_wait( &mImpl->condition, &mImpl->mutex ) ) // releases the lock whilst waiting { - DALI_LOG_ERROR( "Error calling pthread_cond_wait" ); + DALI_LOG_ERROR( "Error calling pthread_cond_wait\n" ); break; } } diff --git a/dali/devel-api/threading/mutex.cpp b/dali/devel-api/threading/mutex.cpp index fdb9cde..4e0cb30 100644 --- a/dali/devel-api/threading/mutex.cpp +++ b/dali/devel-api/threading/mutex.cpp @@ -39,7 +39,7 @@ Mutex::Mutex() { if( pthread_mutex_init( &mImpl->mutex, NULL ) ) { - DALI_LOG_ERROR( "Unable to initialise Mutex" ); + DALI_LOG_ERROR( "Unable to initialise Mutex\n" ); } mImpl->locked = false; } @@ -48,7 +48,7 @@ Mutex::~Mutex() { if( pthread_mutex_destroy( &mImpl->mutex ) ) { - DALI_LOG_ERROR( "Unable to destroy Mutex" ); + DALI_LOG_ERROR( "Unable to destroy Mutex\n" ); } // nothing else to do as there is no Lock/Unlock API // ScopedLock destructor will always unlock the mutex diff --git a/dali/internal/common/core-impl.cpp b/dali/internal/common/core-impl.cpp index c9ca158..313fa72 100644 --- a/dali/internal/common/core-impl.cpp +++ b/dali/internal/common/core-impl.cpp @@ -313,7 +313,7 @@ void Core::ProcessEvents() // Guard against calls to ProcessEvents() during ProcessEvents() if( mProcessingEvent ) { - DALI_LOG_ERROR( "ProcessEvents should not be called from within ProcessEvents!" ); + DALI_LOG_ERROR( "ProcessEvents should not be called from within ProcessEvents!\n" ); mRenderController.RequestProcessEventsOnIdle(); return; } diff --git a/dali/internal/common/mutex-impl.cpp b/dali/internal/common/mutex-impl.cpp index c046dc3..06d1ddf 100644 --- a/dali/internal/common/mutex-impl.cpp +++ b/dali/internal/common/mutex-impl.cpp @@ -109,7 +109,7 @@ void Lock( pthread_mutex_t* mutex ) if( pthread_mutex_lock( mutex ) ) { - DALI_LOG_ERROR( "Error calling pthread_mutex_lock" ); + DALI_LOG_ERROR( "Error calling pthread_mutex_lock\n" ); } } @@ -117,7 +117,7 @@ void Unlock( pthread_mutex_t* mutex ) { if( pthread_mutex_unlock( mutex ) ) { - DALI_LOG_ERROR( "Error calling pthread_mutex_unlock" ); + DALI_LOG_ERROR( "Error calling pthread_mutex_unlock\n" ); } --gThreadLockCount; } diff --git a/dali/internal/event/actors/image-actor-impl.cpp b/dali/internal/event/actors/image-actor-impl.cpp index 93d1ab4..92016de 100644 --- a/dali/internal/event/actors/image-actor-impl.cpp +++ b/dali/internal/event/actors/image-actor-impl.cpp @@ -271,25 +271,25 @@ void ImageActor::ClearPixelArea() void ImageActor::SetStyle( Dali::ImageActor::Style style ) { - DALI_LOG_WARNING( "SetStyle Deprecated. Only STYLE_QUAD supported." ); + DALI_LOG_WARNING( "SetStyle Deprecated. Only STYLE_QUAD supported.\n" ); mStyle = style; } Dali::ImageActor::Style ImageActor::GetStyle() const { - DALI_LOG_WARNING( "GetStyle Deprecated. Only STYLE_QUAD supported." ); + DALI_LOG_WARNING( "GetStyle Deprecated. Only STYLE_QUAD supported.\n" ); return mStyle; } void ImageActor::SetNinePatchBorder( const Vector4& border ) { - DALI_LOG_WARNING( "SetNinePatchBorder Deprecated. Only STYLE_QUAD supported." ); + DALI_LOG_WARNING( "SetNinePatchBorder Deprecated. Only STYLE_QUAD supported.\n" ); mNinePatchBorder = border; } Vector4 ImageActor::GetNinePatchBorder() const { - DALI_LOG_WARNING( "GetNinePatchBorder Deprecated. Only STYLE_QUAD supported." ); + DALI_LOG_WARNING( "GetNinePatchBorder Deprecated. Only STYLE_QUAD supported.\n" ); return mNinePatchBorder; } diff --git a/dali/internal/event/animation/constraint-base.cpp b/dali/internal/event/animation/constraint-base.cpp index f781543..c702014 100644 --- a/dali/internal/event/animation/constraint-base.cpp +++ b/dali/internal/event/animation/constraint-base.cpp @@ -71,7 +71,7 @@ void ConstraintBase::AddSource( Source source ) } else { - DALI_LOG_ERROR( "Constraint source object not found" ); + DALI_LOG_ERROR( "Constraint source object not found\n" ); } } } diff --git a/dali/internal/event/common/stage-impl.cpp b/dali/internal/event/common/stage-impl.cpp index fe95c3e..aea8308 100644 --- a/dali/internal/event/common/stage-impl.cpp +++ b/dali/internal/event/common/stage-impl.cpp @@ -412,7 +412,7 @@ void Stage::SetStereoBase( float stereoBase ) { if( ! Equals( mStereoBase, stereoBase ) ) { - DALI_LOG_INFO( Debug::Filter::gActor, Debug::Concise, "old( %.2f) new(%.2f)", mStereoBase, stereoBase ); + DALI_LOG_INFO( Debug::Filter::gActor, Debug::Concise, "old( %.2f) new(%.2f)\n", mStereoBase, stereoBase ); mStereoBase = stereoBase; switch( mViewMode ) @@ -572,7 +572,7 @@ Dali::Stage::EventProcessingFinishedSignalType& Stage::EventProcessingFinishedSi Dali::Stage::TouchedSignalType& Stage::TouchedSignal() { - DALI_LOG_WARNING( "Deprecated. Use TouchSignal() instead." ); + DALI_LOG_WARNING( "Deprecated. Use TouchSignal() instead.\n" ); return mTouchedSignal; } diff --git a/dali/internal/event/common/type-info-impl.cpp b/dali/internal/event/common/type-info-impl.cpp index b0809a7..479f2e8 100644 --- a/dali/internal/event/common/type-info-impl.cpp +++ b/dali/internal/event/common/type-info-impl.cpp @@ -349,7 +349,7 @@ void TypeInfo::AddActionFunction( const std::string &actionName, Dali::TypeInfo: } else { - DALI_LOG_WARNING("Action already exists in TypeRegistry Type", actionName.c_str()); + DALI_LOG_WARNING("Action already exists in TypeRegistry Type\n", actionName.c_str()); } } } @@ -371,7 +371,7 @@ void TypeInfo::AddConnectorFunction( const std::string& signalName, Dali::TypeIn } else { - DALI_LOG_WARNING("Signal name already exists in TypeRegistry Type for signal connector function", signalName.c_str()); + DALI_LOG_WARNING("Signal name already exists in TypeRegistry Type for signal connector function\n", signalName.c_str()); } } } diff --git a/dali/internal/event/rendering/texture-impl.cpp b/dali/internal/event/rendering/texture-impl.cpp index 704ab40..c0f658c 100644 --- a/dali/internal/event/rendering/texture-impl.cpp +++ b/dali/internal/event/rendering/texture-impl.cpp @@ -108,14 +108,14 @@ bool NewTexture::Upload( PixelDataPtr pixelData, { if( mNativeImage ) { - DALI_LOG_ERROR( "OpenGL ES does not support uploading data to native texture"); + DALI_LOG_ERROR( "OpenGL ES does not support uploading data to native texture\n"); } else { unsigned int pixelDataSize = pixelData->GetWidth()*pixelData->GetHeight(); if( pixelData->GetBuffer() == NULL || pixelDataSize == 0 ) { - DALI_LOG_ERROR( "PixelData is empty"); + DALI_LOG_ERROR( "PixelData is empty\n"); } else { @@ -124,12 +124,12 @@ bool NewTexture::Upload( PixelDataPtr pixelData, { if( pixelDataSize < width * height ) { - DALI_LOG_ERROR( "PixelData of an incorrect size when trying to update texture"); + DALI_LOG_ERROR( "PixelData of an incorrect size when trying to update texture\n"); } else if( ( xOffset + width > ( mWidth / (1< ( mHeight / (1<GlExtensionCreate() ) { - DALI_LOG_ERROR( "Error creating native image!" ); + DALI_LOG_ERROR( "Error creating native image!\n" ); return false; } diff --git a/dali/internal/render/gl-resources/native-texture.cpp b/dali/internal/render/gl-resources/native-texture.cpp index 43a5db1..8110880 100644 --- a/dali/internal/render/gl-resources/native-texture.cpp +++ b/dali/internal/render/gl-resources/native-texture.cpp @@ -104,7 +104,7 @@ bool NativeTexture::CreateGlTexture() } else { - DALI_LOG_ERROR( "Error creating native image!" ); + DALI_LOG_ERROR( "Error creating native image!\n" ); } return mId != 0; diff --git a/dali/internal/render/renderers/render-renderer.cpp b/dali/internal/render/renderers/render-renderer.cpp index 01c03e3..cbad8bb 100644 --- a/dali/internal/render/renderers/render-renderer.cpp +++ b/dali/internal/render/renderers/render-renderer.cpp @@ -593,7 +593,7 @@ void Renderer::Render( Context& context, DALI_ASSERT_DEBUG( program && "Default shader should always have a program available." ); if( !program ) { - DALI_LOG_ERROR( "Failed to get program for shader at address %p.", (void*)&mRenderDataProvider->GetShader() ); + DALI_LOG_ERROR( "Failed to get program for shader at address %p.\n", (void*)&mRenderDataProvider->GetShader() ); return; } } diff --git a/dali/internal/update/manager/update-manager-debug.cpp b/dali/internal/update/manager/update-manager-debug.cpp index 1c21fe4..c5f6159 100644 --- a/dali/internal/update/manager/update-manager-debug.cpp +++ b/dali/internal/update/manager/update-manager-debug.cpp @@ -73,7 +73,7 @@ void PrintNodes( const Node& node, BufferIndex updateBufferIndex, int level ) << " Scale (" << scale.x << ", " << scale.y << ", " << scale.z << ")" << std::endl; - DALI_LOG_INFO(gNodeLogFilter, Debug::Verbose, "%s", oss.str().c_str()); + DALI_LOG_INFO(gNodeLogFilter, Debug::Verbose, "%s\n", oss.str().c_str()); } { @@ -85,7 +85,7 @@ void PrintNodes( const Node& node, BufferIndex updateBufferIndex, int level ) << std::setw(level*2) << std::setfill(' ') << ""; std::string trafoMatrix = Debug::MatrixToString(node.GetWorldMatrix(updateBufferIndex), 2, level*2); - DALI_LOG_INFO(gNodeLogFilter, Debug::Verbose, "%s", trafoMatrix.c_str()); + DALI_LOG_INFO(gNodeLogFilter, Debug::Verbose, "%s\n", trafoMatrix.c_str()); } ++level; diff --git a/dali/internal/update/render-tasks/scene-graph-camera.cpp b/dali/internal/update/render-tasks/scene-graph-camera.cpp index 158ed37..c9e4b7a 100644 --- a/dali/internal/update/render-tasks/scene-graph-camera.cpp +++ b/dali/internal/update/render-tasks/scene-graph-camera.cpp @@ -65,7 +65,7 @@ void Frustum(Matrix& result, float left, float right, float bottom, float top, f float deltaZ = far - near; if ((near <= 0.0f) || (far <= 0.0f) || Equals(right, left) || Equals(bottom, top) || (deltaZ <= 0.0f)) { - DALI_LOG_ERROR("Invalid parameters passed into Frustum!"); + DALI_LOG_ERROR("Invalid parameters passed into Frustum!\n"); DALI_ASSERT_DEBUG("Invalid parameters passed into Frustum!"); return; } @@ -104,7 +104,7 @@ void Orthographic(Matrix& result, float left, float right, float bottom, float t { if ( Equals(right, left) || Equals(top, bottom) || Equals(far, near) ) { - DALI_LOG_ERROR( "Cannot create orthographic projection matrix with a zero dimension." ); + DALI_LOG_ERROR( "Cannot create orthographic projection matrix with a zero dimension.\n" ); DALI_ASSERT_DEBUG( "Cannot create orthographic projection matrix with a zero dimension." ); return; } diff --git a/dali/public-api/object/ref-object.cpp b/dali/public-api/object/ref-object.cpp index 5805e36..3060f4b 100644 --- a/dali/public-api/object/ref-object.cpp +++ b/dali/public-api/object/ref-object.cpp @@ -42,7 +42,7 @@ RefObject::~RefObject() #ifdef ENABLE_DEBUG if(mCount) { - DALI_LOG_ERROR("mCount should be zero, deleting referenced object!"); + DALI_LOG_ERROR("mCount should be zero, deleting referenced object!\n"); } #endif // ENABLE_DEBUG } diff --git a/dali/public-api/signals/base-signal.cpp b/dali/public-api/signals/base-signal.cpp index 6150994..8d759e7 100644 --- a/dali/public-api/signals/base-signal.cpp +++ b/dali/public-api/signals/base-signal.cpp @@ -314,7 +314,7 @@ BaseSignal::EmitGuard::EmitGuard( bool& flag ) else { // mFlag is NULL when Emit() is called during Emit() - DALI_LOG_ERROR( "Cannot call Emit() from inside Emit()" ); + DALI_LOG_ERROR( "Cannot call Emit() from inside Emit()\n" ); } } -- 2.7.4