summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhuangh <huangh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2013-04-19 14:41:18 +0000
committerhuangh <huangh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2013-04-19 14:41:18 +0000
commit8115e3398f5ae8442509046d3284e529fcaf9c0a (patch)
tree625b6431e898e3595b58ed204844e91fdadb7ec0
parent272cd33777bc2db0f0e679b83d1c35a3b1c29151 (diff)
downloadATCD-8115e3398f5ae8442509046d3284e529fcaf9c0a.tar.gz
Fri Apr 19 14:39:41 UTC 2013 Huang-Ming Huang <huangh@ociweb.com>
-rw-r--r--ACE/ChangeLog7
-rw-r--r--ACE/ace/Log_Category.cpp4
-rw-r--r--ACE/ace/Log_Record.cpp3
3 files changed, 12 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index cf22964ad87..b6c49c371db 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,10 @@
+Fri Apr 19 14:39:41 UTC 2013 Huang-Ming Huang <huangh@ociweb.com>
+
+ * ace/Log_Category.cpp:
+ * ace/Log_Record.cpp:
+
+ Fixed Coverity warnings.
+
Fri Apr 19 12:02:36 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* contrib/minizip/unzip.c:
diff --git a/ACE/ace/Log_Category.cpp b/ACE/ace/Log_Category.cpp
index b0c286a894a..5c26db40f92 100644
--- a/ACE/ace/Log_Category.cpp
+++ b/ACE/ace/Log_Category.cpp
@@ -38,7 +38,9 @@ ACE_Log_Category::ACE_Log_Category(const char* name)
| LM_CRITICAL
| LM_ALERT
| LM_EMERGENCY)
-#if !defined (ACE_HAS_THREADS)
+#if defined (ACE_HAS_THREADS)
+ , key_(ACE_OS::NULL_key)
+#else
, per_thr_obj_(this, 0)
#endif
{
diff --git a/ACE/ace/Log_Record.cpp b/ACE/ace/Log_Record.cpp
index 14c25faf4d4..37501bb1749 100644
--- a/ACE/ace/Log_Record.cpp
+++ b/ACE/ace/Log_Record.cpp
@@ -200,7 +200,8 @@ ACE_Log_Record::ACE_Log_Record (void)
usecs_ (0),
pid_ (0),
msg_data_ (0),
- msg_data_size_ (0)
+ msg_data_size_ (0),
+ category_(0)
{
// ACE_TRACE ("ACE_Log_Record::ACE_Log_Record");
ACE_NEW_NORETURN (this->msg_data_, ACE_TCHAR[MAXLOGMSGLEN]);