aboutsummaryrefslogtreecommitdiff
path: root/src/fs
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2010-06-20 11:32:18 +0000
committerChristian Grothoff <christian@grothoff.org>2010-06-20 11:32:18 +0000
commit739bdf5dab0611603296ee08fdd64ddcc4e0afe9 (patch)
treebb86342a199899fba56f3d96e45bcf45ee3c4761 /src/fs
parent10606865799e7f773ced218a594326aff4b14659 (diff)
downloadgnunet-739bdf5dab0611603296ee08fdd64ddcc4e0afe9.tar.gz
gnunet-739bdf5dab0611603296ee08fdd64ddcc4e0afe9.zip
pc not sc
Diffstat (limited to 'src/fs')
-rw-r--r--src/fs/fs_publish.c2
-rw-r--r--src/fs/test_fs_download.c2
-rw-r--r--src/fs/test_fs_download_indexed.c2
-rw-r--r--src/fs/test_fs_download_persistence.c6
-rw-r--r--src/fs/test_fs_list_indexed.c4
-rw-r--r--src/fs/test_fs_publish.c4
-rw-r--r--src/fs/test_fs_publish_persistence.c10
-rw-r--r--src/fs/test_fs_search.c2
-rw-r--r--src/fs/test_fs_search_persistence.c6
-rw-r--r--src/fs/test_fs_unindex.c2
-rw-r--r--src/fs/test_fs_unindex_persistence.c6
11 files changed, 23 insertions, 23 deletions
diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index 7a70b0558..2ebb96169 100644
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -85,7 +85,7 @@ GNUNET_FS_publish_make_status_ (struct GNUNET_FS_ProgressInfo *pi,
85 const struct GNUNET_FS_FileInformation *p, 85 const struct GNUNET_FS_FileInformation *p,
86 uint64_t offset) 86 uint64_t offset)
87{ 87{
88 pi->value.publish.sc = sc; 88 pi->value.publish.pc = sc;
89 pi->value.publish.fi = p; 89 pi->value.publish.fi = p;
90 pi->value.publish.cctx 90 pi->value.publish.cctx
91 = p->client_info; 91 = p->client_info;
diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c
index fdd0452c2..5cfbc391b 100644
--- a/src/fs/test_fs_download.c
+++ b/src/fs/test_fs_download.c
@@ -211,7 +211,7 @@ progress_cb (void *cls,
211 GNUNET_assert (1 == event->value.publish.anonymity); 211 GNUNET_assert (1 == event->value.publish.anonymity);
212 break; 212 break;
213 case GNUNET_FS_STATUS_PUBLISH_STOPPED: 213 case GNUNET_FS_STATUS_PUBLISH_STOPPED:
214 GNUNET_assert (publish == event->value.publish.sc); 214 GNUNET_assert (publish == event->value.publish.pc);
215 GNUNET_assert (FILESIZE == event->value.publish.size); 215 GNUNET_assert (FILESIZE == event->value.publish.size);
216 GNUNET_assert (1 == event->value.publish.anonymity); 216 GNUNET_assert (1 == event->value.publish.anonymity);
217 GNUNET_SCHEDULER_add_now (sched, 217 GNUNET_SCHEDULER_add_now (sched,
diff --git a/src/fs/test_fs_download_indexed.c b/src/fs/test_fs_download_indexed.c
index 87461d170..392488dc7 100644
--- a/src/fs/test_fs_download_indexed.c
+++ b/src/fs/test_fs_download_indexed.c
@@ -213,7 +213,7 @@ progress_cb (void *cls,
213 GNUNET_assert (1 == event->value.publish.anonymity); 213 GNUNET_assert (1 == event->value.publish.anonymity);
214 break; 214 break;
215 case GNUNET_FS_STATUS_PUBLISH_STOPPED: 215 case GNUNET_FS_STATUS_PUBLISH_STOPPED:
216 GNUNET_assert (publish == event->value.publish.sc); 216 GNUNET_assert (publish == event->value.publish.pc);
217 GNUNET_assert (FILESIZE == event->value.publish.size); 217 GNUNET_assert (FILESIZE == event->value.publish.size);
218 GNUNET_assert (1 == event->value.publish.anonymity); 218 GNUNET_assert (1 == event->value.publish.anonymity);
219 GNUNET_SCHEDULER_add_now (sched, 219 GNUNET_SCHEDULER_add_now (sched,
diff --git a/src/fs/test_fs_download_persistence.c b/src/fs/test_fs_download_persistence.c
index 82e19a797..f1fe8286f 100644
--- a/src/fs/test_fs_download_persistence.c
+++ b/src/fs/test_fs_download_persistence.c
@@ -241,12 +241,12 @@ progress_cb (void *cls,
241 NULL); 241 NULL);
242 break; 242 break;
243 case GNUNET_FS_STATUS_PUBLISH_SUSPEND: 243 case GNUNET_FS_STATUS_PUBLISH_SUSPEND:
244 GNUNET_assert (event->value.publish.sc == publish); 244 GNUNET_assert (event->value.publish.pc == publish);
245 publish = NULL; 245 publish = NULL;
246 break; 246 break;
247 case GNUNET_FS_STATUS_PUBLISH_RESUME: 247 case GNUNET_FS_STATUS_PUBLISH_RESUME:
248 GNUNET_assert (NULL == publish); 248 GNUNET_assert (NULL == publish);
249 publish = event->value.publish.sc; 249 publish = event->value.publish.pc;
250 break; 250 break;
251 case GNUNET_FS_STATUS_DOWNLOAD_SUSPEND: 251 case GNUNET_FS_STATUS_DOWNLOAD_SUSPEND:
252 GNUNET_assert (event->value.download.dc == download); 252 GNUNET_assert (event->value.download.dc == download);
@@ -270,7 +270,7 @@ progress_cb (void *cls,
270 GNUNET_assert (1 == event->value.publish.anonymity); 270 GNUNET_assert (1 == event->value.publish.anonymity);
271 break; 271 break;
272 case GNUNET_FS_STATUS_PUBLISH_STOPPED: 272 case GNUNET_FS_STATUS_PUBLISH_STOPPED:
273 GNUNET_assert (publish == event->value.publish.sc); 273 GNUNET_assert (publish == event->value.publish.pc);
274 GNUNET_assert (FILESIZE == event->value.publish.size); 274 GNUNET_assert (FILESIZE == event->value.publish.size);
275 GNUNET_assert (1 == event->value.publish.anonymity); 275 GNUNET_assert (1 == event->value.publish.anonymity);
276 GNUNET_FS_stop (fs); 276 GNUNET_FS_stop (fs);
diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c
index c938162f8..6a9c1a701 100644
--- a/src/fs/test_fs_list_indexed.c
+++ b/src/fs/test_fs_list_indexed.c
@@ -126,7 +126,7 @@ progress_cb (void *cls,
126 break; 126 break;
127 case GNUNET_FS_STATUS_PUBLISH_PROGRESS: 127 case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
128 ret = event->value.publish.cctx; 128 ret = event->value.publish.cctx;
129 GNUNET_assert (publish == event->value.publish.sc); 129 GNUNET_assert (publish == event->value.publish.pc);
130#if VERBOSE 130#if VERBOSE
131 printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", 131 printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
132 (unsigned long long) event->value.publish.completed, 132 (unsigned long long) event->value.publish.completed,
@@ -181,7 +181,7 @@ progress_cb (void *cls,
181 if (0 == strcmp ("list_indexed-context-dir", 181 if (0 == strcmp ("list_indexed-context-dir",
182 event->value.publish.cctx)) 182 event->value.publish.cctx))
183 { 183 {
184 GNUNET_assert (publish == event->value.publish.sc); 184 GNUNET_assert (publish == event->value.publish.pc);
185 publish = NULL; 185 publish = NULL;
186 } 186 }
187 break; 187 break;
diff --git a/src/fs/test_fs_publish.c b/src/fs/test_fs_publish.c
index f3cbeb7bb..6c80cdd51 100644
--- a/src/fs/test_fs_publish.c
+++ b/src/fs/test_fs_publish.c
@@ -110,7 +110,7 @@ progress_cb (void *cls,
110 break; 110 break;
111 case GNUNET_FS_STATUS_PUBLISH_PROGRESS: 111 case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
112 ret = event->value.publish.cctx; 112 ret = event->value.publish.cctx;
113 GNUNET_assert (publish == event->value.publish.sc); 113 GNUNET_assert (publish == event->value.publish.pc);
114#if VERBOSE 114#if VERBOSE
115 printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", 115 printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
116 (unsigned long long) event->value.publish.completed, 116 (unsigned long long) event->value.publish.completed,
@@ -168,7 +168,7 @@ progress_cb (void *cls,
168 case GNUNET_FS_STATUS_PUBLISH_STOPPED: 168 case GNUNET_FS_STATUS_PUBLISH_STOPPED:
169 if (0 == strcmp ("publish-context-dir", 169 if (0 == strcmp ("publish-context-dir",
170 event->value.publish.cctx)) 170 event->value.publish.cctx))
171 GNUNET_assert (publish == event->value.publish.sc); 171 GNUNET_assert (publish == event->value.publish.pc);
172 break; 172 break;
173 default: 173 default:
174 printf ("Unexpected event: %d\n", 174 printf ("Unexpected event: %d\n",
diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c
index d39a630db..7cb5cb9ea 100644
--- a/src/fs/test_fs_publish_persistence.c
+++ b/src/fs/test_fs_publish_persistence.c
@@ -159,7 +159,7 @@ progress_cb (void *cls,
159 case GNUNET_FS_STATUS_PUBLISH_PROGRESS: 159 case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
160 consider_restart (event->status); 160 consider_restart (event->status);
161 ret = event->value.publish.cctx; 161 ret = event->value.publish.cctx;
162 GNUNET_assert (publish == event->value.publish.sc); 162 GNUNET_assert (publish == event->value.publish.pc);
163#if VERBOSE 163#if VERBOSE
164 printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", 164 printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
165 (unsigned long long) event->value.publish.completed, 165 (unsigned long long) event->value.publish.completed,
@@ -169,13 +169,13 @@ progress_cb (void *cls,
169#endif 169#endif
170 break; 170 break;
171 case GNUNET_FS_STATUS_PUBLISH_SUSPEND: 171 case GNUNET_FS_STATUS_PUBLISH_SUSPEND:
172 if (event->value.publish.sc == publish) 172 if (event->value.publish.pc == publish)
173 publish = NULL; 173 publish = NULL;
174 break; 174 break;
175 case GNUNET_FS_STATUS_PUBLISH_RESUME: 175 case GNUNET_FS_STATUS_PUBLISH_RESUME:
176 if (NULL == publish) 176 if (NULL == publish)
177 { 177 {
178 publish = event->value.publish.sc; 178 publish = event->value.publish.pc;
179 return "publish-context-dir"; 179 return "publish-context-dir";
180 } 180 }
181 break; 181 break;
@@ -194,7 +194,7 @@ progress_cb (void *cls,
194 break; 194 break;
195 case GNUNET_FS_STATUS_PUBLISH_START: 195 case GNUNET_FS_STATUS_PUBLISH_START:
196 consider_restart (event->status); 196 consider_restart (event->status);
197 publish = event->value.publish.sc; 197 publish = event->value.publish.pc;
198 ret = event->value.publish.cctx; 198 ret = event->value.publish.cctx;
199 if (0 == strcmp ("publish-context1", 199 if (0 == strcmp ("publish-context1",
200 event->value.publish.cctx)) 200 event->value.publish.cctx))
@@ -227,7 +227,7 @@ progress_cb (void *cls,
227 consider_restart (event->status); 227 consider_restart (event->status);
228 if (0 == strcmp ("publish-context-dir", 228 if (0 == strcmp ("publish-context-dir",
229 event->value.publish.cctx)) 229 event->value.publish.cctx))
230 GNUNET_assert (publish == event->value.publish.sc); 230 GNUNET_assert (publish == event->value.publish.pc);
231 break; 231 break;
232 default: 232 default:
233 printf ("Unexpected event: %d\n", 233 printf ("Unexpected event: %d\n",
diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c
index 42687a743..42484374c 100644
--- a/src/fs/test_fs_search.c
+++ b/src/fs/test_fs_search.c
@@ -156,7 +156,7 @@ progress_cb (void *cls,
156 GNUNET_assert (1 == event->value.publish.anonymity); 156 GNUNET_assert (1 == event->value.publish.anonymity);
157 break; 157 break;
158 case GNUNET_FS_STATUS_PUBLISH_STOPPED: 158 case GNUNET_FS_STATUS_PUBLISH_STOPPED:
159 GNUNET_assert (publish == event->value.publish.sc); 159 GNUNET_assert (publish == event->value.publish.pc);
160 GNUNET_assert (FILESIZE == event->value.publish.size); 160 GNUNET_assert (FILESIZE == event->value.publish.size);
161 GNUNET_assert (1 == event->value.publish.anonymity); 161 GNUNET_assert (1 == event->value.publish.anonymity);
162 GNUNET_FS_stop (fs); 162 GNUNET_FS_stop (fs);
diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c
index ebcf10f9a..7ea0130ae 100644
--- a/src/fs/test_fs_search_persistence.c
+++ b/src/fs/test_fs_search_persistence.c
@@ -168,12 +168,12 @@ progress_cb (void *cls,
168 GNUNET_assert (search != NULL); 168 GNUNET_assert (search != NULL);
169 break; 169 break;
170 case GNUNET_FS_STATUS_PUBLISH_SUSPEND: 170 case GNUNET_FS_STATUS_PUBLISH_SUSPEND:
171 if (event->value.publish.sc == publish) 171 if (event->value.publish.pc == publish)
172 publish = NULL; 172 publish = NULL;
173 break; 173 break;
174 case GNUNET_FS_STATUS_PUBLISH_RESUME: 174 case GNUNET_FS_STATUS_PUBLISH_RESUME:
175 if (NULL == publish) 175 if (NULL == publish)
176 publish = event->value.publish.sc; 176 publish = event->value.publish.pc;
177 break; 177 break;
178 case GNUNET_FS_STATUS_SEARCH_RESULT: 178 case GNUNET_FS_STATUS_SEARCH_RESULT:
179 /* FIXME: consider_restart (event->status); cannot be tested with 179 /* FIXME: consider_restart (event->status); cannot be tested with
@@ -224,7 +224,7 @@ progress_cb (void *cls,
224 GNUNET_assert (1 == event->value.publish.anonymity); 224 GNUNET_assert (1 == event->value.publish.anonymity);
225 break; 225 break;
226 case GNUNET_FS_STATUS_PUBLISH_STOPPED: 226 case GNUNET_FS_STATUS_PUBLISH_STOPPED:
227 GNUNET_assert (publish == event->value.publish.sc); 227 GNUNET_assert (publish == event->value.publish.pc);
228 GNUNET_assert (FILESIZE == event->value.publish.size); 228 GNUNET_assert (FILESIZE == event->value.publish.size);
229 GNUNET_assert (1 == event->value.publish.anonymity); 229 GNUNET_assert (1 == event->value.publish.anonymity);
230 GNUNET_FS_stop (fs); 230 GNUNET_FS_stop (fs);
diff --git a/src/fs/test_fs_unindex.c b/src/fs/test_fs_unindex.c
index 81beb3382..21bdc3cb3 100644
--- a/src/fs/test_fs_unindex.c
+++ b/src/fs/test_fs_unindex.c
@@ -162,7 +162,7 @@ progress_cb (void *cls,
162 GNUNET_assert (1 == event->value.publish.anonymity); 162 GNUNET_assert (1 == event->value.publish.anonymity);
163 break; 163 break;
164 case GNUNET_FS_STATUS_PUBLISH_STOPPED: 164 case GNUNET_FS_STATUS_PUBLISH_STOPPED:
165 GNUNET_assert (publish == event->value.publish.sc); 165 GNUNET_assert (publish == event->value.publish.pc);
166 GNUNET_assert (FILESIZE == event->value.publish.size); 166 GNUNET_assert (FILESIZE == event->value.publish.size);
167 GNUNET_assert (1 == event->value.publish.anonymity); 167 GNUNET_assert (1 == event->value.publish.anonymity);
168 GNUNET_FS_stop (fs); 168 GNUNET_FS_stop (fs);
diff --git a/src/fs/test_fs_unindex_persistence.c b/src/fs/test_fs_unindex_persistence.c
index 9bf617ba2..ae7d09bb8 100644
--- a/src/fs/test_fs_unindex_persistence.c
+++ b/src/fs/test_fs_unindex_persistence.c
@@ -180,13 +180,13 @@ progress_cb (void *cls,
180#endif 180#endif
181 break; 181 break;
182 case GNUNET_FS_STATUS_PUBLISH_SUSPEND: 182 case GNUNET_FS_STATUS_PUBLISH_SUSPEND:
183 if (event->value.publish.sc == publish) 183 if (event->value.publish.pc == publish)
184 publish = NULL; 184 publish = NULL;
185 break; 185 break;
186 case GNUNET_FS_STATUS_PUBLISH_RESUME: 186 case GNUNET_FS_STATUS_PUBLISH_RESUME:
187 if (NULL == publish) 187 if (NULL == publish)
188 { 188 {
189 publish = event->value.publish.sc; 189 publish = event->value.publish.pc;
190 return "publish-context"; 190 return "publish-context";
191 } 191 }
192 break; 192 break;
@@ -225,7 +225,7 @@ progress_cb (void *cls,
225 GNUNET_assert (1 == event->value.publish.anonymity); 225 GNUNET_assert (1 == event->value.publish.anonymity);
226 break; 226 break;
227 case GNUNET_FS_STATUS_PUBLISH_STOPPED: 227 case GNUNET_FS_STATUS_PUBLISH_STOPPED:
228 GNUNET_assert (publish == event->value.publish.sc); 228 GNUNET_assert (publish == event->value.publish.pc);
229 GNUNET_assert (FILESIZE == event->value.publish.size); 229 GNUNET_assert (FILESIZE == event->value.publish.size);
230 GNUNET_assert (1 == event->value.publish.anonymity); 230 GNUNET_assert (1 == event->value.publish.anonymity);
231 GNUNET_FS_stop (fs); 231 GNUNET_FS_stop (fs);