projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Forget to commit some files
[oweals/gnunet.git]
/
src
/
fs
/
fs_publish_ksk.c
diff --git
a/src/fs/fs_publish_ksk.c
b/src/fs/fs_publish_ksk.c
index 67157f408bfe64175a6b0148cc1951715ad27239..05231adf2fcc77078f0880e70b2afe02ed92ac27 100644
(file)
--- a/
src/fs/fs_publish_ksk.c
+++ b/
src/fs/fs_publish_ksk.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2009, 2010, 2012, 2013 Christian Grothoff (and other contributing authors)
+
Copyright
(C) 2009, 2010, 2012, 2013 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
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., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
*/
/**
@@
-74,7
+74,7
@@
struct GNUNET_FS_PublishKskContext
/**
* Current task.
*/
/**
* Current task.
*/
-
GNUNET_SCHEDULER_TaskIdentifier
ksk_task;
+
struct GNUNET_SCHEDULER_Task *
ksk_task;
/**
* Function to call once we're done.
/**
* Function to call once we're done.
@@
-105,11
+105,11
@@
struct GNUNET_FS_PublishKskContext
/**
/**
- * Continuation of
"GNUNET_FS_publish_ksk"
that performs
+ * Continuation of
#GNUNET_FS_publish_ksk()
that performs
* the actual publishing operation (iterating over all
* of the keywords).
*
* the actual publishing operation (iterating over all
* of the keywords).
*
- * @param cls closure of type
"struct PublishKskContext*"
+ * @param cls closure of type
`struct PublishKskContext *`
* @param tc unused
*/
static void
* @param tc unused
*/
static void
@@
-121,7
+121,7
@@
publish_ksk_cont (void *cls,
* Function called by the datastore API with
* the result from the PUT request.
*
* Function called by the datastore API with
* the result from the PUT request.
*
- * @param cls closure of type
"struct GNUNET_FS_PublishKskContext*"
+ * @param cls closure of type
`struct GNUNET_FS_PublishKskContext *`
* @param msg error message (or NULL)
*/
static void
* @param msg error message (or NULL)
*/
static void
@@
-144,24
+144,27
@@
kb_put_cont (void *cls,
/**
/**
- * Continuation of
"GNUNET_FS_publish_ksk"
that performs the actual
+ * Continuation of
#GNUNET_FS_publish_ksk()
that performs the actual
* publishing operation (iterating over all of the keywords).
*
* publishing operation (iterating over all of the keywords).
*
- * @param cls closure of type
"struct GNUNET_FS_PublishKskContext*"
+ * @param cls closure of type
`struct GNUNET_FS_PublishKskContext *`
* @param tc unused
*/
static void
* @param tc unused
*/
static void
-publish_ksk_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+publish_ksk_cont (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_FS_PublishKskContext *pkc = cls;
const char *keyword;
{
struct GNUNET_FS_PublishKskContext *pkc = cls;
const char *keyword;
- pkc->ksk_task =
GNUNET_SCHEDULER_NO_TASK
;
+ pkc->ksk_task =
NULL
;
if ( (pkc->i == pkc->ksk_uri->data.ksk.keywordCount) ||
(NULL == pkc->dsh) )
{
if ( (pkc->i == pkc->ksk_uri->data.ksk.keywordCount) ||
(NULL == pkc->dsh) )
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "KSK PUT operation complete\n");
- pkc->cont (pkc->cont_cls, pkc->ksk_uri, NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "KSK PUT operation complete\n");
+ pkc->cont (pkc->cont_cls, pkc->ksk_uri,
+ NULL);
GNUNET_FS_publish_ksk_cancel (pkc);
return;
}
GNUNET_FS_publish_ksk_cancel (pkc);
return;
}
@@
-216,7
+219,9
@@
GNUNET_FS_publish_ksk (struct GNUNET_FS_Handle *h,
pkc->dsh = GNUNET_DATASTORE_connect (h->cfg);
if (NULL == pkc->dsh)
{
pkc->dsh = GNUNET_DATASTORE_connect (h->cfg);
if (NULL == pkc->dsh)
{
- cont (cont_cls, NULL, _("Could not connect to datastore."));
+ cont (cont_cls,
+ NULL,
+ _("Could not connect to datastore."));
GNUNET_free (pkc);
return NULL;
}
GNUNET_free (pkc);
return NULL;
}
@@
-236,10
+241,10
@@
GNUNET_FS_publish_ksk (struct GNUNET_FS_Handle *h,
void
GNUNET_FS_publish_ksk_cancel (struct GNUNET_FS_PublishKskContext *pkc)
{
void
GNUNET_FS_publish_ksk_cancel (struct GNUNET_FS_PublishKskContext *pkc)
{
- if (
GNUNET_SCHEDULER_NO_TASK
!= pkc->ksk_task)
+ if (
NULL
!= pkc->ksk_task)
{
GNUNET_SCHEDULER_cancel (pkc->ksk_task);
{
GNUNET_SCHEDULER_cancel (pkc->ksk_task);
- pkc->ksk_task =
GNUNET_SCHEDULER_NO_TASK
;
+ pkc->ksk_task =
NULL
;
}
if (NULL != pkc->uc)
{
}
if (NULL != pkc->uc)
{