X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Fclose.c;h=781a63fe747541b992dd36d02e5fd54f4dcd223e;hb=3dc61ce9fd0ee13d348119d4269027afe7a67479;hp=0044e9aca7aaafac78268e3cb0191099722f9791;hpb=896c0427df9d8eff5de6a1735dcd992e067df844;p=idzebra-moved-to-github.git

diff --git a/dict/close.c b/dict/close.c
index 0044e9a..781a63f 100644
--- a/dict/close.c
+++ b/dict/close.c
@@ -1,8 +1,5 @@
-/* $Id: close.c,v 1.7 2002-08-02 19:26:55 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 Index Data
 
 Zebra 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
@@ -15,9 +12,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 
@@ -27,21 +24,31 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdio.h>
 #include <assert.h>
 
-#include <dict.h>
+#include "dict-p.h"
 
-int dict_close (Dict dict)
+int dict_close(Dict dict)
 {
-    assert (dict);
+    if (!dict)
+	return 0;
 
     if (dict->rw)
     {
         void *head_buf;
-        dict_bf_readp (dict->dbf, 0, &head_buf);
-        memcpy (head_buf, &dict->head, sizeof(dict->head));
-        dict_bf_touch (dict->dbf, 0);        
+        dict_bf_readp(dict->dbf, 0, &head_buf);
+        memcpy(head_buf, &dict->head, sizeof(dict->head));
+        dict_bf_touch(dict->dbf, 0);        
     }
-    dict_bf_close (dict->dbf);
-    xfree (dict);
+    dict_bf_close(dict->dbf);
+    xfree(dict);
     return 0;
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+