/*
This file is part of GNUnet.
- (C) 2009, 2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009, 2011 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @author Christian Grothoff
*/
#include "platform.h"
+#if HAVE_EXTRACTOR_H
#include <extractor.h>
+#endif
#include "gnunet_fs_service.h"
#include "fs_api.h"
#include "fs_tree.h"
char fn_conv[MAX_PATH];
#endif
- /* FIXME: should includeSymLinks be GNUNET_NO or GNUNET_YES here? */
+ /* FIXME: should include_symbolic_links be GNUNET_NO or GNUNET_YES here? */
if (GNUNET_OK != GNUNET_DISK_file_size (filename, &fsize, GNUNET_NO, GNUNET_YES))
{
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "stat", filename);
return NULL;
}
fi = GNUNET_FS_make_file_reader_context_ (filename);
- if (fi == NULL)
+ if (NULL == fi)
{
GNUNET_break (0);
return NULL;
GNUNET_break (0);
return NULL;
}
- ret = GNUNET_malloc (sizeof (struct GNUNET_FS_FileInformation));
+ ret = GNUNET_new (struct GNUNET_FS_FileInformation);
ret->h = h;
ret->client_info = client_info;
ret->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
* Test if a given entry represents a directory.
*
* @param ent check if this FI represents a directory
- * @return GNUNET_YES if so, GNUNET_NO if not
+ * @return #GNUNET_YES if so, #GNUNET_NO if not
*/
int
GNUNET_FS_file_information_is_directory (const struct GNUNET_FS_FileInformation
/**
* Create an entry for an empty directory in a publish-structure.
- * This function should be used by applications for which the
- * use of "GNUNET_FS_file_information_create_from_directory"
- * is not appropriate.
*
* @param h handle to the file sharing subsystem
* @param client_info initial value for the client-info value for this entry
{
struct GNUNET_FS_FileInformation *ret;
- ret = GNUNET_malloc (sizeof (struct GNUNET_FS_FileInformation));
+ ret = GNUNET_new (struct GNUNET_FS_FileInformation);
ret->h = h;
ret->client_info = client_info;
ret->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
int no;
no = GNUNET_NO;
- if (fi->is_directory == GNUNET_YES)
+ if (GNUNET_YES == fi->is_directory)
{
/* clean up directory */
while (NULL != (pos = fi->data.dir.entries))
}
GNUNET_free_non_null (fi->filename);
GNUNET_free_non_null (fi->emsg);
- GNUNET_free_non_null (fi->chk_uri);
+ if (NULL != fi->sks_uri)
+ GNUNET_FS_uri_destroy (fi->sks_uri);
+ if (NULL != fi->chk_uri)
+ GNUNET_FS_uri_destroy (fi->chk_uri);
/* clean up serialization */
if ((NULL != fi->serialization) && (0 != UNLINK (fi->serialization)))
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink",
GNUNET_free_non_null (fi->serialization);
if (NULL != fi->te)
{
- GNUNET_FS_tree_encoder_finish (fi->te, NULL, NULL);
+ GNUNET_FS_tree_encoder_finish (fi->te, NULL);
fi->te = NULL;
}
GNUNET_free (fi);