From 889ef46369b8bddcf5a1925bcaed5949525ee9fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= <druzus@poczta.onet.pl>
Date: Fri, 25 Nov 2022 18:14:56 +0100
Subject: [PATCH] 2022-11-25 18:14 UTC+0100 Przemyslaw Czerpak
 (druzus/at/poczta.onet.pl)   * include/hbapi.h   * src/vm/cmdarg.c     !
 changed returned type in hb_verSvnID() form int to HB_MAXINT

  * src/nortl/nortl.c
    ! fixed void* pointer incrementation
    ! pacified warnings

  * src/rdd/dbcmd.c
    * accept NIL value in hb_FieldPut() according to Aleksander recommendation
---
 ChangeLog.txt     | 12 ++++++++++++
 include/hbapi.h   |  2 +-
 src/nortl/nortl.c |  6 +++---
 src/rdd/dbcmd.c   |  2 +-
 src/vm/cmdarg.c   |  2 +-
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 9d578a24e6..179749ac31 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,18 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2022-11-25 18:14 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * include/hbapi.h
+  * src/vm/cmdarg.c
+    ! changed returned type in hb_verSvnID() form int to HB_MAXINT
+
+  * src/nortl/nortl.c
+    ! fixed void* pointer incrementation
+    ! pacified warnings
+
+  * src/rdd/dbcmd.c
+    * accept NIL value in hb_FieldPut() according to Aleksander recommendation
+
 2022-11-11 21:15 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/hbcurl/core.c
     ! use hb_vmPushString() instead of hb_vmPushStringPcode()
diff --git a/include/hbapi.h b/include/hbapi.h
index 37680cdbc8..08da334e8a 100644
--- a/include/hbapi.h
+++ b/include/hbapi.h
@@ -1193,7 +1193,7 @@ extern HB_EXPORT HB_MAXINT    hb_verRevision( void );        /* retrieves source
 extern HB_EXPORT const char * hb_verChangeLogID( void );     /* retrieves a static buffer containing ChangeLog ID string */
 extern HB_EXPORT const char * hb_verChangeLogLastEntry( void ); /* retrieves a static buffer containing ChangeLog last entry string */
 #if defined( HB_LEGACY_LEVEL4 )
-extern HB_EXPORT int          hb_verSvnID( void );           /* retrieves source repository revision number */
+extern HB_EXPORT HB_MAXINT    hb_verSvnID( void );           /* retrieves source repository revision number */
 extern HB_EXPORT const char * hb_verSvnChangeLogID( void );  /* retrieves a static buffer containing ChangeLog ID string */
 extern HB_EXPORT const char * hb_verSvnLastEntry( void );    /* retrieves a static buffer containing ChangeLog last entry string */
 #endif
diff --git a/src/nortl/nortl.c b/src/nortl/nortl.c
index 609c9672a8..a61b2ed211 100644
--- a/src/nortl/nortl.c
+++ b/src/nortl/nortl.c
@@ -277,8 +277,8 @@ static char * hb_memToStr( char * szBuffer, void * pMem, HB_SIZE nSize )
       {
          int iLo = byMem[ i ] & 0x0f, iHi = byMem[ i ] >> 4;
          *pDest++ = '\\';
-         *pDest++ = iHi <= 9 ? '0' + iHi : 'A' - 10 + iHi;
-         *pDest++ = iLo <= 9 ? '0' + iLo : 'A' - 10 + iLo;
+         *pDest++ = ( char ) ( iHi <= 9 ? '0' + iHi : 'A' - 10 + iHi );
+         *pDest++ = ( char ) ( iLo <= 9 ? '0' + iLo : 'A' - 10 + iLo );
       }
    }
    *pDest = '\0';
@@ -313,7 +313,7 @@ void hb_xexit( void )
 
       for( i = 1, pMemBlock = s_pMemBlocks; pMemBlock; ++i, pMemBlock = pMemBlock->pNextBlock )
          HB_TRACE( HB_TR_ERROR, ( "Block %i %p (size %" HB_PFS "u) \"%s\"", i,
-                ( void * ) pMemBlock + HB_MEMINFO_SIZE, pMemBlock->nSize,
+                ( char * ) pMemBlock + HB_MEMINFO_SIZE, pMemBlock->nSize,
                 hb_memToStr( szBuffer, ( char * ) pMemBlock + HB_MEMINFO_SIZE,
                              pMemBlock->nSize ) ) );
    }
diff --git a/src/rdd/dbcmd.c b/src/rdd/dbcmd.c
index ae4a717673..f80ca91b98 100644
--- a/src/rdd/dbcmd.c
+++ b/src/rdd/dbcmd.c
@@ -2323,7 +2323,7 @@ HB_FUNC( HB_FIELDPUT )
       if( uiField > 0 )
       {
          PHB_ITEM pItem = hb_param( 2, HB_IT_ANY );
-         if( pItem && ! HB_IS_NIL( pItem ) )
+         if( pItem )
          {
             if( SELF_PUTVALUE( pArea, uiField, pItem ) == HB_SUCCESS )
                hb_itemReturn( pItem );
diff --git a/src/vm/cmdarg.c b/src/vm/cmdarg.c
index bf03d5d5c1..130ab5fe69 100644
--- a/src/vm/cmdarg.c
+++ b/src/vm/cmdarg.c
@@ -895,7 +895,7 @@ const char * hb_verChangeLogLastEntry( void )
 #if defined( HB_LEGACY_LEVEL4 )
 
 /* Source repository revision number */
-int hb_verSvnID( void )
+HB_MAXINT hb_verSvnID( void )
 {
    return HB_VER_REVID;
 }