diff --git a/xflaim/Makefile b/xflaim/Makefile index cdedb72..2de1c27 100644 --- a/xflaim/Makefile +++ b/xflaim/Makefile @@ -253,7 +253,6 @@ ifdef win_target inc_dirs += $(subst $(sp),@,"$(jhome)/include/win32") endif - # Libraries that our various components need to link against lib_link_libs = imagehlp.lib user32.lib rpcrt4.lib wsock32.lib @@ -377,8 +376,13 @@ ifdef unix_target endif ifeq ($(target_os_family),solaris) + ifdef jhome + inc_dirs += $(subst $(sp),@,"$(jhome)/include") + inc_dirs += $(subst $(sp),@,"$(jhome)/include/solaris") + endif + ifeq ($(usenativecc),yes) - ccflags += -KPIC -errwarn=%all -errtags -erroff=hidef,inllargeuse + ccflags += -KPIC -errwarn=%all -errtags -erroff=hidef,inllargeuse,doubunder ifeq ($(target_word_size),64) ccflags += -xarch=generic64 else diff --git a/xflaim/util/domedit.h b/xflaim/util/domedit.h index 9966957..87a4ce8 100644 --- a/xflaim/util/domedit.h +++ b/xflaim/util/domedit.h @@ -192,7 +192,7 @@ public: DME_ROW_INFO * pStartRow = NULL); RCODE setTitle( - char * pszTitle); + const char * pszTitle); void setCurrentAtTop( void); @@ -325,23 +325,23 @@ public: FLMUINT uiAttrNameId); RCODE requestInput( - char * pszMessage, - char * pszResponse, - FLMUINT uiMaxRespLen, - FLMUINT * puiTermChar); + const char * pszMessage, + char * pszResponse, + FLMUINT uiMaxRespLen, + FLMUINT * puiTermChar); RCODE displayMessage( - char * pszMessage, - RCODE rcOfMessage, - FLMUINT * puiTermChar, - eColorType uiBackground, - eColorType uiForeground); + const char * pszMessage, + RCODE rcOfMessage, + FLMUINT * puiTermChar, + eColorType uiBackground, + eColorType uiForeground); RCODE globalConfig( FLMUINT uiOption); RCODE createStatusWindow( - char * pszTitle, + const char * pszTitle, eColorType uiBack, eColorType uiFore, FLMUINT * puiCols, @@ -401,8 +401,8 @@ public: RCODE abortTransaction( void); void doQuery( - char * pszQuery, - FLMUINT uiQueryBufSize); + char * pszQuery, + FLMUINT uiQueryBufSize); RCODE indexList( void); diff --git a/xflaim/util/fdomedt.cpp b/xflaim/util/fdomedt.cpp index fc6b10a..286dd29 100644 --- a/xflaim/util/fdomedt.cpp +++ b/xflaim/util/fdomedt.cpp @@ -63,15 +63,15 @@ static char * pszDomeditFullMonthNames [12] = FSTATIC FLMBOOL domeditIsNum( - char * pszToken, - FLMUINT * puiNum); + const char * pszToken, + FLMUINT * puiNum); FSTATIC char * domeditSkipChars( - char * pszStr, - char * pszCharsToSkip); + const char * pszStr, + const char * pszCharsToSkip); FSTATIC FLMBOOL domeditStrToDate( - char * s, + const char * s, FLMUINT * puiYear, FLMUINT * puiMonth, FLMUINT * puiDay); @@ -91,7 +91,7 @@ FSTATIC FLMUINT unicodeStrLen( FLMUNICODE * puzStr); FSTATIC void asciiToUnicode( - char * pszAsciiString, + const char * pszAsciiString, FLMUNICODE * puzString); FSTATIC RCODE unicodeToAscii( @@ -102,8 +102,8 @@ FSTATIC RCODE unicodeToAscii( FSTATIC RCODE formatText( FLMUNICODE * puzBuf, FLMBOOL bQuoted, - char * pszPreText, - char * pszPostText, + const char * pszPreText, + const char * pszPostText, char ** ppszString); FSTATIC RCODE formatDocumentNode( @@ -129,8 +129,8 @@ FSTATIC RCODE formatDataNode( DME_ROW_INFO * pRow, FLMUINT * puiNumVals, FLMUINT uiFlags, - char * pszPreText, - char * pszPostText); + const char * pszPreText, + const char * pszPostText); FSTATIC RCODE formatProcessingInstruction( F_DomEditor * pDomEditor, @@ -439,7 +439,7 @@ Name: setTitle Desc: *****************************************************************************/ RCODE F_DomEditor::setTitle( - char * pszTitle) + const char * pszTitle) { RCODE rc = NE_XFLM_OK; eColorType uiBack; @@ -617,17 +617,16 @@ public: private: void outputLabel( - FLMUINT uiRow, - char * pszLabel); + FLMUINT uiRow, + const char * pszLabel); void outputStr( - FLMUINT uiRow, - char * pszValue); + FLMUINT uiRow, + const char * pszValue); FINLINE void outputBool( - FLMUINT uiRow, - FLMBOOL bBool - ) + FLMUINT uiRow, + FLMBOOL bBool) { outputStr( uiRow, (char *)(bBool ? (char *)"YES" : (char *)"NO")); } @@ -713,8 +712,8 @@ Exit: Desc: Output a label on the query status screen. *****************************************************************************/ void EditQueryStatus::outputLabel( - FLMUINT uiRow, - char * pszLabel + FLMUINT uiRow, + const char * pszLabel ) { char szLabel [50]; @@ -736,8 +735,8 @@ void EditQueryStatus::outputLabel( Desc: Output a string value on the query status screen. *****************************************************************************/ void EditQueryStatus::outputStr( - FLMUINT uiRow, - char * pszValue + FLMUINT uiRow, + const char * pszValue ) { FTXWinSetCursorPos( m_pWindow, DATA_COLUMN, uiRow); @@ -1968,10 +1967,9 @@ RCODE F_DomEditor::interactiveEdit( case FKB_ALT_L: { - FLMUINT uiCollection = m_uiCollection; - FLMUINT64 ui64NodeId; - char szResponse[ 32]; - FLMUINT uiTermChar; + FLMUINT uiCollection = m_uiCollection; + FLMUINT64 ui64NodeId; + char szResponse[ 32]; DME_ROW_INFO * pDocList = m_pDocList; szResponse [0] = 0; @@ -2088,7 +2086,6 @@ RCODE F_DomEditor::interactiveEdit( { FLMUINT uiCollection; char szResponse[ 32]; - FLMUINT uiTermChar; FLMUINT uiSrcLen; FLMUINT uiNodeId; FLMUINT64 ui64Tmp; @@ -2185,7 +2182,6 @@ RCODE F_DomEditor::interactiveEdit( case FKB_ALT_C: { char szResponse[ 2]; - FLMUINT uiTermChar; szResponse [0] = 0; requestInput( @@ -2848,7 +2844,7 @@ Name: displayMessage Desc: *****************************************************************************/ RCODE F_DomEditor::displayMessage( - char * pszMessage, + const char * pszMessage, RCODE rcOfMessage, FLMUINT * puiTermChar, eColorType uiBackground, @@ -2920,7 +2916,7 @@ Name: requestInput Desc: *****************************************************************************/ RCODE F_DomEditor::requestInput( - char * pszMessage, + const char * pszMessage, char * pszResponse, FLMUINT uiMaxRespLen, FLMUINT * puiTermChar) @@ -6467,7 +6463,7 @@ Name: createStatusWindow Desc: Creates a window for displaying an operation's status *****************************************************************************/ RCODE F_DomEditor::createStatusWindow( - char * pszTitle, + const char * pszTitle, eColorType uiBack, eColorType uiFore, FLMUINT * puiCols, @@ -6983,12 +6979,12 @@ Desc: Makes sure the utility is still allowed to run *****************************************************************************/ RCODE domEditVerifyRun( void) { - F_TMSTAMP curDate; - FLMUINT uiExpireYear = 0; - FLMUINT uiExpireMonth = 0; - FLMUINT uiExpireDay = 0; - RCODE rc = NE_XFLM_OK; - char * pszDate = __DATE__; + F_TMSTAMP curDate; + FLMUINT uiExpireYear = 0; + FLMUINT uiExpireMonth = 0; + FLMUINT uiExpireDay = 0; + RCODE rc = NE_XFLM_OK; + const char * pszDate = __DATE__; // Get the compilation date of this module. // If cannot get it, return NE_XFLM_OK. @@ -7060,11 +7056,10 @@ Exit: Desc: This routine converts the passed in string to a year, month, and day. ****************************************************************************/ FSTATIC FLMBOOL domeditStrToDate( - char * s, + const char * s, FLMUINT * puiYear, FLMUINT * puiMonth, - FLMUINT * puiDay - ) + FLMUINT * puiDay) { char szToken [80]; FLMUINT uiLoop; @@ -7293,13 +7288,12 @@ Desc: This routine determines if the passed in token is a number. If so, the number is returned. ****************************************************************************/ FSTATIC FLMBOOL domeditIsNum( - char * pszToken, // Token being checked - FLMUINT * puiNum // Returned number - if token is a number - ) + const char * pszToken, + FLMUINT * puiNum) { - FLMBOOL bIsNum = FALSE; - char * pszBuffer; - FLMUINT uiLen; + FLMBOOL bIsNum = FALSE; + const char * pszBuffer; + FLMUINT uiLen; // Make sure all characters are between 0 and 9 @@ -7401,11 +7395,10 @@ Desc: This routine skips the characters in the string specified by pszCharsToSkip. ****************************************************************************/ FSTATIC char * domeditSkipChars( - char * pszStr, - char * pszCharsToSkip - ) + const char * pszStr, + const char * pszCharsToSkip) { - char * pszTmp; + const char * pszTmp; while (*pszStr) { @@ -7423,7 +7416,7 @@ FSTATIC char * domeditSkipChars( break; } } - return( pszStr); + return( (char *)pszStr); } @@ -7532,7 +7525,7 @@ Exit: Desc: Convert an ascii string to unicode *============================================================================*/ FSTATIC void asciiToUnicode( - char * pszAsciiString, + const char * pszAsciiString, FLMUNICODE * puzString) { FLMUINT uiLoop = 0; @@ -7542,7 +7535,7 @@ FSTATIC void asciiToUnicode( { if (*pszAsciiString == '&') { - char * pszTmp = pszAsciiString + 1; + const char * pszTmp = pszAsciiString + 1; if (*pszTmp == '#') { FLMUNICODE * puzTmpPtr = &puzString[ uiLoop]; @@ -7899,10 +7892,9 @@ Desc: Formats text. FSTATIC RCODE formatText( FLMUNICODE * puzBuf, FLMBOOL bQuoted, - char * pszPreText, - char * pszPostText, - char ** ppszString - ) + const char * pszPreText, + const char * pszPostText, + char ** ppszString) { RCODE rc = NE_XFLM_OK; FLMUNICODE * puzTmp = NULL; @@ -8638,9 +8630,8 @@ FSTATIC RCODE formatDataNode( DME_ROW_INFO * pRow, FLMUINT * puiNumVals, FLMUINT uiFlags, - char * pszPreText, - char * pszPostText - ) + const char * pszPreText, + const char * pszPostText) { RCODE rc = NE_XFLM_OK; FLMUNICODE * puzValue = NULL; @@ -12643,8 +12634,7 @@ Desc: Allows doing a query and having the user expand the results of *****************************************************************************/ void F_DomEditor::doQuery( char * pszQuery, - FLMUINT uiQueryBufSize - ) + FLMUINT uiQueryBufSize) { RCODE rc = NE_XFLM_OK; FLMUINT uiCollection; @@ -13413,4 +13403,3 @@ Exit: return rc; } - diff --git a/xflaim/util/fshell.cpp b/xflaim/util/fshell.cpp index 528ffbd..1379e75 100644 --- a/xflaim/util/fshell.cpp +++ b/xflaim/util/fshell.cpp @@ -44,8 +44,8 @@ extern FLMBOOL gv_bShutdown; typedef struct { - RCODE rc; - char * pszErrorStr; + RCODE rc; + const char * pszErrorStr; } XSHELL_ERROR_CODE_MAP; XSHELL_ERROR_CODE_MAP gv_XMLParseErrors[ @@ -273,14 +273,14 @@ RCODE getErrFromFile( FSTATIC void domDisplayError( FTX_WINDOW * pWindow, - char * pszError, + const char * pszError, RCODE errRc); FSTATIC void domOutputValues( FTX_WINDOW * pWindow, FLMUINT * puiLineCount, IF_FileHdl * pFileHdl, - char * pszLabel, + const char * pszLabel, FLMUINT64 ui64Bytes, FLMUINT uiPercent, FLMUINT64 ui64Count); @@ -289,14 +289,14 @@ FSTATIC void domDisplayLine( FTX_WINDOW * pWindow, FLMUINT * puiLineCount, IF_FileHdl * pFileHdl, - char * pszLine, - char * pszWaitPrompt = NULL); + const char * pszLine, + const char * pszWaitPrompt = NULL); FSTATIC void domDisplayValue( FTX_WINDOW * pWindow, FLMUINT * puiLineCount, IF_FileHdl * pFileHdl, - char * pszLabel, + const char * pszLabel, FLMUINT uiPercent, FLMUINT64 ui64Value); @@ -304,12 +304,12 @@ FSTATIC void domDisplayInfo( FTX_WINDOW * pWindow, FLMUINT * puiLineCount, IF_FileHdl * pFileHdl, - char * pszDomOverheadLabel, - char * pszValueBytesLabel, + const char * pszDomOverheadLabel, + const char * pszValueBytesLabel, OVERHEAD_INFO * pInfo, FLMUINT64 ui64TotalBytes); -char * errorToString( +const char * errorToString( XMLParseError errorType); /**************************************************************************** @@ -1101,10 +1101,10 @@ Exit: Desc: *****************************************************************************/ RCODE FlmShell::con_printf( - char * pszFormat, ...) + const char * pszFormat, ...) { - char szBuffer[ 512]; - f_va_list args; + char szBuffer[ 512]; + f_va_list args; if( m_pWindow) { @@ -4182,7 +4182,9 @@ FLMINT FlmFileSysCommand::execute( RCODE rc = NE_XFLM_OK; FLMUINT uiLoop = 0; FLMBOOL bForce = FALSE; + FLMBOOL bOverwrite; IF_DirHdl * pDir = NULL; + FLMUINT64 ui64BytesCopied; // Delete the file @@ -4262,9 +4264,8 @@ FLMINT FlmFileSysCommand::execute( f_stricmp( "move", ppszArgV[0]) == 0 || f_stricmp( "mv", ppszArgV[0]) == 0 ) { - FLMUINT uiLoop = 0; - FLMBOOL bForce = FALSE; - FLMBOOL bOverwrite = FALSE; + bForce = FALSE; + bOverwrite = FALSE; for( uiLoop = 1; uiLoop < (FLMUINT)iArgC; uiLoop++) { @@ -4376,10 +4377,9 @@ FLMINT FlmFileSysCommand::execute( else if(f_stricmp( "copy", ppszArgV[0]) == 0 || f_stricmp( "cp", ppszArgV[0]) == 0) { - FLMUINT uiLoop; - FLMBOOL bForce = FALSE; - FLMBOOL bOverwrite = FALSE; - FLMUINT64 ui64BytesCopied = 0; + bForce = FALSE; + bOverwrite = FALSE; + ui64BytesCopied = 0; for( uiLoop = 1; uiLoop < (FLMUINT)iArgC; uiLoop++) { @@ -6071,7 +6071,7 @@ Desc: Display an error message on the screen *****************************************************************************/ FSTATIC void domDisplayError( FTX_WINDOW * pWindow, - char * pszError, + const char * pszError, RCODE errRc) { FTX_SCREEN * pScreen; @@ -6099,7 +6099,7 @@ FSTATIC void domOutputValues( FTX_WINDOW * pWindow, FLMUINT * puiLineCount, IF_FileHdl * pFileHdl, - char * pszLabel, + const char * pszLabel, FLMUINT64 ui64Bytes, FLMUINT uiPercent, FLMUINT64 ui64Count) @@ -6146,7 +6146,7 @@ FINLINE void domOutputNodeInfoItem( FTX_WINDOW * pWindow, FLMUINT * puiLineCount, IF_FileHdl * pFileHdl, - char * pszInfoType, + const char * pszInfoType, XFLM_NODE_INFO_ITEM * pInfoItem, FLMUINT64 ui64TotalBytes, FLMBOOL bForce = FALSE) @@ -7060,8 +7060,8 @@ FSTATIC void domDisplayLine( FTX_WINDOW * pWindow, FLMUINT * puiLineCount, IF_FileHdl * pFileHdl, - char * pszLine, - char * pszWaitPrompt) + const char * pszLine, + const char * pszWaitPrompt) { RCODE rc; FLMUINT uiNumRows; @@ -7133,7 +7133,7 @@ FSTATIC void domDisplayValue( FTX_WINDOW * pWindow, FLMUINT * puiLineCount, IF_FileHdl * pFileHdl, - char * pszLabel, + const char * pszLabel, FLMUINT uiPercent, FLMUINT64 ui64Value) { @@ -7163,8 +7163,8 @@ FSTATIC void domDisplayInfo( FTX_WINDOW * pWindow, FLMUINT * puiLineCount, IF_FileHdl * pFileHdl, - char * pszDomOverheadLabel, - char * pszValueBytesLabel, + const char * pszDomOverheadLabel, + const char * pszValueBytesLabel, OVERHEAD_INFO * pInfo, FLMUINT64 ui64TotalBytes) { @@ -7937,8 +7937,8 @@ public: private: void outputLabel( - char * pszLabel, - FLMUINT uiRow) + const char * pszLabel, + FLMUINT uiRow) { char szTmp [80]; FLMUINT uiNumDots = DATA_COL - LABEL_COL; @@ -7952,9 +7952,9 @@ private: } void outputStr( - char * pszStr, - FLMUINT uiRow, - FLMBOOL bClearToEOL) + const char * pszStr, + FLMUINT uiRow, + FLMBOOL bClearToEOL) { FTXWinSetCursorPos( m_pWindow, DATA_COL, uiRow); if (bClearToEOL) @@ -7965,8 +7965,8 @@ private: } void outputUINT( - FLMUINT uiValue, - FLMUINT uiRow) + FLMUINT uiValue, + FLMUINT uiRow) { char szTmp [80]; @@ -7975,8 +7975,8 @@ private: } void outputUINT64( - FLMUINT64 ui64Value, - FLMUINT uiRow) + FLMUINT64 ui64Value, + FLMUINT uiRow) { char szTmp [80]; @@ -9219,10 +9219,10 @@ void extractBaseDirAndWildcard( f_strcat( pszWildcard, "*"); } -char * errorToString( +const char * errorToString( XMLParseError errorType) { - char * pszErrorStr; + const char * pszErrorStr; if( errorType == XML_NO_ERROR) { diff --git a/xflaim/util/fshell.h b/xflaim/util/fshell.h index 2df44eb..c24882d 100644 --- a/xflaim/util/fshell.h +++ b/xflaim/util/fshell.h @@ -201,12 +201,11 @@ public: FLMUINT uiDbId); RCODE con_printf( - char * pucFormat, ...); + const char * pucFormat, ...); FINLINE void displayCommand( - char * pszCommand, - char * pszDescription - ) + const char * pszCommand, + const char * pszDescription) { con_printf( " %-20s -- %s\n", pszCommand, pszDescription); } diff --git a/xflaim/util/sharutil.cpp b/xflaim/util/sharutil.cpp index 41904e4..c803367 100644 --- a/xflaim/util/sharutil.cpp +++ b/xflaim/util/sharutil.cpp @@ -504,7 +504,7 @@ Desc: *****************************************************************************/ RCODE FlmThreadContext::setup( FlmSharedContext * pSharedContext, - char * pszThreadName, + const char * pszThreadName, THREAD_FUNC_p pFunc, void * pvAppData) { @@ -1435,7 +1435,7 @@ void scramble( for( uiLoop = 0; uiLoop < uiNumElems; uiLoop++) { - uiIndex = pRandGen->getUINT32( 0, uiNumElems - 1); + uiIndex = pRandGen->getUINT32( 0, (FLMUINT32)(uiNumElems - 1)); f_swap( puiArray[uiLoop], puiArray[uiIndex], diff --git a/xflaim/util/sharutil.h b/xflaim/util/sharutil.h index e171ae0..40c87b4 100644 --- a/xflaim/util/sharutil.h +++ b/xflaim/util/sharutil.h @@ -250,7 +250,7 @@ public: RCODE setup( FlmSharedContext * pSharedContext, - char * pszThreadName, + const char * pszThreadName, THREAD_FUNC_p pFunc, void * pvAppData); diff --git a/xflaim/util/viewblk.cpp b/xflaim/util/viewblk.cpp index a009f5d..2bfc85f 100644 --- a/xflaim/util/viewblk.cpp +++ b/xflaim/util/viewblk.cpp @@ -1091,7 +1091,7 @@ FLMBOOL ViewAvailBlk( : NULL, NULL, 0, BT_FREE, NULL); #endif - StateInfo.ui32BlkAddress = uiBlkAddress; + StateInfo.ui32BlkAddress = (FLMUINT32)uiBlkAddress; StateInfo.pBlkHdr = pBlkHdr; #if 0 if ((iErrorCode = flmVerifyBlockHeader( &StateInfo, &BlockInfo, diff --git a/xflaim/util/viewedit.cpp b/xflaim/util/viewedit.cpp index 9facb1d..5fb1e2b 100644 --- a/xflaim/util/viewedit.cpp +++ b/xflaim/util/viewedit.cpp @@ -610,7 +610,7 @@ FLMBOOL ViewEdit( return( FALSE); } uiBytesToWrite = 4; - UD2FBA( uiNum, (FLMBYTE *)szTempBuf); + UD2FBA( (FLMUINT32)uiNum, (FLMBYTE *)szTempBuf); break; case MOD_BITS: if (!ViewEditBits( (FLMBYTE *)&szTempBuf[ 0],