diff --git a/ChangeLog.txt b/ChangeLog.txt index 1020cf20ef..85ae4b880c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,14 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2014-10-02 16:20 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * contrib/sddsqlt3/core.c + * removed dummy break statements + + * contrib/xhb/xhbmvinf.c + ! store memvar values instead of references to memvar variables in + array returned by __mvSymbolInfo() + 2014-10-01 22:24 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * include/hbapi.h * src/common/hbstr.c diff --git a/contrib/sddsqlt3/core.c b/contrib/sddsqlt3/core.c index 2cf3bb82e9..0bac8c6536 100644 --- a/contrib/sddsqlt3/core.c +++ b/contrib/sddsqlt3/core.c @@ -215,23 +215,18 @@ static HB_USHORT sqlite3DeclType(sqlite3_stmt * st, HB_USHORT uiIndex ) { case SQLITE_TEXT: return HB_FT_STRING; - break; case SQLITE_FLOAT: return HB_FT_LONG; - break; case SQLITE_INTEGER: return HB_FT_INTEGER; - break; case SQLITE_BLOB: return HB_FT_BLOB; - break; case SQLITE_NULL: return HB_FT_ANY; - break; } return HB_FT_NONE; diff --git a/contrib/xhb/xhbmvinf.c b/contrib/xhb/xhbmvinf.c index 1db836e61c..b0822aa3fd 100644 --- a/contrib/xhb/xhbmvinf.c +++ b/contrib/xhb/xhbmvinf.c @@ -58,12 +58,17 @@ HB_FUNC( __MVSYMBOLINFO ) if( pArray ) { HB_SIZE nLen = hb_arrayLen( pArray ), n; + PHB_ITEM pValue = hb_itemNew( NULL ); + for( n = 1; n <= nLen; ++n ) { PHB_ITEM pItem = hb_arrayGetItemPtr( pArray, n ); PHB_SYMB pSym = hb_arrayGetSymbol( pItem, 1 ); + hb_itemCopyFromRef( pValue, hb_arrayGetItemPtr( pItem, 2 ) ); hb_arraySetC( pItem, 1, pSym->szName ); + hb_arraySetForward( pItem, 2, pValue ); } + hb_itemRelease( pValue ); hb_itemReturnRelease( pArray ); } else