[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21101 - gnunet/src/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r21101 - gnunet/src/fs |
Date: |
Mon, 23 Apr 2012 09:50:10 +0200 |
Author: grothoff
Date: 2012-04-23 09:50:10 +0200 (Mon, 23 Apr 2012)
New Revision: 21101
Modified:
gnunet/src/fs/fs_unindex.c
Log:
-fixing leaks and error messages
Modified: gnunet/src/fs/fs_unindex.c
===================================================================
--- gnunet/src/fs/fs_unindex.c 2012-04-23 07:42:45 UTC (rev 21100)
+++ gnunet/src/fs/fs_unindex.c 2012-04-23 07:50:10 UTC (rev 21101)
@@ -341,7 +341,7 @@
{
uc->ksk_uri = GNUNET_FS_uri_dup (directory_scan_result->ksk_uri);
uc->state = UNINDEX_STATE_DS_REMOVE_KBLOCKS;
- uc->emsg = GNUNET_strdup (_("Failed to connect to `datastore'
service."));
+ uc->emsg = GNUNET_strdup (_("Failed to get KSKs from directory scan."));
GNUNET_FS_unindex_sync_ (uc);
GNUNET_FS_unindex_do_remove_kblocks_ (uc);
}
@@ -545,7 +545,7 @@
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pub;
struct GNUNET_CRYPTO_RsaPrivateKey *pk;
- if (NULL != uc->dsh)
+ if (NULL == uc->dsh)
uc->dsh = GNUNET_DATASTORE_connect (uc->h->cfg);
if (NULL == uc->dsh)
{
@@ -610,7 +610,8 @@
void
GNUNET_FS_unindex_do_remove_ (struct GNUNET_FS_UnindexContext *uc)
{
- uc->dsh = GNUNET_DATASTORE_connect (uc->h->cfg);
+ if (NULL != uc->dsh)
+ uc->dsh = GNUNET_DATASTORE_connect (uc->h->cfg);
if (NULL == uc->dsh)
{
uc->state = UNINDEX_STATE_ERROR;
@@ -840,6 +841,7 @@
(uc->state ==
UNINDEX_STATE_COMPLETE) ? uc->file_size :
0);
GNUNET_break (NULL == uc->client_info);
+ GNUNET_free_non_null (uc->emsg);
GNUNET_free (uc->filename);
GNUNET_free (uc);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21101 - gnunet/src/fs,
gnunet <=