From d75c80c3f9aab2f8838bcb6f8e21a5e84d2a8add Mon Sep 17 00:00:00 2001 From: Mindaugas Kavaliauskas Date: Thu, 18 Dec 2008 19:27:59 +0000 Subject: [PATCH] 2008-12-18 21:27 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) * contrib/hbnf/mouse1.prg * contrib/hbnf/pegs.prg * contrib/hbnf/popadder.prg * contrib/hbnf/tbwhile.prg * contrib/hbtip/cgi.prg * contrib/hbtip/ftpcln.prg * contrib/hbtip/httpcln.prg * contrib/hbtip/popcln.prg * contrib/hbtip/sendmail.prg * contrib/hbtip/sessid.prg * contrib/hbtip/smtpcln.prg * contrib/hbtpathy/telepath.prg * contrib/hbvpdf/hbvpdf.prg * contrib/hbvpdf/hbvpdt.prg * contrib/hbwhat/wincore.prg * contrib/hbwin/win_tprn.prg ! fixed assigned but not used variable ; NOTE: the only unfixed code is contrib/gtwvg, utils/hbdoc, utils/hbmake/hbmake.prg --- harbour/ChangeLog | 22 +++++++ harbour/contrib/hbnf/mouse1.prg | 12 ++-- harbour/contrib/hbnf/pegs.prg | 1 - harbour/contrib/hbnf/popadder.prg | 6 +- harbour/contrib/hbnf/tbwhile.prg | 5 +- harbour/contrib/hbtip/cgi.prg | 4 +- harbour/contrib/hbtip/ftpcln.prg | 1 - harbour/contrib/hbtip/httpcln.prg | 4 +- harbour/contrib/hbtip/popcln.prg | 2 - harbour/contrib/hbtip/sendmail.prg | 1 - harbour/contrib/hbtip/sessid.prg | 3 +- harbour/contrib/hbtip/smtpcln.prg | 1 - harbour/contrib/hbtpathy/telepath.prg | 28 ++++----- harbour/contrib/hbvpdf/hbvpdf.prg | 86 +++++++++++++-------------- harbour/contrib/hbvpdf/hbvpdft.prg | 49 ++++++++------- harbour/contrib/hbwhat/wincore.prg | 2 +- harbour/contrib/hbwin/win_tprn.prg | 6 +- 17 files changed, 121 insertions(+), 112 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0442220ba7..976c860912 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -7,6 +7,28 @@ For example: 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ + +2008-12-18 21:27 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) + * contrib/hbnf/mouse1.prg + * contrib/hbnf/pegs.prg + * contrib/hbnf/popadder.prg + * contrib/hbnf/tbwhile.prg + * contrib/hbtip/cgi.prg + * contrib/hbtip/ftpcln.prg + * contrib/hbtip/httpcln.prg + * contrib/hbtip/popcln.prg + * contrib/hbtip/sendmail.prg + * contrib/hbtip/sessid.prg + * contrib/hbtip/smtpcln.prg + * contrib/hbtpathy/telepath.prg + * contrib/hbvpdf/hbvpdf.prg + * contrib/hbvpdf/hbvpdt.prg + * contrib/hbwhat/wincore.prg + * contrib/hbwin/win_tprn.prg + ! fixed assigned but not used variable + ; NOTE: the only unfixed code is contrib/gtwvg, utils/hbdoc, + utils/hbmake/hbmake.prg + 2008-12-18 19:53 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) * source/compiler/hbopt.c ! one more try to fix passing informatino about redundant variable diff --git a/harbour/contrib/hbnf/mouse1.prg b/harbour/contrib/hbnf/mouse1.prg index 8bc5523a7f..e13be49571 100644 --- a/harbour/contrib/hbnf/mouse1.prg +++ b/harbour/contrib/hbnf/mouse1.prg @@ -229,7 +229,7 @@ FUNCTION FT_MMICKEYS( nX, nY ) // read mouse motion counters aReg[AX] = 11 // set mouse function call 11 FT_INT86( 51, aReg ) // execute mouse interrupt */ - Local areturn:={} + Local areturn areturn:=_mget_mics() nX := areturn[1] // store horizontal motion units nY := areturn[2] // store vertical motion units @@ -300,7 +300,7 @@ RETURN NIL // no function output FUNCTION FT_MDBLCLK( nClick, nButton, nInterval, nRow, nCol, nStart ) LOCAL nVert, nHorz // local row and col coordinates -LOCAL lDouble:=.F. // double click actually occurred +LOCAL lDouble // double click actually occurred LOCAL lDone // loop flag LOCAL nPrs // number of presses which occurred @@ -647,7 +647,7 @@ RETURN NIL */ FUNCTION FT_MVERSION(nMinor, nType, nIRQ) -Local aReturn:={} +Local aReturn // Set up register /* aReg[AX] := 36 @@ -994,7 +994,7 @@ RETURN NIL // no output from function FUNCTION FT_MGETPOS( nX, nY ) - Local amse:={} + Local amse nX := iif( nX == NIL, 0, nX ) nY := iif( nY == NIL, 0, nY ) /* @@ -1329,7 +1329,7 @@ RETURN aReg[4] // return button status FUNCTION FT_MBUTREL( nButton, nButRel, nX, nY ) // get button release information -local areg:={} +local areg Local iButton areg:=_m_MBUTREL(nButton) nButRel := aReg[1] // store updated release count @@ -1455,7 +1455,7 @@ RETURN NIL // no function output FUNCTION FT_MGETCOORD( nX, nY ) * Duplicated code from FT_MGETPOS() for speed reasons -local aReg:={} +local aReg local iButton nX := iif( nX == NIL, 0, nX ) nY := iif( nY == NIL, 0, nY ) diff --git a/harbour/contrib/hbnf/pegs.prg b/harbour/contrib/hbnf/pegs.prg index 1ea15f0826..f5c0423ba3 100644 --- a/harbour/contrib/hbnf/pegs.prg +++ b/harbour/contrib/hbnf/pegs.prg @@ -111,7 +111,6 @@ LOCAL XX, MOVE, MPOS, POSSIBLE_, BUFFER, TOPROW, OLDSCORE, MOVE2, ; */ scanblock := { | a | a[2] == move2 } cls -xx := 1 setcolor('w/r') SINGLEBOX(22, 31, 24, 48) @ 23, 33 say "Your move:" diff --git a/harbour/contrib/hbnf/popadder.prg b/harbour/contrib/hbnf/popadder.prg index feebfb1deb..c7c0aa1469 100644 --- a/harbour/contrib/hbnf/popadder.prg +++ b/harbour/contrib/hbnf/popadder.prg @@ -1309,8 +1309,7 @@ STATIC FUNCTION _ftQuest(cMessage,xVarVal,cPict,bValid,lNoESC,nWinColor,nTop) IIF(cVarType=="L",1,IIF(cVarType=="N",IIF(cPict==NIL,9, ; LEN(cPict)),0)))) LOCAL nOldLastKey := LASTKEY() - LOCAL GETLIST := {}, ; - cOldDevice := SET(_SET_DEVICE, "SCREEN"), ; + LOCAL cOldDevice := SET(_SET_DEVICE, "SCREEN"), ; lOldPrint := SET(_SET_PRINTER, .F.) nOldRow := ROW() @@ -1509,8 +1508,7 @@ RETURN NIL */ STATIC FUNCTION _ftStuffComma(cStrToStuff,lTrimStuffedStr) - LOCAL nDecPosit, x, ; - nOrLen := LEN(cStrToStuff) + LOCAL nDecPosit, x lTrimStuffedStr := IIF(lTrimStuffedStr==NIL,.F.,lTrimStuffedStr) IF !("." $ cStrToStuff) diff --git a/harbour/contrib/hbnf/tbwhile.prg b/harbour/contrib/hbnf/tbwhile.prg index 1665fcf47f..9a01760b06 100644 --- a/harbour/contrib/hbnf/tbwhile.prg +++ b/harbour/contrib/hbnf/tbwhile.prg @@ -274,7 +274,8 @@ FUNCTION FT_BRWSWHL(aFields, bWhileCond, cKey, nFreeze, lSaveScrn, ; nLeft TO 2, ; nBottom TO MaxRow() - 2, ; nRight TO MaxCol() - 2 - lKeepScrn := (PCOUNT() > 6) + + lKeepScrn := PCOUNT() > 6 SEEK cKey IF .NOT. FOUND() .OR. LASTREC() == 0 @@ -335,7 +336,7 @@ FUNCTION FT_BRWSWHL(aFields, bWhileCond, cKey, nFreeze, lSaveScrn, ; ENDIF cColorSave := SetColor() - /* Background Color Is Based On First Color In Passed cColorList + /* Background Color Is Based On First Color In Passed cColorList */ cColorBack := iif(',' $ cColorList, ; SUBSTR(cColorList, 1, AT(',', cColorList) - 1), cColorList ) diff --git a/harbour/contrib/hbtip/cgi.prg b/harbour/contrib/hbtip/cgi.prg index dcbad1a84c..93628d312b 100644 --- a/harbour/contrib/hbtip/cgi.prg +++ b/harbour/contrib/hbtip/cgi.prg @@ -111,8 +111,8 @@ ENDCLASS METHOD New() CLASS TIpCgi - local aTemp := {} - local aVar := {} + local aTemp + local aVar local lPost local nCount local nLen diff --git a/harbour/contrib/hbtip/ftpcln.prg b/harbour/contrib/hbtip/ftpcln.prg index b0330e928a..ccf25e2c63 100644 --- a/harbour/contrib/hbtip/ftpcln.prg +++ b/harbour/contrib/hbtip/ftpcln.prg @@ -658,7 +658,6 @@ RETURN cStr METHOD MPUT( cFileSpec, cAttr ) CLASS tIPClientFTP LOCAL cPath,cFile, cExt, aFile, aFiles - LOCAL nCount := 0 LOCAL cStr := "" IF ! ISCHARACTER( cFileSpec ) diff --git a/harbour/contrib/hbtip/httpcln.prg b/harbour/contrib/hbtip/httpcln.prg index c17ce7b0a4..b64999dad6 100644 --- a/harbour/contrib/hbtip/httpcln.prg +++ b/harbour/contrib/hbtip/httpcln.prg @@ -348,7 +348,7 @@ METHOD Read( nLen ) CLASS tIPClientHTTP ::bEof := .F. ::nLength := -1 //chunked data is followed by a blank line - cLine := ::InetRecvLine( ::SocketCon, @nPos, 1024 ) + /* cLine := */ ::InetRecvLine( ::SocketCon, @nPos, 1024 ) ENDIF @@ -570,7 +570,7 @@ METHOD PostMultiPart( cPostData, cQuery ) CLASS tIPClientHTTP nFile:=fopen(cFile) nbuf:=8192 nRead:=nBuf - cBuf:=space(nBuf) + //cBuf:=space(nBuf) while nRead == nBuf //nRead := FRead( nFile,@cBuf,nBuf) cBuf:=FReadstr( nFile,nBuf) diff --git a/harbour/contrib/hbtip/popcln.prg b/harbour/contrib/hbtip/popcln.prg index d67c06f96a..64a35c2f64 100644 --- a/harbour/contrib/hbtip/popcln.prg +++ b/harbour/contrib/hbtip/popcln.prg @@ -300,8 +300,6 @@ METHOD Retrieve( nId, nLen ) CLASS tIPClientPOP cRet := "" nRetLen := 0 - nRead := 0 - /* 04/05/2004 - Instead of receiving a single char at a time until after we have the full mail, let's receive as much as we can and stop when we reach EOM (end of mail :)) sequence. This way is _a lot_ faster diff --git a/harbour/contrib/hbtip/sendmail.prg b/harbour/contrib/hbtip/sendmail.prg index 76011ee45e..1de2c88326 100644 --- a/harbour/contrib/hbtip/sendmail.prg +++ b/harbour/contrib/hbtip/sendmail.prg @@ -289,7 +289,6 @@ FUNCTION HB_SendMail( cServer, nPort, cFrom, aTo, aCC, aBCC, cBody, cSubject, aF IF !oInMail:Open() - lConnect := .F. oInmail:Close() RETURN .F. ENDIF diff --git a/harbour/contrib/hbtip/sessid.prg b/harbour/contrib/hbtip/sessid.prg index 15b3b20893..c4b27efa00 100644 --- a/harbour/contrib/hbtip/sessid.prg +++ b/harbour/contrib/hbtip/sessid.prg @@ -105,7 +105,6 @@ FUNCTION TIP_CHECKSID( cSID, cCRCKey ) local nSIDCRC, cSIDCRC, n, cTemp local nLenSID := SID_LENGTH local cBaseKeys := BASE_KEY_STRING - local nLenKeys := Len( cBaseKeys ) local nRand, nKey := 0 DEFAULT cCRCKey TO CRC_KEY_STRING @@ -129,7 +128,7 @@ FUNCTION TIP_CHECKSID( cSID, cCRCKey ) RETURN Right( cSID, 5 ) == cSIDCRC FUNCTION TIP_DATETOGMT( dDate, cTime ) - LOCAL cStr := "" + LOCAL cStr LOCAL cOldDateFormat := Set( _SET_DATEFORMAT, "dd-mm-yy" ) LOCAL nDay, nMonth, nYear, nDoW LOCAL aDays := { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" } diff --git a/harbour/contrib/hbtip/smtpcln.prg b/harbour/contrib/hbtip/smtpcln.prg index f28a396571..a871b7e8d2 100644 --- a/harbour/contrib/hbtip/smtpcln.prg +++ b/harbour/contrib/hbtip/smtpcln.prg @@ -193,7 +193,6 @@ RETURN ::getOk() METHOD AUTH( cUser, cPass) CLASS tIPClientSMTP - Local cs:="" Local cEncodedUser Local cEncodedPAss diff --git a/harbour/contrib/hbtpathy/telepath.prg b/harbour/contrib/hbtpathy/telepath.prg index 5d659fbe5d..5b8d3c6f97 100644 --- a/harbour/contrib/hbtpathy/telepath.prg +++ b/harbour/contrib/hbtpathy/telepath.prg @@ -72,8 +72,6 @@ THREAD STATIC s_nErrorCode := 0 // Error code from last operation, 0 if no function tp_baud( nPort, nNewBaud ) - local nRes - default nNewBaud to 0 if ! isport( nPort ) .OR. Empty( s_aPorts[ nPort, TPFP_NAME ] ) @@ -85,11 +83,11 @@ function tp_baud( nPort, nNewBaud ) endif if nNewBaud > 0 - if ( nRes := p_InitPortSpeed( s_aPorts[ nPort, TPFP_HANDLE ] ,; - nNewBaud,; - s_aPorts[ nPort, TPFP_DBITS ] ,; - s_aPorts[ nPort, TPFP_PARITY ] ,; - s_aPorts[ nPort, TPFP_SBITS ] ) ) == 0 + if p_InitPortSpeed( s_aPorts[ nPort, TPFP_HANDLE ] ,; + nNewBaud,; + s_aPorts[ nPort, TPFP_DBITS ] ,; + s_aPorts[ nPort, TPFP_PARITY ] ,; + s_aPorts[ nPort, TPFP_SBITS ] ) == 0 s_aPorts[ nPort, TPFP_BAUD ] := nNewBaud @@ -289,7 +287,7 @@ return TE_CONFL // maybe should return something different? function tp_recv( nPort, nLength, nTimeout ) local nDone - local cRet := "" + local cRet default nLength to s_aPorts[ nPort, TPFP_INBUF_SIZE ] default nTimeout to 0 @@ -336,7 +334,7 @@ function tp_send( nPort, cString, nTimeout ) endif nDone := Seconds() + iif( nTimeout >= 0, nTimeout, 0) - nWritten := nTotWritten := 0 + nTotWritten := 0 while nTotWritten < Len( cString ) .AND. ; ( nTimeout < 0 .OR. Seconds() <= nDone ) @@ -536,18 +534,18 @@ return p_CRC32( cString ) function tp_waitfor( ... ) local aParam := hb_AParams() - local nPort, nTimeout, lIgnorecase + local nPort//, nTimeout, lIgnorecase nPort := aParam[ 1 ] - nTimeout := aParam[ 2 ] - lIgnorecase := aParam[ Len( aParam ) ] + //nTimeout := aParam[ 2 ] + //lIgnorecase := aParam[ Len( aParam ) ] if ! isopenport( nPort ) return 0 endif - default nTimeout to -1 - default lIgnorecase to .f. + //default nTimeout to -1 + //default lIgnorecase to .f. /* @@ -785,7 +783,7 @@ return .t. static function FetchChars( nPort ) - local cStr := "" + local cStr if ! isopenport( nPort ) return 0 diff --git a/harbour/contrib/hbvpdf/hbvpdf.prg b/harbour/contrib/hbvpdf/hbvpdf.prg index cd31986238..6745328585 100644 --- a/harbour/contrib/hbvpdf/hbvpdf.prg +++ b/harbour/contrib/hbvpdf/hbvpdf.prg @@ -145,7 +145,7 @@ return Nil ================================================= */ static function pdfBookCount( nRecno, nCurLevel ) /* ================================================= */ -local nTempLevel := 0, nCount := 0, nLen := len( s_aReport[ BOOKMARK ] ) +local nTempLevel, nCount := 0, nLen := len( s_aReport[ BOOKMARK ] ) ++nRecno while nRecno <= nLen nTempLevel := s_aReport[ BOOKMARK ][ nRecno ][ BOOKLEVEL ] @@ -192,7 +192,7 @@ return IIF( nLast == 0, nLast, nObj + nLast ) ====================================================== */ static function pdfBookNext( nRecno, nCurLevel, nObj ) /* ====================================================== */ -local nTempLevel := 0, nNext := 0, nLen := len( s_aReport[ BOOKMARK ] ) +local nTempLevel, nNext := 0, nLen := len( s_aReport[ BOOKMARK ] ) ++nRecno while nRecno <= nLen nTempLevel := s_aReport[ BOOKMARK ][ nRecno ][ BOOKLEVEL ] @@ -217,7 +217,7 @@ return Nil ======================================================== */ static function pdfBookParent( nRecno, nCurLevel, nObj ) /* ======================================================== */ -local nTempLevel := 0 +local nTempLevel local nParent := 0 --nRecno while nRecno > 0 @@ -233,7 +233,7 @@ return IIF( nParent == 0, nObj - 1, nObj + nParent ) ====================================================== */ static function pdfBookPrev( nRecno, nCurLevel, nObj ) /* ====================================================== */ -local nTempLevel := 0 +local nTempLevel local nPrev := 0 --nRecno while nRecno > 0 @@ -832,7 +832,7 @@ return s_aReport[ REPORTLINE ] ==========================================================================================*/ function pdfNewPage( _cPageSize, _cPageOrient, _nLpi, _cFontName, _nFontType, _nFontSize )/* ==========================================================================================*/ -local nAdd := 76.2 + DEFAULT _cPageSize to s_aReport[ PAGESIZE ] DEFAULT _cPageOrient to s_aReport[ PAGEORIENT ] DEFAULT _nLpi to s_aReport[ LPI ] @@ -1155,7 +1155,6 @@ DEFAULT cColor to "" cString := alltrim( cString ) nTokens := numtoken( cString, cDelim ) - nTokenLen := 0.00 nStart := 1 IF nJustify == 1 .or. nJustify == 4 @@ -1229,7 +1228,7 @@ DEFAULT cColor to "" nLines += nCRLF - 1 ENDIF IF lPrint - nRow := pdfNewLine( nCRLF - 1 ) + /* nRow := */pdfNewLine( nCRLF - 1 ) ENDIF ELSE @@ -1325,7 +1324,7 @@ static function TimeAsAMPM( cTime ) /* return cTime function pdfOpenHeader( cFile ) -local nErrorCode := 0, nAt +local nAt //, nErrorCode:=0 DEFAULT cFile to "" IF !empty( cFile ) cFile := alltrim( cFile ) @@ -1392,7 +1391,6 @@ local nId return nil function pdfSaveHeader( cFile ) -local nErrorCode := 0 Array2File( 'temp.tmp', s_aReport[ HEADER ] ) copy file temp.tmp to (cFile) return nil @@ -1762,10 +1760,10 @@ return aTemp function pdfTIFFInfo( cFile ) local c40 := chr(0)+chr(0)+chr(0)+chr(0) -local aType := {"BYTE","ASCII","SHORT","LONG","RATIONAL","SBYTE","UNDEFINED","SSHORT","SLONG","SRATIONAL","FLOAT","DOUBLE"} +//local aType := {"BYTE","ASCII","SHORT","LONG","RATIONAL","SBYTE","UNDEFINED","SSHORT","SLONG","SRATIONAL","FLOAT","DOUBLE"} local aCount := { 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8 } local nTemp, nHandle, cValues, c2, nFieldType, nCount, nPos, nTag, nValues -local nOffset, cTemp, cIFDNext, nIFD, nFields, cTag, nPages, nn +local nOffset, cTemp, cIFDNext, nIFD, nFields, nn//, cTag, nPages local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0, yRes := 0, aTemp := {}, nSpace @@ -1778,7 +1776,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 fread( nHandle, @cIFDNext, 4 ) cTemp := space(12) - nPages := 0 + //nPages := 0 while !( cIFDNext == c40 ) //read IFD's @@ -1836,7 +1834,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 ENDIF //?'Tag' //??' ' + padr( nTag, 10 ) - cTag := '' + //cTag := '' do case case nTag == 256 /* @@ -1846,7 +1844,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 The number of columns in the image, i.e., the number of pixels per scanline. */ //??'ImageWidth' - cTag := 'ImageWidth' + //cTag := 'ImageWidth' /* IF nFieldType != SHORT .and. nFieldType != LONG alert('Wrong Type for ImageWidth') @@ -1866,7 +1864,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 The number of rows (sometimes described as scanlines) in the image. */ //??'ImageLength' - cTag := 'ImageLength' + //cTag := 'ImageLength' /* IF nFieldType != SHORT .and. nFieldType != LONG alert('Wrong Type for ImageLength') @@ -1888,7 +1886,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 16 or 256 distinct shades of gray. */ //??'BitsPerSample' - cTag := 'BitsPerSample' + //cTag := 'BitsPerSample' nTemp := 0 IF nFieldType == SHORT nTemp := bin2w( cValues ) @@ -1917,13 +1915,13 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 Baseline TIFF readers must handle all three compression schemes. */ //??'Compression' - cTag := 'Compression' - nTemp := 0 + //cTag := 'Compression' + /*nTemp := 0 IF nFieldType == SHORT nTemp := bin2w( cValues ) ELSE //alert('Wrong Type for Compression') - ENDIF + ENDIF*/ //IF nTemp != 1 .and. nTemp != 2 .and. nTemp != 32773 // alert('Wrong Value for Compression') //ENDIF @@ -1940,7 +1938,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 image should display and print reversed. */ //??'PhotometricInterpretation' - cTag := 'PhotometricInterpretation' + //cTag := 'PhotometricInterpretation' nTemp := -1 IF nFieldType == SHORT nTemp := bin2w( cValues ) @@ -1960,7 +1958,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 No default. See also Threshholding. */ //??'CellWidth' - cTag := 'CellWidth' + //cTag := 'CellWidth' IF nFieldType != SHORT //alert('Wrong Type for CellWidth') ENDIF @@ -1976,7 +1974,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 No default. See also Threshholding. */ //??'CellLength' - cTag := 'CellLength' + //cTag := 'CellLength' IF nFieldType != SHORT //alert('Wrong Type for CellLength') ENDIF @@ -1989,7 +1987,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 N = 1 */ //??'FillOrder' - cTag := 'FillOrder' + //cTag := 'FillOrder' IF nFieldType != SHORT //alert('Wrong Type for FillOrder') ENDIF @@ -2001,7 +1999,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 For each strip, the byte offset of that strip. */ //??'StripOffsets' - cTag := 'StripOffsets' + //cTag := 'StripOffsets' IF nFieldType != SHORT .and. nFieldType != LONG //alert('Wrong Type for StripOffsets') ENDIF @@ -2021,7 +2019,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 extra samples are present. See the ExtraSamples field for further information. */ //??'SamplesPerPixel' - cTag := 'SamplesPerPixel' + //cTag := 'SamplesPerPixel' IF nFieldType != SHORT //alert('Wrong Type for SamplesPerPixel') ENDIF @@ -2037,7 +2035,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 data.) */ //??'RowsPerStrip' - cTag := 'RowsPerStrip' + //cTag := 'RowsPerStrip' IF nFieldType != SHORT .and. nFieldType != LONG //alert('Wrong Type for RowsPerStrip') ENDIF @@ -2049,7 +2047,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 For each strip, the number of bytes in that strip after any compression. */ //??'StripByteCounts' - cTag := 'StripByteCounts' + //cTag := 'StripByteCounts' IF nFieldType != SHORT .and. nFieldType != LONG //alert('Wrong Type for StripByteCounts') ENDIF @@ -2071,7 +2069,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 - see Orientation) direction. */ //??'XResolution' - cTag := 'XResolution' + //cTag := 'XResolution' IF nFieldType != RATIONAL //alert('Wrong Type for XResolution') ENDIF @@ -2085,14 +2083,14 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 direction. */ //??'YResolution' - cTag := 'YResolution' + //cTag := 'YResolution' IF nFieldType != RATIONAL //alert('Wrong Type for YResolution') ENDIF yRes := bin2l(substr( cValues, 1, 4 )) case nTag == 284 //??'PlanarConfiguration' - cTag := 'PlanarConfiguration' + //cTag := 'PlanarConfiguration' IF nFieldType != SHORT //alert('Wrong Type for PlanarConfiguration') ENDIF @@ -2107,7 +2105,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 See also FreeByteCounts. */ //??'FreeOffsets' - cTag := 'FreeOffsets' + //cTag := 'FreeOffsets' IF nFieldType != LONG //alert('Wrong Type for FreeOffsets') ENDIF @@ -2122,7 +2120,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 See also FreeOffsets. */ //??'FreeByteCounts' - cTag := 'FreeByteCounts' + //cTag := 'FreeByteCounts' IF nFieldType != LONG //alert('Wrong Type for FreeByteCounts') ENDIF @@ -2139,7 +2137,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 Default = 2 (inch). */ //??'ResolutionUnit' - cTag := 'ResolutionUnit' + //cTag := 'ResolutionUnit' nTemp := 0 IF nFieldType == SHORT nTemp := bin2w( cValues ) @@ -2151,7 +2149,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 ENDIF case nTag == 305 //??'Software' - cTag := 'Software' + //cTag := 'Software' IF nFieldType != ASCII //alert('Wrong Type for Software') ENDIF @@ -2167,7 +2165,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 string, including the terminating NUL, is 20 bytes. */ //??'DateTime' - cTag := 'DateTime' + //cTag := 'DateTime' IF nFieldType != ASCII //alert('Wrong Type for DateTime') ENDIF @@ -2180,7 +2178,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 Note: some older TIFF files used this tag for storing Copyright information. */ //??'Artist' - cTag := 'Artist' + //cTag := 'Artist' IF nFieldType != ASCII //alert('Wrong Type for Artist') ENDIF @@ -2199,7 +2197,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 represented by 65535, 65535, 65535. */ //??'ColorMap' - cTag := 'ColorMap' + //cTag := 'ColorMap' IF nFieldType != SHORT //alert('Wrong Type for ColorMap') ENDIF @@ -2212,7 +2210,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 N = m */ //??'ExtraSamples' - cTag := 'ExtraSamples' + //cTag := 'ExtraSamples' IF nFieldType != SHORT //alert('Wrong Type for ExtraSamples') ENDIF @@ -2228,13 +2226,13 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 All rights reserved. */ //??'Copyright' - cTag := 'Copyright' + //cTag := 'Copyright' IF nFieldType != ASCII //alert('Wrong Type for Copyright') ENDIF otherwise //??'Unknown' - cTag := 'Unknown' + //cTag := 'Unknown' endcase /* ??padr( cTag, 30 ) @@ -2310,9 +2308,9 @@ return aTemp function pdfJPEGInfo( cFile ) local c255, nAt, nHandle -local nWidth := 0, nHeight := 0, nBits := 8, nFrom := 0, nLength := 0, xRes := 0, yRes := 0, aTemp := {} +local nWidth, nHeight, nBits := 8, nFrom := 0, nLength, xRes, yRes, aTemp := {} local nBuffer := 20000 -local nSpace := 3 // 3 - RGB, 1 - GREY, 4 - CMYK +local nSpace // := 3 // 3 - RGB, 1 - GREY, 4 - CMYK nHandle := fopen( cFile ) @@ -2359,7 +2357,7 @@ STATIC FUNCTION AtToken( cString, cDelimiter, nPointer ) RETURN AllToken( cString, cDelimiter, nPointer, 2 ) STATIC FUNCTION AllToken( cString, cDelimiter, nPointer, nAction ) -LOCAL nTokens := 0, nPos := 1, nLen := len( cString ), nStart := 0, cToken := "", cRet +LOCAL nTokens := 0, nPos := 1, nLen := len( cString ), nStart, cRet DEFAULT cDelimiter to chr(0)+chr(9)+chr(10)+chr(13)+chr(26)+chr(32)+chr(138)+chr(141) DEFAULT nAction to 0 @@ -2395,7 +2393,7 @@ DEFAULT nAction to 0 RETURN cRet STATIC FUNCTION NumAt( cSearch, cString ) - LOCAL n := 0, nAt := 0, nPos := 0 + LOCAL n := 0, nAt, nPos := 0 WHILE ( nAt := at( cSearch, substr( cString, nPos + 1 ) )) > 0 nPos += nAt ++n diff --git a/harbour/contrib/hbvpdf/hbvpdft.prg b/harbour/contrib/hbvpdf/hbvpdft.prg index e06ca33cec..89476fcfc2 100644 --- a/harbour/contrib/hbvpdf/hbvpdft.prg +++ b/harbour/contrib/hbvpdf/hbvpdft.prg @@ -766,7 +766,7 @@ METHOD tPdf:NewPage( _cPageSize, _cPageOrient, _nLpi, _cFontName, _nFontType, _n METHOD NewPage( _cPageSize, _cPageOrient, _nLpi, _cFontName, _nFontType, _nFontSize ) #endif -local nAdd := 76.2 + DEFAULT _cPageSize TO ::aReport[ PAGESIZE ] DEFAULT _cPageOrient TO ::aReport[ PAGEORIENT ] @@ -1021,7 +1021,7 @@ DEFAULT cColor TO "" nNew := nTab cString := alltrim( cString ) nTokens := numtoken( cString, cDelim ) - nTokenLen := 0.00 + nStart := 1 IF nJustify == 1 .or. nJustify == 4 @@ -1095,7 +1095,7 @@ DEFAULT cColor TO "" nLines += nCRLF - 1 ENDIF IF lPrint - nRow := ::NewLine( nCRLF - 1 ) + /*nRow :=*/ ::NewLine( nCRLF - 1 ) ENDIF ELSE @@ -1124,7 +1124,7 @@ METHOD tPdf:OpenHeader( cFile ) METHOD OpenHeader( cFile ) #endif -local nErrorCode := 0, nAt, cCmd +local nAt, cCmd DEFAULT cFile TO "" @@ -1248,7 +1248,7 @@ METHOD tPdf:SaveHeader( cFile ) METHOD SaveHeader( cFile ) #endif -local nErrorCode := 0, cCmd +local cCmd Array2File( "temp.tmp", ::aReport[ HEADER ] ) @@ -1661,10 +1661,10 @@ METHOD TIFFInfo( cFile ) #endif local c40 := chr(0)+chr(0)+chr(0)+chr(0) -local aType := {"BYTE","ASCII","SHORT","LONG","RATIONAL","SBYTE","UNDEFINED","SSHORT","SLONG","SRATIONAL","FLOAT","DOUBLE"} +//local aType := {"BYTE","ASCII","SHORT","LONG","RATIONAL","SBYTE","UNDEFINED","SSHORT","SLONG","SRATIONAL","FLOAT","DOUBLE"} local aCount := { 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8 } local nTemp, nHandle, cValues, c2, nFieldType, nCount, nPos, nTag, nValues -local nOffset, cTemp, cIFDNext, nIFD, nFields, cTag, nPages, nn +local nOffset, cTemp, cIFDNext, nIFD, nFields, cTag, nn local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0, yRes := 0, aTemp := {} @@ -1678,7 +1678,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 fread( nHandle, @cIFDNext, 4 ) cTemp := space(12) - nPages := 0 + while !( cIFDNext == c40 ) //read IFD's @@ -1712,7 +1712,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 IF nFieldType == ASCII --nCount ENDIF - cTag := "" + //cTag := "" do case case nTag == 256 cTag := "ImageWidth" @@ -1740,16 +1740,16 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 nBits := nTemp case nTag == 259 cTag := "Compression" - nTemp := 0 + /*nTemp := 0 IF nFieldType == SHORT nTemp := bin2w( cValues ) - ENDIF + ENDIF*/ case nTag == 262 cTag := "PhotometricInterpretation" - nTemp := -1 + /*nTemp := -1 IF nFieldType == SHORT nTemp := bin2w( cValues ) - ENDIF + ENDIF*/ case nTag == 264 cTag := "CellWidth" case nTag == 265 @@ -1792,10 +1792,10 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 cTag := "FreeByteCounts" case nTag == 296 cTag := "ResolutionUnit" - nTemp := 0 + /*nTemp := 0 IF nFieldType == SHORT nTemp := bin2w( cValues ) - ENDIF + ENDIF*/ case nTag == 305 cTag := "Software" case nTag == 306 @@ -1814,7 +1814,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 next fread( nHandle, @cIFDNext, 4 ) enddo - + HB_SYMBOL_UNUSED( cTag ) // TOFIX fclose( nHandle ) aadd( aTemp, nWidth ) @@ -1836,8 +1836,8 @@ METHOD JPEGInfo( cFile ) #endif local c255, nAt, nHandle -local nWidth := 0, nHeight := 0, nBits := 8, nFrom := 0 -local nLength := 0, xRes := 0, yRes := 0, aTemp := {} +local nWidth, nHeight, nBits := 8, nFrom := 0 +local nLength, xRes, yRes, aTemp := {} nHandle := fopen( cFile ) @@ -1873,7 +1873,7 @@ METHOD tPdf:BookCount( nRecno, nCurLevel ) METHOD BookCount( nRecno, nCurLevel ) #endif -local nTempLevel := 0, nCount := 0, nLen := len( ::aReport[ BOOKMARK ] ) +local nTempLevel, nCount := 0, nLen := len( ::aReport[ BOOKMARK ] ) ++nRecno while nRecno <= nLen nTempLevel := ::aReport[ BOOKMARK ][ nRecno ][ BOOKLEVEL ] @@ -1935,7 +1935,7 @@ METHOD tPdf:BookNext( nRecno, nCurLevel, nObj ) METHOD BookNext( nRecno, nCurLevel, nObj ) #endif -local nTempLevel := 0, nNext := 0, nLen := len( ::aReport[ BOOKMARK ] ) +local nTempLevel, nNext := 0, nLen := len( ::aReport[ BOOKMARK ] ) ++nRecno while nRecno <= nLen nTempLevel := ::aReport[ BOOKMARK ][ nRecno ][ BOOKLEVEL ] @@ -1959,7 +1959,7 @@ METHOD tPdf:BookParent( nRecno, nCurLevel, nObj ) METHOD BookParent( nRecno, nCurLevel, nObj ) #endif -local nTempLevel := 0 +local nTempLevel local nParent := 0 --nRecno while nRecno > 0 @@ -1980,7 +1980,7 @@ METHOD tPdf:BookPrev( nRecno, nCurLevel, nObj ) METHOD BookPrev( nRecno, nCurLevel, nObj ) #endif -local nTempLevel := 0 +local nTempLevel local nPrev := 0 --nRecno while nRecno > 0 @@ -2456,8 +2456,7 @@ static function AllToken( cString, cDelimiter, nPointer, nAction ) local nTokens := 0 local nPos := 1 local nLen := len( cString ) -local nStart := 0 -local cToken := "" +local nStart local cRet := 0 DEFAULT cDelimiter TO chr(0)+chr(9)+chr(10)+chr(13)+chr(26)+chr(32)+chr(138)+chr(141) @@ -2610,7 +2609,7 @@ return ( aRay ) static FUNCTION NumAt( cSearch, cString ) - LOCAL n := 0, nAt := 0, nPos := 0 + LOCAL n := 0, nAt, nPos := 0 WHILE ( nAt := at( cSearch, substr( cString, nPos + 1 ) )) > 0 nPos += nAt ++n diff --git a/harbour/contrib/hbwhat/wincore.prg b/harbour/contrib/hbwhat/wincore.prg index 3999e5a594..e0cd1e08f0 100644 --- a/harbour/contrib/hbwhat/wincore.prg +++ b/harbour/contrib/hbwhat/wincore.prg @@ -263,7 +263,7 @@ Function WHT__ProcessMsg( hWnd, nMsg, nwParam, nlParam, nIndex ) Return VWN_CallWindowProc( nProc, hWnd, nMsg, nwParam, nlParam ) // external EndIf Else - i := 0 // end of the road, call default + //i := 0 // end of the road, call default EndIf Else Exit // ok, we got it diff --git a/harbour/contrib/hbwin/win_tprn.prg b/harbour/contrib/hbwin/win_tprn.prg index cad57069af..1a74af0d0c 100644 --- a/harbour/contrib/hbwin/win_tprn.prg +++ b/harbour/contrib/hbwin/win_tprn.prg @@ -331,7 +331,7 @@ METHOD Destroy() CLASS WIN32PRN RETURN(.T.) METHOD StartDoc(cDocName) CLASS WIN32PRN - LOCAL Result:= .F. + LOCAL Result IF cDocName == NIL cDocName:= win32_GetExeFileName()+" ["+DTOC(DATE())+' - '+TIME()+"]" ENDIF @@ -566,7 +566,7 @@ METHOD TextOutAt(nPosX,nPosY, cString, lNewLine, lUpdatePosX, nAlign) CLASS WIN3 RETURN(.T.) METHOD GetCharWidth() CLASS WIN32PRN - LOCAL nWidth:= 0 + LOCAL nWidth IF ::FontWidth[2] < 0 .AND. !EMPTY(::FontWidth[1]) nWidth:= win32_MulDiv(::FontWidth[1], ::PixelsPerInchX,::FontWidth[2]) ELSE @@ -578,7 +578,7 @@ METHOD GetCharHeight() CLASS WIN32PRN RETURN win32_GetCharSize(::hPrinterDC, .T.) METHOD GetTextWidth(cString) CLASS WIN32PRN - LOCAL nWidth:= 0 + LOCAL nWidth IF ::FontWidth[2] < 0 .AND. !EMPTY(::FontWidth[1]) nWidth:= LEN(cString) * ::CharWidth ELSE