r23801: The FSF has moved around a lot. This fixes their Mass Ave address.

[kai/samba.git] / source3 / registry / reg_cachehook.c

diff --git a/source3/registry/reg_cachehook.c b/source3/registry/reg_cachehook.c
index c8a23777be0995b5acce88c0cbeffb0b5f8cdbf8..cbb7ec6b92bc98661e1d9ca3de738010b50999d6 100644 (file)
--- a/source3/registry/reg_cachehook.c
+++ b/source3/registry/reg_cachehook.c
@@ -5,7 +5,7 @@
  *
  *  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 of the License, or
+ *  the Free Software Foundation; either version 3 of the License, or
  *  (at your option) any later version.
  *  
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *  
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Implementation of registry hook cache tree */
@@ -36,7 +35,7 @@ static REGISTRY_HOOK default_hook = { KEY_TREE_ROOT, &regdb_ops };
 
 BOOL reghook_cache_init( void )
 {
-       cache_tree = pathtree_init( &default_hook, NULL, NULL );
+       cache_tree = pathtree_init( &default_hook, NULL );
 
        return ( cache_tree == NULL );
 }
@@ -79,7 +78,7 @@ REGISTRY_HOOK* reghook_cache_find( const char *keyname )
        /* prepend the string with a '\' character */
        
        len = strlen( keyname );
-       if ( !(key = SMB_MALLOC( len + 2 )) ) {
+       if ( !(key = (char *)SMB_MALLOC( len + 2 )) ) {
                DEBUG(0,("reghook_cache_find: malloc failed for string [%s] !?!?!\n",
                        keyname));
                return NULL;
@@ -94,7 +93,7 @@ REGISTRY_HOOK* reghook_cache_find( const char *keyname )
                
        DEBUG(10,("reghook_cache_find: Searching for keyname [%s]\n", key));
        
-       hook = pathtree_find( cache_tree, key ) ;
+       hook = (REGISTRY_HOOK *)pathtree_find( cache_tree, key ) ;
        
        SAFE_FREE( key );