Commit c2c2a843 authored by Claes Sjofors's avatar Claes Sjofors

Compile fixes

parent e346db0a
...@@ -4832,18 +4832,18 @@ int sev_dbhdf5::time_to_idx(hid_t dataset_id, hid_t memspace_id, ...@@ -4832,18 +4832,18 @@ int sev_dbhdf5::time_to_idx(hid_t dataset_id, hid_t memspace_id,
idx = size - 1; idx = size - 1;
get_time(dataset_id, memspace_id, dataspace_id, mtype, idx, &time); get_time(dataset_id, memspace_id, dataspace_id, mtype, idx, &time);
printf("%d Search time : %d %d\n", idx, stime, time); printf("%d Search time : %d %d\n", idx, stime, time);
if (ABS(time - stime) <= resolution) { if (ABS((int)time - (int)stime) <= resolution) {
*ridx = idx; *ridx = idx;
return 1; return 1;
} }
if (prev_time && ABS(time - prev_time) <= 1) { if (prev_time && ABS((int)time - (int)prev_time) <= 1) {
if (ABS(time - low_time) > ABS(high_time - time)) if (ABS((int)time - (int)low_time) > ABS((int)high_time - (int)time))
idx = high_idx - (high_idx - low_idx) / 10; idx = high_idx - (high_idx - low_idx) / 10;
else else
idx = low_idx + (high_idx - low_idx) / 10; idx = low_idx + (high_idx - low_idx) / 10;
get_time(dataset_id, memspace_id, dataspace_id, mtype, idx, &time); get_time(dataset_id, memspace_id, dataspace_id, mtype, idx, &time);
printf("%d Search time : %d %d\n", idx, stime, time); printf("%d Search time : %d %d\n", idx, stime, time);
if (ABS(time - stime) <= resolution) { if (ABS((int)time - (int)stime) <= resolution) {
*ridx = idx; *ridx = idx;
return 1; return 1;
} }
......
...@@ -834,7 +834,7 @@ struct pwr_s_Value { ...@@ -834,7 +834,7 @@ struct pwr_s_Value {
struct pwr_s_DbCallBack { struct pwr_s_DbCallBack {
pwr_tString80 MethodName pwr_dAlignLW; pwr_tString80 MethodName pwr_dAlignLW;
pwr_tString40 MethodArguments[5] pwr_dAlignW; pwr_tString40 MethodArguments[5] pwr_dAlignW;
pwr_tStatus (*Method)() pwr_dAlignLW; /* Address to method. */ pwr_tStatus (*Method)(void) pwr_dAlignLW; /* Address to method. */
pwr_tUInt32 Flags pwr_dAlignW; pwr_tUInt32 Flags pwr_dAlignW;
}; };
...@@ -851,7 +851,7 @@ struct pwr_s_MenuCascade { ...@@ -851,7 +851,7 @@ struct pwr_s_MenuCascade {
pwr_tString40 ButtonName pwr_dAlignLW; pwr_tString40 ButtonName pwr_dAlignLW;
pwr_tString80 FilterName pwr_dAlignW; pwr_tString80 FilterName pwr_dAlignW;
pwr_tString40 FilterArguments[5] pwr_dAlignW; pwr_tString40 FilterArguments[5] pwr_dAlignW;
pwr_tBoolean (*Filter)() pwr_dAlignLW; /* Address to method pwr_tBoolean (*Filter)(void) pwr_dAlignLW; /* Address to method
visibility function. */ visibility function. */
}; };
...@@ -861,8 +861,8 @@ struct pwr_s_MenuButton { ...@@ -861,8 +861,8 @@ struct pwr_s_MenuButton {
pwr_tString80 MethodArguments[5] pwr_dAlignW; pwr_tString80 MethodArguments[5] pwr_dAlignW;
pwr_tString80 FilterName pwr_dAlignW; pwr_tString80 FilterName pwr_dAlignW;
pwr_tString80 FilterArguments[5] pwr_dAlignW; pwr_tString80 FilterArguments[5] pwr_dAlignW;
pwr_tStatus (*Method)() pwr_dAlignLW; /* Address to method. */ pwr_tStatus (*Method)(void) pwr_dAlignLW; /* Address to method. */
pwr_tBoolean (*Filter)() pwr_dAlignLW; /* Address to method pwr_tBoolean (*Filter)(void) pwr_dAlignLW; /* Address to method
visibility function. */ visibility function. */
pwr_tUInt32 Flags pwr_dAlignW; pwr_tUInt32 Flags pwr_dAlignW;
}; };
...@@ -872,7 +872,7 @@ struct pwr_s_MenuRef { ...@@ -872,7 +872,7 @@ struct pwr_s_MenuRef {
pwr_tString40 RefAttribute pwr_dAlignW; pwr_tString40 RefAttribute pwr_dAlignW;
pwr_tString80 FilterName pwr_dAlignW; pwr_tString80 FilterName pwr_dAlignW;
pwr_tString40 FilterArguments[5] pwr_dAlignW; pwr_tString40 FilterArguments[5] pwr_dAlignW;
pwr_tBoolean (*Filter)() pwr_dAlignLW; /* Address to method pwr_tBoolean (*Filter)(void) pwr_dAlignLW; /* Address to method
visibility function. */ visibility function. */
}; };
......
...@@ -113,7 +113,7 @@ static unsigned int do_div(int*, unsigned int); ...@@ -113,7 +113,7 @@ static unsigned int do_div(int*, unsigned int);
static int skip_atoi(const char**); static int skip_atoi(const char**);
static char* number(char*, int, int, int, int, int); static char* number(char*, int, int, int, int, int);
void errh_Interactive() void errh_Interactive(void)
{ {
interactive = 1; interactive = 1;
} }
...@@ -164,7 +164,7 @@ void errh_SetStatus(pwr_tStatus sts) ...@@ -164,7 +164,7 @@ void errh_SetStatus(pwr_tStatus sts)
* @brief Get application index for the process. * @brief Get application index for the process.
* \return Application index. * \return Application index.
*/ */
errh_eAnix errh_Anix() errh_eAnix errh_Anix(void)
{ {
return errh_anix; return errh_anix;
} }
......
...@@ -217,7 +217,7 @@ typedef struct { ...@@ -217,7 +217,7 @@ typedef struct {
pwr_tStatus errh_Init(const char* programName, errh_eAnix anix); pwr_tStatus errh_Init(const char* programName, errh_eAnix anix);
void errh_SetStatus(pwr_tStatus sts); void errh_SetStatus(pwr_tStatus sts);
void errh_Interactive(); void errh_Interactive(void);
char* errh_GetMsg(const pwr_tStatus sts, char* buf, int bufSize); char* errh_GetMsg(const pwr_tStatus sts, char* buf, int bufSize);
char* errh_GetText(const pwr_tStatus sts, char* buf, int bufSize); char* errh_GetText(const pwr_tStatus sts, char* buf, int bufSize);
char* errh_Log(char* buff, char severity, const char* msg, ...); char* errh_Log(char* buff, char severity, const char* msg, ...);
...@@ -236,7 +236,7 @@ void* errh_ErrArgAF(char* s); ...@@ -236,7 +236,7 @@ void* errh_ErrArgAF(char* s);
void* errh_ErrArgL(int val); void* errh_ErrArgL(int val);
void errh_CErrLog(pwr_tStatus sts, ...); void errh_CErrLog(pwr_tStatus sts, ...);
char* errh_Message(char* string, char severity, char* msg, ...); char* errh_Message(char* string, char severity, char* msg, ...);
errh_eAnix errh_Anix(); errh_eAnix errh_Anix(void);
void errh_SetAnix(errh_eAnix anix); void errh_SetAnix(errh_eAnix anix);
void errh_SetName(char* name); void errh_SetName(char* name);
errh_eSeverity errh_Severity(pwr_tStatus); errh_eSeverity errh_Severity(pwr_tStatus);
......
...@@ -176,7 +176,7 @@ void errl_Init(const char* termName, ...@@ -176,7 +176,7 @@ void errl_Init(const char* termName,
return; return;
} }
void errl_Unlink() void errl_Unlink(void)
{ {
#if !defined(OS_MACOS) && !defined(OS_FREEBSD) && !defined(OS_OPENBSD) #if !defined(OS_MACOS) && !defined(OS_FREEBSD) && !defined(OS_OPENBSD)
char name[64]; char name[64];
......
...@@ -49,12 +49,12 @@ ...@@ -49,12 +49,12 @@
#define LOG_MAX_MSG_SIZE 256 /* length of logstring */ #define LOG_MAX_MSG_SIZE 256 /* length of logstring */
pwr_tStatus errl_Exit(); pwr_tStatus errl_Exit(void);
void errl_Init(const char* termname, void errl_Init(const char* termname,
void (*log_cb)(void*, char*, char, pwr_tStatus, int, int), void* userdata); void (*log_cb)(void*, char*, char, pwr_tStatus, int, int), void* userdata);
void errl_SetTerm(const char* termname); void errl_SetTerm(const char* termname);
void errl_SetFile(const char* filename); void errl_SetFile(const char* filename);
void errl_Unlink(); void errl_Unlink(void);
#endif #endif
...@@ -613,7 +613,7 @@ pwr_tStatus gdh_DLUnrefObjectInfo( ...@@ -613,7 +613,7 @@ pwr_tStatus gdh_DLUnrefObjectInfo(
* @brief Removes all direct links set up by this process. * @brief Removes all direct links set up by this process.
*/ */
void gdh_DLUnrefObjectInfoAll() void gdh_DLUnrefObjectInfoAll(void)
{ {
gdh_ScopeLock gdh_ScopeLock
{ {
...@@ -2206,7 +2206,7 @@ pwr_tStatus gdh_NameToPointer(const char* name, /**< The name of the object. */ ...@@ -2206,7 +2206,7 @@ pwr_tStatus gdh_NameToPointer(const char* name, /**< The name of the object. */
*@return pwr_tStatus *@return pwr_tStatus
*/ */
pwr_tStatus gdh_NethandlerRunning() pwr_tStatus gdh_NethandlerRunning(void)
{ {
pwr_tStatus sts = GDH__SUCCESS; pwr_tStatus sts = GDH__SUCCESS;
...@@ -2974,7 +2974,7 @@ pwr_tStatus gdh_SubUnrefObjectInfo( ...@@ -2974,7 +2974,7 @@ pwr_tStatus gdh_SubUnrefObjectInfo(
* *
*/ */
void gdh_SubUnrefObjectInfoAll() void gdh_SubUnrefObjectInfoAll(void)
{ {
gdh_ScopeLock gdh_ScopeLock
{ {
...@@ -3415,7 +3415,7 @@ pwr_tStatus gdh_UnrefObjectInfo( ...@@ -3415,7 +3415,7 @@ pwr_tStatus gdh_UnrefObjectInfo(
* @see gdh_DLUnrefObjectInfoAll, gdhSubUnrefObjectInfoAll * @see gdh_DLUnrefObjectInfoAll, gdhSubUnrefObjectInfoAll
* @return pwr_tStatus * @return pwr_tStatus
*/ */
pwr_tStatus gdh_UnrefObjectInfoAll() pwr_tStatus gdh_UnrefObjectInfoAll(void)
{ {
gdh_DLUnrefObjectInfoAll(); gdh_DLUnrefObjectInfoAll();
gdh_SubUnrefObjectInfoAll(); gdh_SubUnrefObjectInfoAll();
......
...@@ -201,7 +201,7 @@ pwr_tStatus gdh_DLRefObjectInfoAttrref( ...@@ -201,7 +201,7 @@ pwr_tStatus gdh_DLRefObjectInfoAttrref(
pwr_tStatus gdh_DLUnrefObjectInfo(pwr_tDlid directLinkId); pwr_tStatus gdh_DLUnrefObjectInfo(pwr_tDlid directLinkId);
void gdh_DLUnrefObjectInfoAll(); void gdh_DLUnrefObjectInfoAll(void);
pwr_tStatus gdh_FReadObject(char* filename, pwr_tAttrRef* arp); pwr_tStatus gdh_FReadObject(char* filename, pwr_tAttrRef* arp);
...@@ -321,7 +321,7 @@ pwr_tStatus gdh_NameToObjid(const char* objectName, pwr_tObjid* objid); ...@@ -321,7 +321,7 @@ pwr_tStatus gdh_NameToObjid(const char* objectName, pwr_tObjid* objid);
pwr_tStatus gdh_NameToPointer(const char* objectName, void** objectData); pwr_tStatus gdh_NameToPointer(const char* objectName, void** objectData);
pwr_tStatus gdh_NethandlerRunning(); pwr_tStatus gdh_NethandlerRunning(void);
pwr_tStatus gdh_ObjidToName( pwr_tStatus gdh_ObjidToName(
pwr_tObjid oid, char* namebuf, pwr_tUInt32 size, pwr_tBitMask nametype); pwr_tObjid oid, char* namebuf, pwr_tUInt32 size, pwr_tBitMask nametype);
...@@ -368,13 +368,13 @@ pwr_tStatus gdh_SetSubscriptionDefaults( ...@@ -368,13 +368,13 @@ pwr_tStatus gdh_SetSubscriptionDefaults(
pwr_tStatus gdh_SubUnrefObjectInfo(pwr_tSubid subid); pwr_tStatus gdh_SubUnrefObjectInfo(pwr_tSubid subid);
void gdh_SubUnrefObjectInfoAll(); void gdh_SubUnrefObjectInfoAll(void);
pwr_tStatus gdh_SubUnrefObjectInfoList(unsigned int nEntry, pwr_tSubid* subid); pwr_tStatus gdh_SubUnrefObjectInfoList(unsigned int nEntry, pwr_tSubid* subid);
pwr_tStatus gdh_UnrefObjectInfo(pwr_tSubid subid); pwr_tStatus gdh_UnrefObjectInfo(pwr_tSubid subid);
pwr_tStatus gdh_UnrefObjectInfoAll(); pwr_tStatus gdh_UnrefObjectInfoAll(void);
pwr_tStatus gdh_VolumeIdToName(pwr_tVid vid, char* name, int size); pwr_tStatus gdh_VolumeIdToName(pwr_tVid vid, char* name, int size);
...@@ -401,9 +401,9 @@ pwr_tStatus gdh_IsMountClean(pwr_tObjid object, pwr_tBoolean* isMountClean); ...@@ -401,9 +401,9 @@ pwr_tStatus gdh_IsMountClean(pwr_tObjid object, pwr_tBoolean* isMountClean);
* Exclusive mode * Exclusive mode
*/ */
void gdh_ExclusiveModeOn(); void gdh_ExclusiveModeOn(void);
void gdh_ExclusiveModeOff(); void gdh_ExclusiveModeOff(void);
pwr_tStatus gdh_GetTrueObjectBodyDef( pwr_tStatus gdh_GetTrueObjectBodyDef(
pwr_tCid cid, gdh_sAttrDef** bodydef, int* rows); pwr_tCid cid, gdh_sAttrDef** bodydef, int* rows);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment