* { 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:3285
Author:victor
Date:2008-05-24 15:47:31 +0300 (Sat, 24 May 2008)
Comment:Fixed compilation issues in Windows caused by moving to const char * in parameter handlers
Changes
A trunk/netware.cmd
U trunk/netxms.dsw
U trunk/src/agent/core/exec.cpp
U trunk/src/agent/core/getparam.cpp
U trunk/src/agent/core/hddinfo.cpp
U trunk/src/agent/subagents/logscan/logscan.cpp
U trunk/src/agent/subagents/odbcquery/odbcquery.cpp
U trunk/src/agent/subagents/win9x/main.cpp
U trunk/src/agent/subagents/win9x/procinfo.cpp
U trunk/src/agent/subagents/winnt/main.cpp
U trunk/src/agent/subagents/winnt/net.cpp
U trunk/src/agent/subagents/winnt/procinfo.cpp
U trunk/src/agent/subagents/winnt/system.cpp
U trunk/src/agent/subagents/winperf/winperf.cpp
U trunk/src/agent/subagents/winperf/winperf.h
U trunk/src/agent/subagents/wmi/acpi.cpp
U trunk/src/agent/subagents/wmi/wmi.cpp
Diff
Added: trunk/netware.cmd
===================================================================
--- trunk/netware.cmd (rev 0)
+++ trunk/netware.cmd 2008-05-24 12:47:31 UTC (rev 3285)
@@ -0,0 +1,2 @@
+PATH=C:\gcc-nlm\usr\bin;C:\gcc-nlm\usr\i586-netware\bin;C:\gcc-nlm\usr\lib\gcc-lib\i586-netware\3.2.3;%PATH%
+cmd
Modified: trunk/netxms.dsw
===================================================================
--- trunk/netxms.dsw 2008-05-24 12:14:47 UTC (rev 3284)
+++ trunk/netxms.dsw 2008-05-24 12:47:31 UTC (rev 3285)
@@ -137,22 +137,13 @@
Begin Project Dependency
Project_Dep_Name libnetxms
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libnxsnmp
+ End Project Dependency
}}}
###############################################################################
-Project: "lld"=.\src\agent\subagents\lld\lld.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
Project: "logscan"=.\src\agent\subagents\logscan\logscan.dsp - Package Owner=<4>
Package=<5>
Modified: trunk/src/agent/core/exec.cpp
===================================================================
--- trunk/src/agent/core/exec.cpp 2008-05-24 12:14:47 UTC (rev 3284)
+++ trunk/src/agent/core/exec.cpp 2008-05-24 12:47:31 UTC (rev 3285)
@@ -336,6 +336,7 @@
SECURITY_ATTRIBUTES sa;
HANDLE hOutput;
DWORD dwBytes;
+ char *eptr;
// Create temporary file to hold process output
GetTempPath(MAX_PATH - 1, szBuffer);
@@ -368,9 +369,12 @@
// Read process output
ReadFile(hOutput, pValue, MAX_RESULT_LENGTH - 1, &dwBytes, NULL);
pValue[dwBytes] = 0;
- sptr = strchr(pValue, '\n');
- if (sptr != NULL)
- *sptr = 0;
+ eptr = strchr(pValue, '\r');
+ if (eptr != NULL)
+ *eptr = 0;
+ eptr = strchr(pValue, '\n');
+ if (eptr != NULL)
+ *eptr = 0;
iStatus = SYSINFO_RC_SUCCESS;
}
else
Modified: trunk/src/agent/core/getparam.cpp
===================================================================
--- trunk/src/agent/core/getparam.cpp 2008-05-24 12:14:47 UTC (rev 3284)
+++ trunk/src/agent/core/getparam.cpp 2008-05-24 12:47:31 UTC (rev 3285)
@@ -43,7 +43,7 @@
#ifdef _WIN32
LONG H_ArpCache(const char *cmd, const char *arg, NETXMS_VALUES_LIST *value);
LONG H_InterfaceList(const char *cmd, const char *arg, NETXMS_VALUES_LIST *value);
-LONG H_IPRoutingTable(char *pszCmd, char *pArg, NETXMS_VALUES_LIST *pValue);
+LONG H_IPRoutingTable(const char *cmd, const char *arg, NETXMS_VALUES_LIST *pValue);
LONG H_DiskInfo(const char *cmd, const char *arg, char *value);
LONG H_MemoryInfo(const char *cmd, const char *arg, char *value);
LONG H_HostName(const char *cmd, const char *arg, char *value);
Modified: trunk/src/agent/core/hddinfo.cpp
===================================================================
--- trunk/src/agent/core/hddinfo.cpp 2008-05-24 12:14:47 UTC (rev 3284)
+++ trunk/src/agent/core/hddinfo.cpp 2008-05-24 12:47:31 UTC (rev 3285)
@@ -1,6 +1,6 @@
/*
** NetXMS multiplatform core agent
-** Copyright (C) 2003, 2004 Victor Kirhenshtein
+** Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Victor Kirhenshtein
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
** along with this program; if not, write to the Free Software
** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
**
-** $module: hddinfo.cpp
+** File: hddinfo.cpp
**
**/
@@ -70,7 +70,7 @@
// Handler for PhysicalDisk.*
//
-LONG H_PhysicalDiskInfo(char *pszParam, char *pszArg, char *pValue)
+LONG H_PhysicalDiskInfo(const char *pszParam, const char *pszArg, char *pValue)
{
LONG nRet = SYSINFO_RC_ERROR, nDisk, nCmd;
char szBuffer[128], *eptr;
Modified: trunk/src/agent/subagents/logscan/logscan.cpp
===================================================================
--- trunk/src/agent/subagents/logscan/logscan.cpp 2008-05-24 12:14:47 UTC (rev 3284)
+++ trunk/src/agent/subagents/logscan/logscan.cpp 2008-05-24 12:47:31 UTC (rev 3285)
@@ -42,7 +42,7 @@
// Forward declarations
//
-LONG H_GetString(char *, char *, char *);
+LONG H_GetString(const char *, const char *, char *);
//
@@ -102,7 +102,7 @@
// main code
//
-LONG H_GetString(char *pszParam, char *pArg, char *pValue)
+LONG H_GetString(const char *pszParam, const char *pArg, char *pValue)
{
int ret = SYSINFO_RC_ERROR;
char fileName[1024];
Modified: trunk/src/agent/subagents/odbcquery/odbcquery.cpp
===================================================================
--- trunk/src/agent/subagents/odbcquery/odbcquery.cpp 2008-05-24 12:14:47 UTC (rev 3284)
+++ trunk/src/agent/subagents/odbcquery/odbcquery.cpp 2008-05-24 12:47:31 UTC (rev 3285)
@@ -114,7 +114,7 @@
// Handler for poller information
//
-static LONG H_PollResult(TCHAR *pszParam, char *pArg, TCHAR *pValue)
+static LONG H_PollResult(const TCHAR *pszParam, const TCHAR *pArg, TCHAR *pValue)
{
TCHAR szName[MAX_DB_STRING];
DWORD i;
Modified: trunk/src/agent/subagents/win9x/main.cpp
===================================================================
--- trunk/src/agent/subagents/win9x/main.cpp 2008-05-24 12:14:47 UTC (rev 3284)
+++ trunk/src/agent/subagents/win9x/main.cpp 2008-05-24 12:47:31 UTC (rev 3285)
@@ -27,10 +27,10 @@
// Externlals
//
-LONG H_ProcessList(char *pszCmd, char *pArg, NETXMS_VALUES_LIST *value);
-LONG H_ProcCount(char *pszCmd, char *pArg, char *pValue);
-LONG H_ProcCountSpecific(char *pszCmd, char *pArg, char *pValue);
-LONG H_ThreadCount(char *pszCmd, char *pArg, char *pValue);
+LONG H_ProcessList(const char *pszCmd, const char *pArg, NETXMS_VALUES_LIST *value);
+LONG H_ProcCount(const char *pszCmd, const char *pArg, char *pValue);
+LONG H_ProcCountSpecific(const char *pszCmd, const char *pArg, char *pValue);
+LONG H_ThreadCount(const char *pszCmd, const char *pArg, char *pValue);
//
Modified: trunk/src/agent/subagents/win9x/procinfo.cpp
===================================================================
--- trunk/src/agent/subagents/win9x/procinfo.cpp 2008-05-24 12:14:47 UTC (rev 3284)
+++ trunk/src/agent/subagents/win9x/procinfo.cpp 2008-05-24 12:47:31 UTC (rev 3285)
@@ -28,7 +28,7 @@
// Handler for System.ProcessCount
//
-LONG H_ProcCount(char *pszCmd, char *pArg, char *pValue)
+LONG H_ProcCount(const char *pszCmd, const char *pArg, char *pValue)
{
HANDLE hSnapshot;
PROCESSENTRY32 pe;
@@ -61,7 +61,7 @@
// Handler for Process.Count(*)
//
-LONG H_ProcCountSpecific(char *pszCmd, char *pArg, char *pValue)
+LONG H_ProcCountSpecific(const char *pszCmd, const char *pArg, char *pValue)
{
HANDLE hSnapshot;
PROCESSENTRY32 pe;
@@ -104,7 +104,7 @@
// Handler for System.ProcessList enum
//
-LONG H_ProcessList(char *pszCmd, char *pArg, NETXMS_VALUES_LIST *pValue)
+LONG H_ProcessList(const char *pszCmd, const char *pArg, NETXMS_VALUES_LIST *pValue)
{
HANDLE hSnapshot;
PROCESSENTRY32 pe;
@@ -143,7 +143,7 @@
// Handler for System.ThreadCount
//
-LONG H_ThreadCount(char *pszCmd, char *pArg, char *pValue)
+LONG H_ThreadCount(const char *pszCmd, const char *pArg, char *pValue)
{
HANDLE hSnapshot;
PROCESSENTRY32 pe;
Modified: trunk/src/agent/subagents/winnt/main.cpp
===================================================================
--- trunk/src/agent/subagents/winnt/main.cpp 2008-05-24 12:14:47 UTC (rev 3284)
+++ trunk/src/agent/subagents/winnt/main.cpp 2008-05-24 12:47:31 UTC (rev 3285)
@@ -27,15 +27,15 @@
// Externlals
//
-LONG H_ActiveUserSessions(char *cmd, char *arg, NETXMS_VALUES_LIST *value);
-LONG H_ConnectedUsers(char *pszCmd, char *pArg, char *pValue);
-LONG H_RemoteShareStatus(char *pszCmd, char *pArg, char *pValue);
-LONG H_ProcessList(char *cmd, char *arg, NETXMS_VALUES_LIST *value);
-LONG H_ProcCount(char *cmd, char *arg, char *value);
-LONG H_ProcCountSpecific(char *cmd, char *arg, char *value);
-LONG H_ProcInfo(char *cmd, char *arg, char *value);
-LONG H_ServiceState(char *cmd, char *arg, char *value);
-LONG H_ThreadCount(char *cmd, char *arg, char *value);
+LONG H_ActiveUserSessions(const char *cmd, const char *arg, NETXMS_VALUES_LIST *value);
+LONG H_ConnectedUsers(const char *pszCmd, const char *pArg, char *pValue);
+LONG H_RemoteShareStatus(const char *pszCmd, const char *pArg, char *pValue);
+LONG H_ProcessList(const char *cmd, const char *arg, NETXMS_VALUES_LIST *value);
+LONG H_ProcCount(const char *cmd, const char *arg, char *value);
+LONG H_ProcCountSpecific(const char *cmd, const char *arg, char *value);
+LONG H_ProcInfo(const char *cmd, const char *arg, char *value);
+LONG H_ServiceState(const char *cmd, const char *arg, char *value);
+LONG H_ThreadCount(const char *cmd, const char *arg, char *value);
//
Modified: trunk/src/agent/subagents/winnt/net.cpp
===================================================================
--- trunk/src/agent/subagents/winnt/net.cpp 2008-05-24 12:14:47 UTC (rev 3284)
+++ trunk/src/agent/subagents/winnt/net.cpp 2008-05-24 12:47:31 UTC (rev 3285)
@@ -30,7 +30,7 @@
// or: Net.RemoteShareStatusText(share,domain,login,password)
//
-LONG H_RemoteShareStatus(char *cmd, char *arg, char *value)
+LONG H_RemoteShareStatus(const char *cmd, const char *arg, char *value)
{
TCHAR share[MAX_PATH], domain[64], login[64], password[256];
#ifndef UNICODE
Modified: trunk/src/agent/subagents/winnt/procinfo.cpp
===================================================================
--- trunk/src/agent/subagents/winnt/procinfo.cpp 2008-05-24 12:14:47 UTC (rev 3284)
+++ trunk/src/agent/subagents/winnt/procinfo.cpp 2008-05-24 12:47:31 UTC (rev 3285)
@@ -310,7 +310,7 @@
// <window> - window title
//
-LONG H_ProcInfo(char *cmd, char *arg, char *value)
+LONG H_ProcInfo(const char *cmd, const char *arg, char *value)
{
char buffer[256], procName[MAX_PATH], cmdLine[MAX_PATH], windowTitle[MAX_PATH];
int attr, type, i, procCount, counter;
@@ -390,7 +390,7 @@
// Handler for System.ProcessCount
//
-LONG H_ProcCount(char *cmd, char *arg, char *value)
+LONG H_ProcCount(const char *cmd, const char *arg, char *value)
{
DWORD dwSize, *pdwProcList;
PERFORMANCE_INFORMATION pi;
@@ -418,7 +418,7 @@
// Handler for Process.Count(*) and Process.CountEx(*)
//
-LONG H_ProcCountSpecific(char *cmd, char *arg, char *value)
+LONG H_ProcCountSpecific(const char *cmd, const char *arg, char *value)
{
DWORD dwSize = 0, *pdwProcList;
int i, counter, procCount;
@@ -467,7 +467,7 @@
// Handler for System.ProcessList enum
//
-LONG H_ProcessList(char *cmd, char *arg, NETXMS_VALUES_LIST *value)
+LONG H_ProcessList(const char *cmd, const char *arg, NETXMS_VALUES_LIST *value)
{
DWORD i, dwSize, dwNumProc, *pdwProcList;
LONG iResult = SYSINFO_RC_SUCCESS;
Modified: trunk/src/agent/subagents/winnt/system.cpp
===================================================================
--- trunk/src/agent/subagents/winnt/system.cpp 2008-05-24 12:14:47 UTC (rev 3284)
+++ trunk/src/agent/subagents/winnt/system.cpp 2008-05-24 12:47:31 UTC (rev 3285)
@@ -28,7 +28,7 @@
// Handler for System.ServiceState parameter
//
-LONG H_ServiceState(char *cmd, char *arg, char *value)
+LONG H_ServiceState(const char *cmd, const char *arg, char *value)
{
SC_HANDLE hManager, hService;
TCHAR szServiceName[MAX_PATH];
@@ -80,7 +80,7 @@
// Handler for System.ThreadCount
//
-LONG H_ThreadCount(char *cmd, char *arg, char *value)
+LONG H_ThreadCount(const char *cmd, const char *arg, char *value)
{
PERFORMANCE_INFORMATION pi;
@@ -103,7 +103,7 @@
// Handler for System.ConnectedUsers parameter
//
-LONG H_ConnectedUsers(char *pszCmd, char *pArg, char *pValue)
+LONG H_ConnectedUsers(const char *pszCmd, const char *pArg, char *pValue)
{
LONG nRet;
WTS_SESSION_INFO *pSessionList;
@@ -136,7 +136,7 @@
// Handler for System.ActiveUserSessions enum
//
-LONG H_ActiveUserSessions(char *pszCmd, char *pArg, NETXMS_VALUES_LIST *pValue)
+LONG H_ActiveUserSessions(const char *pszCmd, const char *pArg, NETXMS_VALUES_LIST *pValue)
{
LONG nRet;
WTS_SESSION_INFO *pSessionList;
Modified: trunk/src/agent/subagents/winperf/winperf.cpp
===================================================================
--- trunk/src/agent/subagents/winperf/winperf.cpp 2008-05-24 12:14:47 UTC (rev 3284)
+++ trunk/src/agent/subagents/winperf/winperf.cpp 2008-05-24 12:47:31 UTC (rev 3285)
@@ -88,7 +88,7 @@
// Value of given performance counter
//
-static LONG H_PdhVersion(TCHAR *pszParam, TCHAR *pArg, TCHAR *pValue)
+static LONG H_PdhVersion(const TCHAR *pszParam, const TCHAR *pArg, TCHAR *pValue)
{
DWORD dwVersion;
@@ -103,7 +103,7 @@
// Value of CPU utilization counter
//
-static LONG H_CPUUsage(TCHAR *pszParam, TCHAR *pArg, TCHAR *pValue)
+static LONG H_CPUUsage(const TCHAR *pszParam, const TCHAR *pArg, TCHAR *pValue)
{
LONG nProcessor, nRet = SYSINFO_RC_SUCCESS;
TCHAR *pEnd, szBuffer[16];
@@ -148,7 +148,7 @@
// Value of given counter collected by one of the collector threads
//
-LONG H_CollectedCounterData(TCHAR *pszParam, TCHAR *pArg, TCHAR *pValue)
+LONG H_CollectedCounterData(const TCHAR *pszParam, const TCHAR *pArg, TCHAR *pValue)
{
switch(((WINPERF_COUNTER *)pArg)->wType)
{
@@ -170,7 +170,7 @@
// Value of given performance counter
//
-static LONG H_PdhCounterValue(TCHAR *pszParam, TCHAR *pArg, TCHAR *pValue)
+static LONG H_PdhCounterValue(const TCHAR *pszParam, const TCHAR *pArg, TCHAR *pValue)
{
HQUERY hQuery;
HCOUNTER hCounter;
@@ -259,7 +259,7 @@
// List of available performance objects
//
-static LONG H_PdhObjects(TCHAR *pszParam, TCHAR *pArg, NETXMS_VALUES_LIST *pValue)
+static LONG H_PdhObjects(const TCHAR *pszParam, const TCHAR *pArg, NETXMS_VALUES_LIST *pValue)
{
TCHAR *pszObject, *pszObjList, szHostName[256];
LONG iResult = SYSINFO_RC_ERROR;
@@ -292,7 +292,7 @@
// List of available performance items for given object
//
-static LONG H_PdhObjectItems(TCHAR *pszParam, TCHAR *pArg, NETXMS_VALUES_LIST *pValue)
+static LONG H_PdhObjectItems(const TCHAR *pszParam, const TCHAR *pArg, NETXMS_VALUES_LIST *pValue)
{
TCHAR *pszElement, *pszCounterList, *pszInstanceList, szHostName[256], szObject[256];
LONG iResult = SYSINFO_RC_ERROR;
@@ -339,7 +339,7 @@
// performance counter. Actually, it's an alias for PDH.CounterValue(xxx) parameter.
//
-static LONG H_CounterAlias(TCHAR *pszParam, TCHAR *pArg, TCHAR *pValue)
+static LONG H_CounterAlias(const TCHAR *pszParam, const TCHAR *pArg, TCHAR *pValue)
{
return H_PdhCounterValue(NULL, pArg, pValue);
}
@@ -407,7 +407,7 @@
// Add new parameter to list
//
-BOOL AddParameter(TCHAR *pszName, LONG (* fpHandler)(TCHAR *, TCHAR *, TCHAR *),
+BOOL AddParameter(TCHAR *pszName, LONG (* fpHandler)(const TCHAR *, const TCHAR *, TCHAR *),
TCHAR *pArg, int iDataType, TCHAR *pszDescription)
{
DWORD i;
Modified: trunk/src/agent/subagents/winperf/winperf.h
===================================================================
--- trunk/src/agent/subagents/winperf/winperf.h 2008-05-24 12:14:47 UTC (rev 3284)
+++ trunk/src/agent/subagents/winperf/winperf.h 2008-05-24 12:47:31 UTC (rev 3285)
@@ -106,9 +106,9 @@
void ReportPdhError(TCHAR *pszFunction, TCHAR *pszPdhCall, PDH_STATUS dwError);
WINPERF_COUNTER *AddCounter(TCHAR *pszName, int iClass, int iNumSamples, int iDataType);
BOOL AddCounterFromConfig(TCHAR *pszStr);
-BOOL AddParameter(TCHAR *pszName, LONG (* fpHandler)(TCHAR *, TCHAR *, TCHAR *),
+BOOL AddParameter(TCHAR *pszName, LONG (* fpHandler)(const TCHAR *, const TCHAR *, TCHAR *),
TCHAR *pArg, int iDataType, TCHAR *pszDescription);
-LONG H_CollectedCounterData(TCHAR *pszParam, TCHAR *pArg, TCHAR *pValue);
+LONG H_CollectedCounterData(const TCHAR *pszParam, const TCHAR *pArg, TCHAR *pValue);
//
Modified: trunk/src/agent/subagents/wmi/acpi.cpp
===================================================================
--- trunk/src/agent/subagents/wmi/acpi.cpp 2008-05-24 12:14:47 UTC (rev 3284)
+++ trunk/src/agent/subagents/wmi/acpi.cpp 2008-05-24 12:47:31 UTC (rev 3285)
@@ -27,7 +27,7 @@
// Handler for ACPI.ThermalZone.CurrentTemp(*)
//
-LONG H_ACPITZCurrTemp(char *cmd, char *arg, char *value)
+LONG H_ACPITZCurrTemp(const char *cmd, const char *arg, char *value)
{
WMI_QUERY_CONTEXT ctx;
IEnumWbemClassObject *pEnumObject = NULL;
@@ -84,7 +84,7 @@
// Handler for ACPI.ThermalZones enum
//
-LONG H_ACPIThermalZones(TCHAR *pszParam, TCHAR *pArg, NETXMS_VALUES_LIST *pValue)
+LONG H_ACPIThermalZones(const TCHAR *pszParam, const TCHAR *pArg, NETXMS_VALUES_LIST *pValue)
{
WMI_QUERY_CONTEXT ctx;
IEnumWbemClassObject *pEnumObject = NULL;
Modified: trunk/src/agent/subagents/wmi/wmi.cpp
===================================================================
--- trunk/src/agent/subagents/wmi/wmi.cpp 2008-05-24 12:14:47 UTC (rev 3284)
+++ trunk/src/agent/subagents/wmi/wmi.cpp 2008-05-24 12:47:31 UTC (rev 3285)
@@ -27,8 +27,8 @@
// Externals
//
-LONG H_ACPIThermalZones(TCHAR *pszParam, TCHAR *pArg, NETXMS_VALUES_LIST *pValue);
-LONG H_ACPITZCurrTemp(char *cmd, char *arg, char *value);
+LONG H_ACPIThermalZones(const TCHAR *pszParam, const TCHAR *pArg, NETXMS_VALUES_LIST *pValue);
+LONG H_ACPITZCurrTemp(const char *cmd, const char *arg, char *value);
//
@@ -182,7 +182,7 @@
// Handler for generic WMI query
//
-static LONG H_WMIQuery(char *cmd, char *arg, char *value)
+static LONG H_WMIQuery(const char *cmd, const char *arg, char *value)
{
WMI_QUERY_CONTEXT ctx;
IEnumWbemClassObject *pEnumObject = NULL;
@@ -248,7 +248,7 @@
// Handler for WMI.NameSpaces enum
//
-static LONG H_WMINameSpaces(TCHAR *pszParam, TCHAR *pArg, NETXMS_VALUES_LIST *pValue)
+static LONG H_WMINameSpaces(const TCHAR *pszParam, const TCHAR *pArg, NETXMS_VALUES_LIST *pValue)
{
WMI_QUERY_CONTEXT ctx;
IEnumWbemClassObject *pEnumObject = NULL;
@@ -286,7 +286,7 @@
// Handler for WMI.Classes enum
//
-static LONG H_WMIClasses(TCHAR *pszParam, TCHAR *pArg, NETXMS_VALUES_LIST *pValue)
+static LONG H_WMIClasses(const TCHAR *pszParam, const TCHAR *pArg, NETXMS_VALUES_LIST *pValue)
{
WMI_QUERY_CONTEXT ctx;
IEnumWbemClassObject *pEnumObject = NULL;
Received on Sat May 24 2008 - 15:47:32 EEST
This archive was generated by hypermail 2.2.0 : Sat May 24 2008 - 15:46:08 EEST