* include/hbdefs.h
+ Adjusted HB_SIZE_MAX value for Win64 after recent changes.
* src/vm/hashfunc.c
* src/vm/hvm.c
* src/debug/dbgentry.c
* src/common/hbwin.c
* src/common/hbfsapi.c
* src/common/hbstr.c
* src/rtl/lennum.c
* src/rtl/hbzlibgz.c
* src/rtl/hbtoken.c
* src/rtl/hbmd5.c
* src/rtl/hbregex.c
* src/rtl/hbzlib.c
* src/rtl/gtpca/gtpca.c
* contrib/hbct/screen2.c
* contrib/hbct/token2.c
* contrib/hbct/charsprd.c
* contrib/hbct/charlist.c
* contrib/hbct/charsort.c
* contrib/hbct/maxline.c
* contrib/hbct/wordrepl.c
* contrib/hbct/charrepl.c
* contrib/hbct/charswap.c
* contrib/hbct/pos1.c
* contrib/hbct/token1.c
* contrib/hbct/charmirr.c
* contrib/hbct/relation.c
* contrib/hbct/atnum.c
* contrib/hbct/count.c
* contrib/hbct/ctstrfil.c
* contrib/hbct/posdiff.c
* contrib/hbct/addascii.c
* contrib/hbct/pos2.c
* contrib/hbct/numat.c
* contrib/hbct/atrepl.c
* contrib/hbct/print.c
* contrib/xhb/txtline.c
* contrib/hbgt/strright.c
* contrib/hbgt/chrtotal.c
* contrib/hbgt/strcount.c
* contrib/hbgt/ascposgt.c
* contrib/hbgt/strleft.c
* contrib/hbgt/chrcount.c
* contrib/hbgt/strcspn.c
* contrib/hbgt/atdiff.c
* contrib/hbbz2/hbbz2.c
* contrib/hbmemio/memio.c
* contrib/hbclipsm/num.c
* contrib/hbclipsm/date.c
* contrib/hbmisc/stringsx.c
* contrib/hbmisc/spd.c
+ Using new size API.
NOTE: This will be a longer process as there many current variations
to pass sizes (*nint(), *ni(), *nl()) and there is no warning
issued in several of these.
Please also note that not all updates files became fully clean.
I will post a list of remaining warnings.
+ Type cleanup:
int -> HB_ISIZ
+ Added casts at component boundaries.
% Deleted unnecessary '( HB_SIZE )' casts.
+ ULONG_MAX -> HB_SIZE_MAX
* 'hb_retl( 0 )' -> 'hb_retl( HB_FALSE )'
* 'hb_retl( 1 )' -> 'hb_retl( HB_TRUE )'
! CSETSAFETY() fixed to return and accept logical parameters
instead of returning numeric, checking for logical but retrieving
numeric.
* src/common/hbwin.c
* DWORD -> int to be in sync with Windows API declarations.
; NOTE: I left out RDDs and VM from the areas I scanned, please
modify them. F.e. we will need a hb_vmPushSize().
; Peer review (by as much eyeballs as possible) is appreciated.
244 lines
6.5 KiB
C
244 lines
6.5 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* Sample date functions rewritten in C
|
|
*
|
|
* Copyright 2000 Jose Lalin <dezac@corevia.com>
|
|
* www - http://harbour-project.org
|
|
*
|
|
* 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
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this software; see the file COPYING. If not, write to
|
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
|
|
*
|
|
* As a special exception, the Harbour Project gives permission for
|
|
* additional uses of the text contained in its release of Harbour.
|
|
*
|
|
* The exception is that, if you link the Harbour libraries with other
|
|
* files to produce an executable, this does not by itself cause the
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
* Your use of that executable is in no way restricted on account of
|
|
* linking the Harbour library code into it.
|
|
*
|
|
* This exception does not however invalidate any other reasons why
|
|
* the executable file might be covered by the GNU General Public License.
|
|
*
|
|
* This exception applies only to the code released by the Harbour
|
|
* Project under the name Harbour. If you copy code from other
|
|
* Harbour Project or Free Software Foundation releases into a copy of
|
|
* Harbour, as the General Public License permits, the exception does
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
* anyone as to the status of such modified files, you must delete
|
|
* this exception notice from them.
|
|
*
|
|
* If you write modifications of your own for Harbour, it is your choice
|
|
* whether to permit this exception to apply to your modifications.
|
|
* If you do not wish that, delete this exception notice.
|
|
*
|
|
*/
|
|
|
|
#include "hbapi.h"
|
|
#include "hbapiitm.h"
|
|
#include "hbset.h"
|
|
#include "hbdate.h"
|
|
|
|
/* MDY( <dDate> ) --> "month dd, yyyy"
|
|
*/
|
|
HB_FUNC( MDY )
|
|
{
|
|
int iYear, iMonth, iDay;
|
|
char szDate[ 9 ];
|
|
char szFormatted[ 11 ];
|
|
char * szReturn;
|
|
HB_ISIZ iBufferLen;
|
|
HB_ISIZ iYearLen;
|
|
HB_ISIZ iLen;
|
|
|
|
hb_dateDecode( hb_pardl( 1 ), &iYear, &iMonth, &iDay );
|
|
hb_dateFormat( hb_pardsbuff( szDate, 1 ), szFormatted, "MM/DD/YYYY" );
|
|
|
|
iLen = strlen( hb_dateCMonth( iMonth ) );
|
|
iYearLen = hb_setGetCentury() ? 4 : 2;
|
|
|
|
iBufferLen = iLen + 5 + iYearLen;
|
|
szReturn = ( char * ) hb_xgrab( iBufferLen + 1 );
|
|
|
|
memset( szReturn, ' ', iBufferLen );
|
|
memcpy( szReturn, hb_dateCMonth( iMonth ), iLen );
|
|
memcpy( szReturn + iLen + 1, szFormatted + 3, 2 );
|
|
szReturn[ iLen + 3 ] = ',';
|
|
memcpy( szReturn + iLen + 5, szFormatted + 10 - iYearLen, iYearLen );
|
|
|
|
hb_retclen_buffer( szReturn, iBufferLen );
|
|
}
|
|
|
|
/* DMY( <dDate> ) --> "dd month yyyy" (european date format)
|
|
*/
|
|
HB_FUNC( DMY )
|
|
{
|
|
int iYear, iMonth, iDay;
|
|
char szDate[ 9 ];
|
|
char szFormatted[ 11 ];
|
|
char * szReturn;
|
|
HB_ISIZ iBufferLen;
|
|
HB_ISIZ iYearLen;
|
|
HB_ISIZ iLen;
|
|
|
|
hb_dateDecode( hb_pardl( 1 ), &iYear, &iMonth, &iDay );
|
|
hb_dateFormat( hb_pardsbuff( szDate, 1 ), szFormatted, "MM/DD/YYYY" );
|
|
|
|
iLen = strlen( hb_dateCMonth( iMonth ) );
|
|
iYearLen = hb_setGetCentury() ? 4 : 2;
|
|
|
|
iBufferLen = iLen + 4 + iYearLen;
|
|
szReturn = ( char * ) hb_xgrab( iBufferLen + 1 );
|
|
|
|
memset( szReturn, ' ', iBufferLen );
|
|
memcpy( szReturn, szFormatted + 3, 2 );
|
|
memcpy( szReturn + 3, hb_dateCMonth( iMonth ), iLen );
|
|
memcpy( szReturn + iLen + 4, szFormatted + 10 - iYearLen, iYearLen );
|
|
|
|
hb_retclen_buffer( szReturn, iBufferLen );
|
|
}
|
|
|
|
/* DATEASAGE( <dDate> ) --> <nYears>
|
|
*/
|
|
HB_FUNC( DATEASAGE )
|
|
{
|
|
int iAge = 0;
|
|
PHB_ITEM pDate = hb_param( 1, HB_IT_DATETIME );
|
|
|
|
if( pDate )
|
|
{
|
|
int iYear, iMonth, iDay;
|
|
int iThisYear, iThisMonth, iThisDay;
|
|
|
|
hb_dateToday( &iThisYear, &iThisMonth, &iThisDay );
|
|
hb_dateDecode( hb_itemGetDL( pDate ), &iYear, &iMonth, &iDay );
|
|
|
|
if( iThisYear > iYear )
|
|
{
|
|
iAge = iThisYear - iYear;
|
|
|
|
if( iThisMonth < iMonth || ( iThisMonth == iMonth && iThisDay < iDay ) )
|
|
--iAge;
|
|
}
|
|
}
|
|
|
|
hb_retni( iAge );
|
|
}
|
|
|
|
/* ADDMONTH( <dDate>, <nMonths> ) --> <dNewDate>
|
|
NOTE: Caller must validate dNewDate.
|
|
*/
|
|
HB_FUNC( ADDMONTH )
|
|
{
|
|
int iMonths = hb_parnl( 2 );
|
|
int iYear, iMonth, iDay;
|
|
|
|
int iLimit, iMonthAdd, iYearAdd;
|
|
long lNew;
|
|
|
|
hb_dateDecode( hb_pardl( 1 ), &iYear, &iMonth, &iDay );
|
|
|
|
iLimit = 12 - iMonth + 1;
|
|
iYearAdd = iMonths / 12;
|
|
iMonths %= 12;
|
|
|
|
if( iMonths >= iLimit )
|
|
iYearAdd++;
|
|
|
|
iYear += iYearAdd;
|
|
|
|
iMonthAdd = iMonths % 12;
|
|
iMonth = ( iMonth + iMonthAdd ) % 12;
|
|
|
|
if( iMonth == 0 )
|
|
iMonth = 12;
|
|
|
|
lNew = hb_dateEncode( iYear, iMonth, iDay );
|
|
|
|
if( !lNew )
|
|
{
|
|
iMonth = ( iMonth + 1 ) % 12;
|
|
iDay = 1;
|
|
iYear = iYear + ( ( iMonth + 1 ) / 12 );
|
|
}
|
|
|
|
hb_retd( iYear, iMonth, iDay );
|
|
}
|
|
|
|
/* DATEASARRAY( <dDate> ) --> { Year, Month, Day }
|
|
NOTE: Returns an empty array if <dDate> is not a valid date.
|
|
*/
|
|
HB_FUNC( DATEASARRAY )
|
|
{
|
|
PHB_ITEM pDate = hb_param( 1, HB_IT_DATETIME );
|
|
|
|
if( pDate )
|
|
{
|
|
PHB_ITEM pReturn = hb_itemArrayNew( 3 ); /* Create array */
|
|
int iYear, iMonth, iDay;
|
|
|
|
hb_dateDecode( hb_itemGetDL( pDate ), &iYear, &iMonth, &iDay );
|
|
|
|
hb_arraySetNI( pReturn, 1, iYear );
|
|
hb_arraySetNI( pReturn, 2, iMonth );
|
|
hb_arraySetNI( pReturn, 3, iDay );
|
|
|
|
hb_itemReturnRelease( pReturn );
|
|
}
|
|
else
|
|
hb_reta( 0 );
|
|
}
|
|
|
|
/* ARRAYASDATE( { <Year>, <Month>, <Day> } ) --> <dDate>
|
|
*/
|
|
HB_FUNC( ARRAYASDATE )
|
|
{
|
|
PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY );
|
|
|
|
if( pArray )
|
|
hb_retd( hb_arrayGetNI( pArray, 1 ), hb_arrayGetNI( pArray, 2 ), hb_arrayGetNI( pArray, 3 ) );
|
|
else
|
|
hb_retdl( 0 );
|
|
}
|
|
|
|
/* DATEISLEAP( <dDate> ) --> <lIsLeapYear>
|
|
*/
|
|
HB_FUNC( DATEISLEAP )
|
|
{
|
|
PHB_ITEM pDate = hb_param( 1, HB_IT_DATETIME );
|
|
|
|
if( pDate )
|
|
{
|
|
int iYear, iMonth, iDay;
|
|
|
|
hb_dateDecode( hb_itemGetDL( pDate ), &iYear, &iMonth, &iDay );
|
|
|
|
hb_retl( ( iYear % 4 == 0 && iYear % 100 != 0 ) || ( iYear % 400 == 0 ) );
|
|
}
|
|
else
|
|
hb_retl( HB_FALSE );
|
|
}
|
|
|
|
/* NTOD( <nMonth>, <nDay>, <nYear> ) --> <dDate>
|
|
*/
|
|
HB_FUNC( NTOD )
|
|
{
|
|
hb_retd( hb_parni( 3 ), hb_parni( 1 ), hb_parni( 2 ) );
|
|
}
|