From 1581b2ae9bca5f210517a51ec40a68532e6c2ae5 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 18 May 2010 07:20:20 +0000
Subject: [PATCH] 2010-05-18 09:19 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * src/rtl/memvarhb.prg     * HB_MVSAVE(): reset to be a FUNCTION
 to avoid the "volatile"       return value and better imitate __MVSAVE()
 behavior.     % HB_MVSAVE(): deleted unnecessary UPPER().     - Deleted TODO.

  * ChangeLog
    * Marked TODOs as done. (Thanks Przemek)
---
 harbour/ChangeLog            | 32 +++++++++++++++++++++-----------
 harbour/src/rtl/memvarhb.prg |  8 +++-----
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index bbe1404f13..0a932a5c06 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-18 09:19 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * src/rtl/memvarhb.prg
+    * HB_MVSAVE(): reset to be a FUNCTION to avoid the "volatile"
+      return value and better imitate __MVSAVE() behavior.
+    % HB_MVSAVE(): deleted unnecessary UPPER().
+    - Deleted TODO.
+
+  * ChangeLog
+    * Marked TODOs as done. (Thanks Przemek)
+
 2010-15-17 23:59 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbqt/hbqt_hbqplaintextedit.cpp
   * contrib/hbqt/hbqt_hbqplaintextedit.h
@@ -27,15 +37,15 @@
         ::clearSelection()        == Sh+F11
       If a selection mode is initiated by above three methods,
       it can only be exited by calling the same method again.
-      During such selection process all other keys than navigable 
+      During such selection process all other keys than navigable
       keys will remain disabled. Mouse-move will also not work.
       Mouch click will work. If Column selection mode is ON,
-      caret will not show up. Toolbar icon will not respond to 
+      caret will not show up. Toolbar icon will not respond to
       change such action. Once exited, previous normal behavior
       for stream and column selection will be available.
 
       Please test.
- 
+
 2010-15-17 19:05 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbqt/hbqt_hbqplaintextedit.cpp
   * contrib/hbqt/hbqt_hbqplaintextedit.h
@@ -78,16 +88,16 @@
   * contrib/hbide/ideedit.prg
   * contrib/hbide/ideeditor.prg
   * contrib/hbide/ideshortcuts.prg
-    + Added: navigational methods plus methods pertaining to 
+    + Added: navigational methods plus methods pertaining to
         line operations into public API. Naviagable methods are :
-        ::up(), ::down(), ::pageUp(), ::pageDown(), ::goTop(), 
+        ::up(), ::down(), ::pageUp(), ::pageDown(), ::goTop(),
         ::goBottom(), ::right(), ::left(), ::end(), ::home(),
-        ::panEnd(), ::panHome(). 
+        ::panEnd(), ::panHome().
         //
         These methods can be used in combination with selection modes.
-        
+
     + Grouped: public methods list by category which is displayed
-        under visually distinguished colors. Now it is easy to find 
+        under visually distinguished colors. Now it is easy to find
         a method of interest easily. Before it was a literal mess.
 
 2010-05-18 02:25 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
@@ -123,10 +133,10 @@
       file format with default '.hbv' extension.
 
     ; TOFIX: __MVRESTORE() restores variables as PRIVATEs
-             while HB_MVRESTORE() as PUBLIC.
+             while HB_MVRESTORE() as PUBLIC. [DONE]
     ; NOTE: GETLIST exclusion is solved with simple trick,
-            as I couldn't find how it's solved in __MVSAVE().
-    ; Consider this experimental solution to the problem.
+            as I couldn't find how it's solved in __MVSAVE(). [SOLVED]
+    ; Consider this experimental solution to the problem. [FINALIZED]
 
   * contrib/hbmysql/tmysql.prg
     % STOD( "" ) -> STOD()
diff --git a/harbour/src/rtl/memvarhb.prg b/harbour/src/rtl/memvarhb.prg
index d2596438cc..f7bac5bc1e 100644
--- a/harbour/src/rtl/memvarhb.prg
+++ b/harbour/src/rtl/memvarhb.prg
@@ -50,8 +50,6 @@
  *
  */
 
-/* TOFIX: PUBLICs are created on restore, instead of PRIVATEs */
-
 #include "hbmemvar.ch"
 #include "common.ch"
 #include "error.ch"
@@ -59,7 +57,7 @@
 
 #define _HBMEM_EXT ".hbv"
 
-PROCEDURE HB_MVSAVE( cFileName, cMask, lIncludeMask )
+FUNCTION HB_MVSAVE( cFileName, cMask, lIncludeMask )
    LOCAL nCount
    LOCAL xValue
    LOCAL cName
@@ -104,7 +102,7 @@ PROCEDURE HB_MVSAVE( cFileName, cMask, lIncludeMask )
             IF ValType( xValue ) $ "CNDTL"
                lMatch := hb_WildMatchI( cMask, cName )
                IF iif( lIncludeMask, lMatch, ! lMatch )
-                  AAdd( aVars, { Upper( cName ), xValue } )
+                  AAdd( aVars, { cName, xValue } )
                ENDIF
             ENDIF
          NEXT
@@ -153,7 +151,7 @@ PROCEDURE HB_MVSAVE( cFileName, cMask, lIncludeMask )
       Eval( ErrorBlock(), oError )
    ENDIF
 
-   RETURN
+   RETURN NIL
 
 FUNCTION HB_MVRESTORE( cFileName, lAdditive, cMask, lIncludeMask )
    LOCAL item