stuff

5 files changed, 20 insertions, 19 deletions

diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index e3e62a143..d7842a519 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -107,8 +107,8 @@ struct GNUNET_PeerIdentity
 /**
  * Function called with a filename.
  *
- * @param filename complete filename (absolute path)
  * @param cls closure
+ * @param filename complete filename (absolute path)
  * @return GNUNET_OK to continue to iterate,
  *  GNUNET_SYSERR to abort iteration with error!
  */
diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h
index aa35c82ee..a506362f2 100644
--- a/src/include/gnunet_datastore_service.h
+++ b/src/include/gnunet_datastore_service.h
@@ -72,9 +72,9 @@ extern "C"
 #define GNUNET_DATASTORE_BLOCKTYPE_ONDEMAND 5
 
 /**
- * FIXME.
+ * Type of a block that is used to advertise a namespace.  
  */
-#define GNUNET_DATASTORE_BLOCKTYPE_SKBLOCK 6 /* not yet used */
+#define GNUNET_DATASTORE_BLOCKTYPE_NBLOCK 6
 
 
 /**
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h
index 111dcd5ac..fe0394335 100644
--- a/src/include/gnunet_fs_service.h
+++ b/src/include/gnunet_fs_service.h
@@ -435,9 +435,9 @@ GNUNET_FS_getopt_set_keywords (struct GNUNET_GETOPT_CommandLineProcessorContext*
  */
 int
 GNUNET_FS_getopt_set_metadata (struct GNUNET_GETOPT_CommandLineProcessorContext* ctx, 
-                                         void *scls,
-                                         const char *option,
-                                         const char *value);
+                               void *scls,
+                               const char *option,
+                               const char *value);
 
 
 
@@ -2044,22 +2044,20 @@ GNUNET_FS_unindex_stop (struct GNUNET_FS_UnindexContext *uc);
  * @param anonymity for the namespace advertismement
  * @param priority for the namespace advertisement
  * @param expiration for the namespace advertisement
- * @param advertisementURI the keyword (!) URI to advertise the
- *        namespace under (we will create a GNUNET_EC_KNBlock)
- * @param rootEntry name of the root entry in the namespace (for
- *        the namespace advertisement)
- *
- * @return uri of the advertisement
+ * @param rootEntry name of the root of the namespace
+ * @param cont continuation
+ * @param cont_cls closure for cont
  */
-struct GNUNET_FS_Uri *
+void
 GNUNET_FS_namespace_advertise (struct GNUNET_FS_Handle *h,
                                struct GNUNET_FS_Namespace *namespace,
                                const struct GNUNET_CONTAINER_MetaData *meta,
                                uint32_t anonymity,
                                uint32_t priority,
                                struct GNUNET_TIME_Absolute expiration,
-                               const struct GNUNET_FS_Uri *advertisementURI,
-                               const char *rootEntry);
+                               const char *rootEntry,
+                               GNUNET_FS_PublishContinuation cont,
+                               void *cont_cls);
 
 
 /**
diff --git a/src/include/gnunet_hello_lib.h b/src/include/gnunet_hello_lib.h
index d7d116c74..6191c4f7e 100644
--- a/src/include/gnunet_hello_lib.h
+++ b/src/include/gnunet_hello_lib.h
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2001, 2002, 2003, 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
+     (C) 2001, 2002, 2003, 2004, 2005, 2006, 2010 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
@@ -207,8 +207,6 @@ int
 GNUNET_HELLO_get_id (const struct GNUNET_HELLO_Message *hello,
                      struct GNUNET_PeerIdentity *peer);
 
-
-
 /* ifndef GNUNET_HELLO_LIB_H */
 #endif
 /* end of gnunet_hello_lib.h */
diff --git a/src/include/gnunet_signatures.h b/src/include/gnunet_signatures.h
index 29aa36811..8b71bb616 100644
--- a/src/include/gnunet_signatures.h
+++ b/src/include/gnunet_signatures.h
@@ -77,9 +77,14 @@ extern "C"
 #define GNUNET_SIGNATURE_PURPOSE_FS_SBLOCK 6
 
 /**
+ * Signature of advertisment for a namespace.
+ */
+#define GNUNET_SIGNATURE_PURPOSE_FS_NBLOCK 7
+
+/**
  *
  */
-#define GNUNET_SIGNATURE_PURPOSE_RESOLVER_RESPONSE 7
+#define GNUNET_SIGNATURE_PURPOSE_RESOLVER_RESPONSE 8
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */