fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2016-01-13 15:25 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* contrib/hbtip/encurlc.c
    ! fixed C&P typos in tip_URLEncode() and tip_URLDecode() in may
      previous commit

  * src/pp/ppcore.c
    * pacified warning

  * src/common/hbver.c
  * src/rtl/hbsocket.c
    * updated for Digital Mars C compilation
This commit is contained in:
Przemysław Czerpak
2016-01-13 15:25:21 +01:00
parent 05bbf52617
commit ca9bb39a23
5 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog.txt
View File

@@ -10,6 +10,18 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2016-01-13 15:25 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/hbtip/encurlc.c
! fixed C&P typos in tip_URLEncode() and tip_URLDecode() in may
previous commit
* src/pp/ppcore.c
* pacified warning
* src/common/hbver.c
* src/rtl/hbsocket.c
* updated for Digital Mars C compilation
2016-01-13 11:08 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* include/hbsocket.h
* src/rtl/hbsockhb.c

15
contrib/hbtip/encurlc.c
View File

@@ -74,12 +74,11 @@ HB_FUNC( TIP_URLENCODE )
{
pszRet[ nPosRet ] = '+';
}
else if(
( cElem >= 'A' && cElem <= 'Z' ) ||
( cElem >= 'a' && cElem <= 'z' ) ||
( cElem >= '0' && cElem <= '9' ) ||
cElem == '.' || cElem == ',' || cElem == '&' ||
cElem == '/' || cElem == ';' || cElem == '_' )
else if( ( cElem >= 'A' && cElem <= 'Z' ) ||
( cElem >= 'a' && cElem <= 'z' ) ||
( cElem >= '0' && cElem <= '9' ) ||
cElem == '.' || cElem == ',' || cElem == '&' ||
cElem == '/' || cElem == ';' || cElem == '_' )
{
pszRet[ nPosRet ] = cElem;
}
@@ -92,7 +91,7 @@ HB_FUNC( TIP_URLENCODE )
HB_UINT uiVal;
pszRet[ nPosRet++ ] = '%';
uiVal = ( ( HB_UCHAR ) cElem ) >> 4;
pszRet[ nPosRet ] = ( char ) ( ( uiVal < 10 ? '0' : 'A' - 10 ) + uiVal );
pszRet[ nPosRet++ ] = ( char ) ( ( uiVal < 10 ? '0' : 'A' - 10 ) + uiVal );
uiVal = ( ( HB_UCHAR ) cElem ) & 0x0F;
pszRet[ nPosRet ] = ( char ) ( ( uiVal < 10 ? '0' : 'A' - 10 ) + uiVal );
}
@@ -138,7 +137,7 @@ HB_FUNC( TIP_URLDECODE )
( cElem >= 'A' ? 'A' - 10 : '0' ) );
pszRet[ nPosRet ] <<= 4;
cElem = pszData[ ++nPos ];
pszRet[ nPosRet ] = cElem - ( cElem >= 'a' ? 'a' - 10 :
pszRet[ nPosRet ] |= cElem - ( cElem >= 'a' ? 'a' - 10 :
( cElem >= 'A' ? 'A' - 10 : '0' ) );
}
else

6
src/common/hbver.c
View File

@@ -73,6 +73,12 @@
#ifndef VER_NT_WORKSTATION
#define VER_NT_WORKSTATION 0x0000001
#endif
#ifndef VER_NT_DOMAIN_CONTROLLER
#define VER_NT_DOMAIN_CONTROLLER 0x0000002
#endif
#ifndef VER_NT_SERVER
#define VER_NT_SERVER 0x0000003
#endif
#ifndef VER_MINORVERSION
#define VER_MINORVERSION 0x0000001

2
src/pp/ppcore.c
View File

@@ -1228,7 +1228,7 @@ static void hb_pp_getLine( PHB_PP_STATE pState )
nLen += hb_membufLen( pState->pBuffer ) - u;
pBuffer = hb_membufPtr( pState->pBuffer ) + u - n;
--n;
while( ++n < nLen && pBuffer[ n ] != ch );
while( ++n < nLen && pBuffer[ n ] != ch ) {}
}
else
{

4
src/rtl/hbsocket.c
View File

@@ -208,7 +208,9 @@
#if defined( HB_OS_WIN )
# include <winsock2.h>
# include <ws2tcpip.h>
# include <iphlpapi.h>
# if ! defined( __DMC__ )
# include <iphlpapi.h>
# endif
#else
# include <errno.h>
# if defined( HB_OS_DOS )