[SVN-NetXMS] revision 3352

* { font-family: Consolas, Lucida Console, Courier New; font-size: 100%; }
h1 { font-size: 150%; }
td.linenos { background-color: #f0f0f0; padding-right: 10px; }
span.lineno { background-color: #f0f0f0; padding: 0 5px 0 5px; }
pre { line-height: 100%; width: 100%; }
.highlight span { width: 100%; display:-moz-inline-stack; display:inline-block; zoom:1; *display:inline; }
body { background: #ffffff; }
body .c { color: #999988; font-style: italic } /* Comment */
body .err { color: #a61717; background-color: #e3d2d2 } /* Error */
body .k { font-weight: bold } /* Keyword */
body .o { font-weight: bold } /* Operator */
body .cm { color: #999988; font-style: italic } /* Comment.Multiline */
body .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
body .c1 { color: #999988; font-style: italic } /* Comment.Single */
body .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
body .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
body .ge { font-style: italic } /* Generic.Emph */
body .gr { color: #aa0000 } /* Generic.Error */
body .gh { color: #999999 } /* Generic.Heading */
body .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
body .go { color: #888888 } /* Generic.Output */
body .gp { color: #555555 } /* Generic.Prompt */
body .gs { font-weight: bold } /* Generic.Strong */
body .gu { color: #aaaaaa } /* Generic.Subheading */
body .gt { color: #aa0000 } /* Generic.Traceback */
body .kc { font-weight: bold } /* Keyword.Constant */
body .kd { font-weight: bold } /* Keyword.Declaration */
body .kp { font-weight: bold } /* Keyword.Pseudo */
body .kr { font-weight: bold } /* Keyword.Reserved */
body .kt { color: #445588; font-weight: bold } /* Keyword.Type */
body .m { color: #009999 } /* Literal.Number */
body .s { color: #bb8844 } /* Literal.String */
body .na { color: #008080 } /* Name.Attribute */
body .nb { color: #999999 } /* Name.Builtin */
body .nc { color: #445588; font-weight: bold } /* Name.Class */
body .no { color: #008080 } /* Name.Constant */
body .ni { color: #800080 } /* Name.Entity */
body .ne { color: #990000; font-weight: bold } /* Name.Exception */
body .nf { color: #990000; font-weight: bold } /* Name.Function */
body .nn { color: #555555 } /* Name.Namespace */
body .nt { color: #000080 } /* Name.Tag */
body .nv { color: #008080 } /* Name.Variable */
body .ow { font-weight: bold } /* Operator.Word */
body .w { color: #bbbbbb } /* Text.Whitespace */
body .mf { color: #009999 } /* Literal.Number.Float */
body .mh { color: #009999 } /* Literal.Number.Hex */
body .mi { color: #009999 } /* Literal.Number.Integer */
body .mo { color: #009999 } /* Literal.Number.Oct */
body .sb { color: #bb8844 } /* Literal.String.Backtick */
body .sc { color: #bb8844 } /* Literal.String.Char */
body .sd { color: #bb8844 } /* Literal.String.Doc */
body .s2 { color: #bb8844 } /* Literal.String.Double */
body .se { color: #bb8844 } /* Literal.String.Escape */
body .sh { color: #bb8844 } /* Literal.String.Heredoc */
body .si { color: #bb8844 } /* Literal.String.Interpol */
body .sx { color: #bb8844 } /* Literal.String.Other */
body .sr { color: #808000 } /* Literal.String.Regex */
body .s1 { color: #bb8844 } /* Literal.String.Single */
body .ss { color: #bb8844 } /* Literal.String.Symbol */
body .bp { color: #999999 } /* Name.Builtin.Pseudo */
body .vc { color: #008080 } /* Name.Variable.Class */
body .vg { color: #008080 } /* Name.Variable.Global */
body .vi { color: #008080 } /* Name.Variable.Instance */
body .il { color: #009999 } /* Literal.Number.Integer.Long */

Info

Revision:3352
Author:victor

Date:2008-06-29 14:46:30 +0300 (Sun, 29 Jun 2008)

Comment:Variables VID_COMMENT and VID_COMMENTS merged to VID_COMMENTS to avoid possible typo-based bugs

Changes
U trunk/include/nms_cscp.h
U trunk/src/libnxcl/epp.cpp
U trunk/src/libnxcl/objects.cpp
U trunk/src/server/core/epp.cpp
U trunk/src/server/core/netobj.cpp
U trunk/src/server/core/session.cpp

Diff
Modified: trunk/include/nms_cscp.h
===================================================================
--- trunk/include/nms_cscp.h 2008-06-28 12:43:19 UTC (rev 3351)
+++ trunk/include/nms_cscp.h 2008-06-29 11:46:30 UTC (rev 3352)
@@ -527,7 +527,7 @@
 #define VID_MIB_NAME ((DWORD)59)
 #define VID_MIB_FILE_SIZE ((DWORD)60)
 #define VID_MIB_FILE ((DWORD)61)
-#define VID_COMMENT ((DWORD)62)
+//#define VID_COMMENT ((DWORD)62)
 #define VID_ALARM_SEVERITY ((DWORD)63)
 #define VID_ALARM_KEY ((DWORD)64)
 #define VID_ALARM_TIMEOUT ((DWORD)65)

Modified: trunk/src/libnxcl/epp.cpp
===================================================================
--- trunk/src/libnxcl/epp.cpp 2008-06-28 12:43:19 UTC (rev 3351)
+++ trunk/src/libnxcl/epp.cpp 2008-06-29 11:46:30 UTC (rev 3352)
@@ -85,7 +85,7 @@
             {
                (*ppEventPolicy)->pRuleList[i].dwFlags = pResponse->GetVariableLong(VID_FLAGS);
                (*ppEventPolicy)->pRuleList[i].dwId = pResponse->GetVariableLong(VID_RULE_ID);
- (*ppEventPolicy)->pRuleList[i].pszComment = pResponse->GetVariableStr(VID_COMMENT);
+ (*ppEventPolicy)->pRuleList[i].pszComment = pResponse->GetVariableStr(VID_COMMENTS);
                (*ppEventPolicy)->pRuleList[i].pszScript = pResponse->GetVariableStr(VID_SCRIPT);
 
                (*ppEventPolicy)->pRuleList[i].dwNumActions =
@@ -213,7 +213,7 @@
 
          msg.SetVariable(VID_FLAGS, pEventPolicy->pRuleList[i].dwFlags);
          msg.SetVariable(VID_RULE_ID, pEventPolicy->pRuleList[i].dwId);
- msg.SetVariable(VID_COMMENT, (TCHAR *)CHECK_NULL_EX(pEventPolicy->pRuleList[i].pszComment));
+ msg.SetVariable(VID_COMMENTS, (TCHAR *)CHECK_NULL_EX(pEventPolicy->pRuleList[i].pszComment));
          msg.SetVariable(VID_SCRIPT, (TCHAR *)CHECK_NULL_EX(pEventPolicy->pRuleList[i].pszScript));
          msg.SetVariable(VID_NUM_ACTIONS, pEventPolicy->pRuleList[i].dwNumActions);
          msg.SetVariableToInt32Array(VID_RULE_ACTIONS,

Modified: trunk/src/libnxcl/objects.cpp
===================================================================
--- trunk/src/libnxcl/objects.cpp 2008-06-28 12:43:19 UTC (rev 3351)
+++ trunk/src/libnxcl/objects.cpp 2008-06-29 11:46:30 UTC (rev 3352)
@@ -1661,7 +1661,7 @@
    {
       dwResult = pResponse->GetVariableLong(VID_RCC);
       if (dwResult == RCC_SUCCESS)
- *ppszText = pResponse->GetVariableStr(VID_COMMENT);
+ *ppszText = pResponse->GetVariableStr(VID_COMMENTS);
    }
    else
    {
@@ -1686,7 +1686,7 @@
    msg.SetCode(CMD_UPDATE_OBJECT_COMMENTS);
    msg.SetId(dwRqId);
    msg.SetVariable(VID_OBJECT_ID, dwObjectId);
- msg.SetVariable(VID_COMMENT, pszText);
+ msg.SetVariable(VID_COMMENTS, pszText);
    ((NXCL_Session *)hSession)->SendMsg(&msg);
    return ((NXCL_Session *)hSession)->WaitForRCC(dwRqId);
 }

Modified: trunk/src/server/core/epp.cpp
===================================================================
--- trunk/src/server/core/epp.cpp 2008-06-28 12:43:19 UTC (rev 3351)
+++ trunk/src/server/core/epp.cpp 2008-06-29 11:46:30 UTC (rev 3352)
@@ -114,7 +114,7 @@
         
    m_dwFlags = pMsg->GetVariableLong(VID_FLAGS);
    m_dwId = pMsg->GetVariableLong(VID_RULE_ID);
- m_pszComment = pMsg->GetVariableStr(VID_COMMENT);
+ m_pszComment = pMsg->GetVariableStr(VID_COMMENTS);
 
    m_dwNumActions = pMsg->GetVariableLong(VID_NUM_ACTIONS);
    m_pdwActionList = (DWORD *)malloc(sizeof(DWORD) * m_dwNumActions);
@@ -608,7 +608,7 @@
    pMsg->SetVariable(VID_ALARM_MESSAGE, m_szAlarmMessage);
    pMsg->SetVariable(VID_ALARM_TIMEOUT, m_dwAlarmTimeout);
    pMsg->SetVariable(VID_ALARM_TIMEOUT_EVENT, m_dwAlarmTimeoutEvent);
- pMsg->SetVariable(VID_COMMENT, CHECK_NULL_EX(m_pszComment));
+ pMsg->SetVariable(VID_COMMENTS, CHECK_NULL_EX(m_pszComment));
    pMsg->SetVariable(VID_NUM_ACTIONS, m_dwNumActions);
    pMsg->SetVariableToInt32Array(VID_RULE_ACTIONS, m_dwNumActions, m_pdwActionList);
    pMsg->SetVariable(VID_NUM_EVENTS, m_dwNumEvents);

Modified: trunk/src/server/core/netobj.cpp
===================================================================
--- trunk/src/server/core/netobj.cpp 2008-06-28 12:43:19 UTC (rev 3351)
+++ trunk/src/server/core/netobj.cpp 2008-06-29 11:46:30 UTC (rev 3352)
@@ -1231,7 +1231,7 @@
 void NetObj::CommentsToMessage(CSCPMessage *pMsg)
 {
    LockData();
- pMsg->SetVariable(VID_COMMENT, CHECK_NULL_EX(m_pszComments));
+ pMsg->SetVariable(VID_COMMENTS, CHECK_NULL_EX(m_pszComments));
    UnlockData();
 }
 

Modified: trunk/src/server/core/session.cpp
===================================================================
--- trunk/src/server/core/session.cpp 2008-06-28 12:43:19 UTC (rev 3351)
+++ trunk/src/server/core/session.cpp 2008-06-29 11:46:30 UTC (rev 3352)
@@ -8051,7 +8051,7 @@
    {
       if (pObject->CheckAccessRights(m_dwUserId, OBJECT_ACCESS_MODIFY))
       {
- pObject->SetComments(pRequest->GetVariableStr(VID_COMMENT));
+ pObject->SetComments(pRequest->GetVariableStr(VID_COMMENTS));
       }
       else
       {
Received on Sun Jun 29 2008 - 14:46:31 EEST