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/fs/fs_publish.c | |
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/fs/fs_publish.c')
-rw-r--r-- | src/fs/fs_publish.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c index 6f8a9d248..30ab1ee6f 100644 --- a/src/fs/fs_publish.c +++ b/src/fs/fs_publish.c | |||
@@ -83,10 +83,10 @@ publish_cleanup (struct GNUNET_FS_PublishContext *pc) | |||
83 | pc->fhc = NULL; | 83 | pc->fhc = NULL; |
84 | } | 84 | } |
85 | GNUNET_FS_file_information_destroy (pc->fi, NULL, NULL); | 85 | GNUNET_FS_file_information_destroy (pc->fi, NULL, NULL); |
86 | if (pc->namespace != NULL) | 86 | if (pc->ns != NULL) |
87 | { | 87 | { |
88 | GNUNET_FS_namespace_delete (pc->namespace, GNUNET_NO); | 88 | GNUNET_FS_namespace_delete (pc->ns, GNUNET_NO); |
89 | pc->namespace = NULL; | 89 | pc->ns = NULL; |
90 | } | 90 | } |
91 | GNUNET_free_non_null (pc->nid); | 91 | GNUNET_free_non_null (pc->nid); |
92 | GNUNET_free_non_null (pc->nuid); | 92 | GNUNET_free_non_null (pc->nuid); |
@@ -269,8 +269,8 @@ publish_sblocks_cont (void *cls, const struct GNUNET_FS_Uri *uri, | |||
269 | static void | 269 | static void |
270 | publish_sblock (struct GNUNET_FS_PublishContext *pc) | 270 | publish_sblock (struct GNUNET_FS_PublishContext *pc) |
271 | { | 271 | { |
272 | if (NULL != pc->namespace) | 272 | if (NULL != pc->ns) |
273 | pc->sks_pc = GNUNET_FS_publish_sks (pc->h, pc->namespace, pc->nid, pc->nuid, | 273 | pc->sks_pc = GNUNET_FS_publish_sks (pc->h, pc->ns, pc->nid, pc->nuid, |
274 | pc->fi->meta, pc->fi->chk_uri, &pc->fi->bo, | 274 | pc->fi->meta, pc->fi->chk_uri, &pc->fi->bo, |
275 | pc->options, &publish_sblocks_cont, pc); | 275 | pc->options, &publish_sblocks_cont, pc); |
276 | else | 276 | else |
@@ -1105,7 +1105,7 @@ finish_reserve (void *cls, int success, | |||
1105 | * | 1105 | * |
1106 | * @param h handle to the file sharing subsystem | 1106 | * @param h handle to the file sharing subsystem |
1107 | * @param fi information about the file or directory structure to publish | 1107 | * @param fi information about the file or directory structure to publish |
1108 | * @param namespace namespace to publish the file in, NULL for no namespace | 1108 | * @param ns namespace to publish the file in, NULL for no namespace |
1109 | * @param nid identifier to use for the publishd content in the namespace | 1109 | * @param nid identifier to use for the publishd content in the namespace |
1110 | * (can be NULL, must be NULL if namespace is NULL) | 1110 | * (can be NULL, must be NULL if namespace is NULL) |
1111 | * @param nuid update-identifier that will be used for future updates | 1111 | * @param nuid update-identifier that will be used for future updates |
@@ -1116,7 +1116,7 @@ finish_reserve (void *cls, int success, | |||
1116 | struct GNUNET_FS_PublishContext * | 1116 | struct GNUNET_FS_PublishContext * |
1117 | GNUNET_FS_publish_start (struct GNUNET_FS_Handle *h, | 1117 | GNUNET_FS_publish_start (struct GNUNET_FS_Handle *h, |
1118 | struct GNUNET_FS_FileInformation *fi, | 1118 | struct GNUNET_FS_FileInformation *fi, |
1119 | struct GNUNET_FS_Namespace *namespace, const char *nid, | 1119 | struct GNUNET_FS_Namespace *ns, const char *nid, |
1120 | const char *nuid, | 1120 | const char *nuid, |
1121 | enum GNUNET_FS_PublishOptions options) | 1121 | enum GNUNET_FS_PublishOptions options) |
1122 | { | 1122 | { |
@@ -1138,11 +1138,11 @@ GNUNET_FS_publish_start (struct GNUNET_FS_Handle *h, | |||
1138 | ret->dsh = dsh; | 1138 | ret->dsh = dsh; |
1139 | ret->h = h; | 1139 | ret->h = h; |
1140 | ret->fi = fi; | 1140 | ret->fi = fi; |
1141 | ret->namespace = namespace; | 1141 | ret->ns = ns; |
1142 | ret->options = options; | 1142 | ret->options = options; |
1143 | if (namespace != NULL) | 1143 | if (ns != NULL) |
1144 | { | 1144 | { |
1145 | namespace->rc++; | 1145 | ns->rc++; |
1146 | GNUNET_assert (NULL != nid); | 1146 | GNUNET_assert (NULL != nid); |
1147 | ret->nid = GNUNET_strdup (nid); | 1147 | ret->nid = GNUNET_strdup (nid); |
1148 | if (NULL != nuid) | 1148 | if (NULL != nuid) |