OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-22 13:20:05 +00:00
Code Releases Activity

Convert custom HeadSpin integer types to standard types from stdint.h

Browse Source
This commit is contained in:
Adam Johnson
2012-01-19 21:19:26 -05:00
parent a0d54e2644
commit 5027b5a4ac
1301 changed files with 14497 additions and 14532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Sources/Plasma/NucleusLib/pnNetLog/pnNetLog.h
View File

@ -72,28 +72,28 @@ enum ELogParamType {
kLogParamUnsigned, // (unsigned)
kLogParamFloat, // (float)
kLogParamUuid, // Uuid
kLogParamStringW, // (const wchar *)
kLogParamLong, // (long) or (dword)
kLogParamLongLong, // (long long) or (qword)
kLogParamStringW, // (const wchar_t *)
kLogParamLong, // (long) or (uint32_t)
kLogParamLongLong, // (long long) or (uint64_t)
kNumLogParamTypes
};
struct NetLogField {
ELogParamType type; // element type
wchar name[MAX_PATH];
wchar_t name[MAX_PATH];
};
struct NetLogEvent {
ESrvType srvType;
unsigned logEventType;
const wchar * eventName;
const wchar_t * eventName;
const NetLogField * fields;
unsigned numFields;
};
struct NetLogSrvField {
const wchar *name;
const wchar *data;
const wchar_t *name;
const wchar_t *data;
};
#define NET_LOG_FIELD_INT(name) { kLogParamInt, name }
@ -157,7 +157,7 @@ enum {
kNlSrvNumPerf
};
typedef void (*NlSrvCallback)(const NetLogEvent *event, const ARRAY(wchar) &, unsigned, NetAddressNode &, qword, unsigned, unsigned);
typedef void (*NlSrvCallback)(const NetLogEvent *event, const ARRAY(wchar_t) &, unsigned, NetAddressNode &, uint64_t, unsigned, unsigned);
long NetLogSrvGetPerf (unsigned index);
void NetLogSrvRegisterCallback(NlSrvCallback callback);
void LogConnIncRef (LogConn * conn);

4
Sources/Plasma/NucleusLib/pnNetLog/pnNlApi.cpp
View File

@ -64,7 +64,7 @@ struct EventHash {
ESrvType srvType
);
inline dword GetHash () const;
inline uint32_t GetHash () const;
inline bool operator== (const EventHash & rhs) const;
};
@ -117,7 +117,7 @@ inline EventHash::EventHash (
}
//============================================================================
inline dword EventHash::GetHash () const {
inline uint32_t EventHash::GetHash () const {
CHashValue hash(this, sizeof(*this));
return hash.GetHash();
}

10
Sources/Plasma/NucleusLib/pnNetLog/pnNlCli.cpp
View File

@ -181,7 +181,7 @@ static void ParseIni (Ini * ini) {
);
if (value) {
wchar addrStr[32];
wchar_t addrStr[32];
IniGetString(value, addrStr, arrsize(addrStr), 0, nil);
NetAddress addr;
NetAddressFromString(&addr, addrStr, kNetDefaultServerPort);
@ -190,7 +190,7 @@ static void ParseIni (Ini * ini) {
}
//============================================================================
static void IniChangeCallback (const wchar fullPath[]) {
static void IniChangeCallback (const wchar_t fullPath[]) {
Ini * ini = IniOpen(fullPath);
ParseIni(ini);
IniClose(ini);
@ -207,7 +207,7 @@ static unsigned TimerCallback (void *) {
if(allowedNumTrans < 0) // this could be negative, if so set to zero
allowedNumTrans = 0;
dword currTime = TimeGetMs();
uint32_t currTime = TimeGetMs();
LogConnEventNode *hash;
int timeDiff;
@ -310,7 +310,7 @@ static unsigned CalcArgsLength (const NetLogEvent &event, va_list args) {
break;
case kLogParamStringW: {
wchar *str = va_arg(args, wchar *);
wchar_t *str = va_arg(args, wchar_t *);
if(!str)
str = L"";
length += StrBytes(str);
@ -543,7 +543,7 @@ void NetLogCliSendEvent (const NetLogEvent &event, va_list args) {
break;
case kLogParamStringW: {
wchar *str = va_arg(args, wchar *);
wchar_t *str = va_arg(args, wchar_t *);
if(!str)
str = L"";
pack.AddString(str);

16
Sources/Plasma/NucleusLib/pnNetLog/pnNlSrv.cpp
View File

@ -64,7 +64,7 @@ struct EventHash {
ESrvType srvType
);
inline dword GetHash () const;
inline uint32_t GetHash () const;
inline bool operator== (const EventHash & rhs) const;
};
@ -117,7 +117,7 @@ static long s_perf[kNlSrvNumPerf];
static CCritSect s_critsect;
static bool s_running;
static LISTDECL(LogConn, link) s_conns;
void (*NetLogSrvCallback)(const NetLogEvent *event, const ARRAY(wchar) &, unsigned, NetAddressNode &, qword, unsigned, unsigned ) ;
void (*NetLogSrvCallback)(const NetLogEvent *event, const ARRAY(wchar_t) &, unsigned, NetAddressNode &, uint64_t, unsigned, unsigned ) ;
/*****************************************************************************
@ -140,7 +140,7 @@ static void ParseIni (Ini * ini) {
}
//============================================================================
static void IniChangeCallback (const wchar fullPath[]) {
static void IniChangeCallback (const wchar_t fullPath[]) {
Ini * ini = IniOpen(fullPath);
ParseIni(ini);
IniClose(ini);
@ -269,8 +269,8 @@ bool LogConn::Recv_Srv2Log_LogMsg(const Srv2Log_LogMsg & msg ) {
CSrvUnpackBuffer unpack(&msg, msg.messageBytes);
(void)unpack.GetData(sizeof(msg));
unsigned length = 0;
ARRAY(wchar) databuf;
wchar data[256];
ARRAY(wchar_t) databuf;
wchar_t data[256];
const void *pData = 0;
SendReply(msg.transId, kNetSuccess);
@ -360,7 +360,7 @@ bool LogConn::Recv_Srv2Log_LogMsg(const Srv2Log_LogMsg & msg ) {
break;
case kLogParamStringW: {
const wchar *str = unpack.GetString();
const wchar_t *str = unpack.GetString();
if(!str) {
continue;
}
@ -489,7 +489,7 @@ bool LogConn::Recv_Srv2Log_LogMsg(const Srv2Log_LogMsg & msg ) {
break;
case kLogParamStringW: {
const wchar *str = unpack.GetString();
const wchar_t *str = unpack.GetString();
if(!str) {
continue;
}
@ -575,7 +575,7 @@ void NetLogSrvDestroy () {
}
//============================================================================
void NetLogSrvRegisterCallback( void (*NlSrvCallback)(const NetLogEvent *, const ARRAY(wchar) &, unsigned, NetAddressNode &, qword, unsigned, unsigned )) {
void NetLogSrvRegisterCallback( void (*NlSrvCallback)(const NetLogEvent *, const ARRAY(wchar_t) &, unsigned, NetAddressNode &, uint64_t, unsigned, unsigned )) {
NetLogSrvCallback = NlSrvCallback;
}