diff options
Diffstat (limited to 'libglusterfs/src/trie.c')
| -rw-r--r-- | libglusterfs/src/trie.c | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/libglusterfs/src/trie.c b/libglusterfs/src/trie.c index 0572bfd3e..f96bbebf6 100644 --- a/libglusterfs/src/trie.c +++ b/libglusterfs/src/trie.c @@ -1,20 +1,11 @@ /* - Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com> + Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com> This file is part of GlusterFS. - GlusterFS 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 3 of the License, - or (at your option) any later version. - - GlusterFS is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or 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 this program. If not, see - <http://www.gnu.org/licenses/>. + This file is licensed to you under your choice of the GNU Lesser + General Public License, version 3 or any later version (LGPLv3 or + later), or the GNU General Public License, version 2 (GPLv2), in all + cases as published by the Free Software Foundation. */ #include <stdio.h> @@ -123,8 +114,7 @@ trienode_free (trienode_t *node) trienode_free (trav); } - if (node->data) - GF_FREE (node->data); + GF_FREE (node->data); GF_FREE (node); } @@ -382,8 +372,7 @@ trie_measure_vec (trie_t *trie, const char *word, struct trienodevec *nodevec) static int trienode_reset (trienode_t *node, void *data) { - if (node->data) - GF_FREE (node->data); + GF_FREE (node->data); return 0; } |