diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-09-10 22:17:19 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-09-10 22:17:19 +0000 |
commit | 7dc9c567366b73f192eaf4eab4570e6119e07000 (patch) | |
tree | 03b0db913f12dfa0e575ff5d735902360e0df3b7 /src/include/gnunet_fs_service.h | |
parent | d0e3840931750ca4bf4848d950ab9a0c0b5022bc (diff) | |
download | gnunet-7dc9c567366b73f192eaf4eab4570e6119e07000.tar.gz gnunet-7dc9c567366b73f192eaf4eab4570e6119e07000.zip |
eliminating use of 'namespace' as a fieldname / variable name to be C++ compatible
Diffstat (limited to 'src/include/gnunet_fs_service.h')
-rw-r--r-- | src/include/gnunet_fs_service.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h index 0308011a6..b35134313 100644 --- a/src/include/gnunet_fs_service.h +++ b/src/include/gnunet_fs_service.h | |||
@@ -55,7 +55,7 @@ extern "C" | |||
55 | * 9.0.0: CPS-style integrated API | 55 | * 9.0.0: CPS-style integrated API |
56 | * 9.1.1: asynchronous directory scanning | 56 | * 9.1.1: asynchronous directory scanning |
57 | */ | 57 | */ |
58 | #define GNUNET_FS_VERSION 0x00090102 | 58 | #define GNUNET_FS_VERSION 0x00090103 |
59 | 59 | ||
60 | 60 | ||
61 | /* ******************** URI API *********************** */ | 61 | /* ******************** URI API *********************** */ |
@@ -1396,7 +1396,7 @@ struct GNUNET_FS_ProgressInfo | |||
1396 | */ | 1396 | */ |
1397 | struct GNUNET_HashCode id; | 1397 | struct GNUNET_HashCode id; |
1398 | 1398 | ||
1399 | } namespace; | 1399 | } ns; |
1400 | 1400 | ||
1401 | } specifics; | 1401 | } specifics; |
1402 | 1402 | ||
@@ -1994,7 +1994,7 @@ enum GNUNET_FS_PublishOptions | |||
1994 | * | 1994 | * |
1995 | * @param h handle to the file sharing subsystem | 1995 | * @param h handle to the file sharing subsystem |
1996 | * @param fi information about the file or directory structure to publish | 1996 | * @param fi information about the file or directory structure to publish |
1997 | * @param namespace namespace to publish the file in, NULL for no namespace | 1997 | * @param ns namespace to publish the file in, NULL for no namespace |
1998 | * @param nid identifier to use for the publishd content in the namespace | 1998 | * @param nid identifier to use for the publishd content in the namespace |
1999 | * (can be NULL, must be NULL if namespace is NULL) | 1999 | * (can be NULL, must be NULL if namespace is NULL) |
2000 | * @param nuid update-identifier that will be used for future updates | 2000 | * @param nuid update-identifier that will be used for future updates |
@@ -2005,7 +2005,7 @@ enum GNUNET_FS_PublishOptions | |||
2005 | struct GNUNET_FS_PublishContext * | 2005 | struct GNUNET_FS_PublishContext * |
2006 | GNUNET_FS_publish_start (struct GNUNET_FS_Handle *h, | 2006 | GNUNET_FS_publish_start (struct GNUNET_FS_Handle *h, |
2007 | struct GNUNET_FS_FileInformation *fi, | 2007 | struct GNUNET_FS_FileInformation *fi, |
2008 | struct GNUNET_FS_Namespace *namespace, const char *nid, | 2008 | struct GNUNET_FS_Namespace *ns, const char *nid, |
2009 | const char *nuid, | 2009 | const char *nuid, |
2010 | enum GNUNET_FS_PublishOptions options); | 2010 | enum GNUNET_FS_PublishOptions options); |
2011 | 2011 | ||
@@ -2083,7 +2083,7 @@ struct GNUNET_FS_PublishSksContext; | |||
2083 | * Publish an SBlock on GNUnet. | 2083 | * Publish an SBlock on GNUnet. |
2084 | * | 2084 | * |
2085 | * @param h handle to the file sharing subsystem | 2085 | * @param h handle to the file sharing subsystem |
2086 | * @param namespace namespace to publish in | 2086 | * @param ns namespace to publish in |
2087 | * @param identifier identifier to use | 2087 | * @param identifier identifier to use |
2088 | * @param update update identifier to use | 2088 | * @param update update identifier to use |
2089 | * @param meta metadata to use | 2089 | * @param meta metadata to use |
@@ -2096,7 +2096,7 @@ struct GNUNET_FS_PublishSksContext; | |||
2096 | */ | 2096 | */ |
2097 | struct GNUNET_FS_PublishSksContext * | 2097 | struct GNUNET_FS_PublishSksContext * |
2098 | GNUNET_FS_publish_sks (struct GNUNET_FS_Handle *h, | 2098 | GNUNET_FS_publish_sks (struct GNUNET_FS_Handle *h, |
2099 | struct GNUNET_FS_Namespace *namespace, | 2099 | struct GNUNET_FS_Namespace *ns, |
2100 | const char *identifier, const char *update, | 2100 | const char *identifier, const char *update, |
2101 | const struct GNUNET_CONTAINER_MetaData *meta, | 2101 | const struct GNUNET_CONTAINER_MetaData *meta, |
2102 | const struct GNUNET_FS_Uri *uri, | 2102 | const struct GNUNET_FS_Uri *uri, |
@@ -2188,7 +2188,7 @@ struct GNUNET_FS_AdvertisementContext; | |||
2188 | * | 2188 | * |
2189 | * @param h handle to the file sharing subsystem | 2189 | * @param h handle to the file sharing subsystem |
2190 | * @param ksk_uri keywords to use for advertisment | 2190 | * @param ksk_uri keywords to use for advertisment |
2191 | * @param namespace handle for the namespace that should be advertised | 2191 | * @param ns handle for the namespace that should be advertised |
2192 | * @param meta meta-data for the namespace advertisement | 2192 | * @param meta meta-data for the namespace advertisement |
2193 | * @param bo block options | 2193 | * @param bo block options |
2194 | * @param rootEntry name of the root of the namespace | 2194 | * @param rootEntry name of the root of the namespace |
@@ -2199,7 +2199,7 @@ struct GNUNET_FS_AdvertisementContext; | |||
2199 | struct GNUNET_FS_AdvertisementContext * | 2199 | struct GNUNET_FS_AdvertisementContext * |
2200 | GNUNET_FS_namespace_advertise (struct GNUNET_FS_Handle *h, | 2200 | GNUNET_FS_namespace_advertise (struct GNUNET_FS_Handle *h, |
2201 | struct GNUNET_FS_Uri *ksk_uri, | 2201 | struct GNUNET_FS_Uri *ksk_uri, |
2202 | struct GNUNET_FS_Namespace *namespace, | 2202 | struct GNUNET_FS_Namespace *ns, |
2203 | const struct GNUNET_CONTAINER_MetaData *meta, | 2203 | const struct GNUNET_CONTAINER_MetaData *meta, |
2204 | const struct GNUNET_FS_BlockOptions *bo, | 2204 | const struct GNUNET_FS_BlockOptions *bo, |
2205 | const char *rootEntry, | 2205 | const char *rootEntry, |
@@ -2243,14 +2243,14 @@ GNUNET_FS_namespace_dup (struct GNUNET_FS_Namespace *ns); | |||
2243 | * memory) or also to freeze the namespace to prevent further | 2243 | * memory) or also to freeze the namespace to prevent further |
2244 | * insertions by anyone. | 2244 | * insertions by anyone. |
2245 | * | 2245 | * |
2246 | * @param namespace handle to the namespace that should be deleted / freed | 2246 | * @param ns handle to the namespace that should be deleted / freed |
2247 | * @param freeze prevents future insertions; creating a namespace | 2247 | * @param freeze prevents future insertions; creating a namespace |
2248 | * with the same name again will create a fresh namespace instead | 2248 | * with the same name again will create a fresh namespace instead |
2249 | * | 2249 | * |
2250 | * @return GNUNET_OK on success, GNUNET_SYSERR on error | 2250 | * @return GNUNET_OK on success, GNUNET_SYSERR on error |
2251 | */ | 2251 | */ |
2252 | int | 2252 | int |
2253 | GNUNET_FS_namespace_delete (struct GNUNET_FS_Namespace *namespace, int freeze); | 2253 | GNUNET_FS_namespace_delete (struct GNUNET_FS_Namespace *ns, int freeze); |
2254 | 2254 | ||
2255 | 2255 | ||
2256 | /** | 2256 | /** |
@@ -2312,13 +2312,13 @@ typedef void (*GNUNET_FS_IdentifierProcessor) (void *cls, const char *last_id, | |||
2312 | * cause the library to call "ip" with all children of the node. Note | 2312 | * cause the library to call "ip" with all children of the node. Note |
2313 | * that cycles within an SCC are possible (including self-loops). | 2313 | * that cycles within an SCC are possible (including self-loops). |
2314 | * | 2314 | * |
2315 | * @param namespace namespace to inspect for updateable content | 2315 | * @param ns namespace to inspect for updateable content |
2316 | * @param next_id ID to look for; use NULL to look for SCC roots | 2316 | * @param next_id ID to look for; use NULL to look for SCC roots |
2317 | * @param ip function to call on each updateable identifier | 2317 | * @param ip function to call on each updateable identifier |
2318 | * @param ip_cls closure for ip | 2318 | * @param ip_cls closure for ip |
2319 | */ | 2319 | */ |
2320 | void | 2320 | void |
2321 | GNUNET_FS_namespace_list_updateable (struct GNUNET_FS_Namespace *namespace, | 2321 | GNUNET_FS_namespace_list_updateable (struct GNUNET_FS_Namespace *ns, |
2322 | const char *next_id, | 2322 | const char *next_id, |
2323 | GNUNET_FS_IdentifierProcessor ip, | 2323 | GNUNET_FS_IdentifierProcessor ip, |
2324 | void *ip_cls); | 2324 | void *ip_cls); |