[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r3843 - in GNUnet/src/applications: fs/fsui gap
From: |
grothoff |
Subject: |
[GNUnet-SVN] r3843 - in GNUnet/src/applications: fs/fsui gap |
Date: |
Fri, 1 Dec 2006 17:06:18 -0800 (PST) |
Author: grothoff
Date: 2006-12-01 17:06:14 -0800 (Fri, 01 Dec 2006)
New Revision: 3843
Modified:
GNUnet/src/applications/fs/fsui/download.c
GNUnet/src/applications/fs/fsui/serializetest2.c
GNUnet/src/applications/gap/gap.c
Log:
s
Modified: GNUnet/src/applications/fs/fsui/download.c
===================================================================
--- GNUnet/src/applications/fs/fsui/download.c 2006-12-02 00:28:44 UTC (rev
3842)
+++ GNUnet/src/applications/fs/fsui/download.c 2006-12-02 01:06:14 UTC (rev
3843)
@@ -116,7 +116,7 @@
fi->uri,
fi->meta,
fullName,
- NULL,
+ parent->search,
parent);
FREE(fullName);
return OK;
Modified: GNUnet/src/applications/fs/fsui/serializetest2.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serializetest2.c 2006-12-02 00:28:44 UTC
(rev 3842)
+++ GNUnet/src/applications/fs/fsui/serializetest2.c 2006-12-02 01:06:14 UTC
(rev 3843)
@@ -74,8 +74,7 @@
search = NULL;
break;
case FSUI_download_suspended:
- if ( (event->data.DownloadSuspended.dc.pos == download) &&
- (event->data.DownloadSuspended.dc.spos != search) ) {
+ if (event->data.DownloadSuspended.dc.spos != search) {
fprintf(stderr,
"Download suspended but search reference not set correctly.\n");
have_error = 1;
@@ -94,12 +93,6 @@
download);
have_error = 1;
}
- if ( (event->data.DownloadSuspended.dc.pos != download) &&
- (event->data.DownloadSuspended.dc.spos != NULL) ) {
- fprintf(stderr,
- "Download suspended but search reference not set to NULL.\n");
- have_error = 1;
- }
if (event->data.DownloadSuspended.dc.pos == download)
download = NULL;
break;
@@ -112,8 +105,7 @@
case FSUI_download_resumed:
if (download == NULL)
download = event->data.DownloadResumed.dc.pos;
- if ( (event->data.DownloadResumed.dc.pos == download) &&
- (event->data.DownloadResumed.dc.spos != search) ) {
+ if (event->data.DownloadResumed.dc.spos != search) {
fprintf(stderr,
"Download resuming but search reference not set correctly.\n");
have_error = 1;
@@ -130,12 +122,6 @@
"Download resuming but parent reference not set correctly.\n");
have_error = 1;
}
- if ( (event->data.DownloadResumed.dc.pos != download) &&
- (event->data.DownloadResumed.dc.spos != NULL) ) {
- fprintf(stderr,
- "Download resuming but search reference not set to NULL.\n");
- have_error = 1;
- }
#if DEBUG_VERBOSE
printf("Download resuming\n");
#endif
@@ -161,8 +147,7 @@
#endif
break;
case FSUI_download_completed:
- if ( (event->data.DownloadCompleted.dc.pos == download) &&
- (event->data.DownloadCompleted.dc.spos != search) ) {
+ if (event->data.DownloadCompleted.dc.spos != search) {
fprintf(stderr,
"Download completed but search reference not set correctly.\n");
have_error = 1;
@@ -179,19 +164,12 @@
"Download completed but parent reference not set correctly.\n");
have_error = 1;
}
- if ( (event->data.DownloadCompleted.dc.pos != download) &&
- (event->data.DownloadCompleted.dc.spos != NULL) ) {
- fprintf(stderr,
- "Download completed but search reference not set to NULL.\n");
- have_error = 1;
- }
#if DEBUG_VERBOSE
printf("Download complete.\n");
#endif
break;
case FSUI_download_progress:
- if ( (event->data.DownloadResumed.dc.pos == download) &&
- (event->data.DownloadResumed.dc.spos != search) ) {
+ if (event->data.DownloadResumed.dc.spos != search) {
fprintf(stderr,
"Download progressing but search reference not set correctly.\n");
have_error = 1;
@@ -208,12 +186,6 @@
"Download progressing but parent reference not set correctly.\n");
have_error = 1;
}
- if ( (event->data.DownloadResumed.dc.pos != download) &&
- (event->data.DownloadResumed.dc.spos != NULL) ) {
- fprintf(stderr,
- "Download progressing but search reference not set to NULL.\n");
- have_error = 1;
- }
#if DEBUG_VERBOSE
printf("Download is progressing (%llu/%llu)...\n",
event->data.DownloadProgress.completed,
@@ -257,8 +229,7 @@
case FSUI_download_started:
if (download == NULL)
download = event->data.DownloadStarted.dc.pos;
- if ( (event->data.DownloadStarted.dc.pos == download) &&
- (event->data.DownloadStarted.dc.spos != search) ) {
+ if (event->data.DownloadStarted.dc.spos != search) {
fprintf(stderr,
"Download started but search reference not set correctly.\n");
have_error = 1;
@@ -275,16 +246,9 @@
"Download started but parent reference not set correctly.\n");
have_error = 1;
}
- if ( (event->data.DownloadStarted.dc.pos != download) &&
- (event->data.DownloadStarted.dc.spos != NULL) ) {
- fprintf(stderr,
- "Download started but search reference not set to NULL.\n");
- have_error = 1;
- }
break;
case FSUI_download_stopped:
- if ( (event->data.DownloadStopped.dc.pos == download) &&
- (event->data.DownloadStopped.dc.spos != search) ) {
+ if (event->data.DownloadStopped.dc.spos != search) {
fprintf(stderr,
"Download stopped but search reference not set correctly.\n");
have_error = 1;
@@ -301,12 +265,6 @@
"Download stopped but parent reference not set correctly.\n");
have_error = 1;
}
- if ( (event->data.DownloadStopped.dc.pos != download) &&
- (event->data.DownloadStopped.dc.spos != NULL) ) {
- fprintf(stderr,
- "Download stopped but search reference not set to NULL.\n");
- have_error = 1;
- }
break;
case FSUI_upload_started:
case FSUI_upload_stopped:
Modified: GNUnet/src/applications/gap/gap.c
===================================================================
--- GNUnet/src/applications/gap/gap.c 2006-12-02 00:28:44 UTC (rev 3842)
+++ GNUnet/src/applications/gap/gap.c 2006-12-02 01:06:14 UTC (rev 3843)
@@ -2201,7 +2201,7 @@
capi->registerHandler(P2P_PROTO_gap_QUERY,
&handleQuery);
capi->registerHandler(P2P_PROTO_gap_RESULT,
- (MessagePartHandler) &useContent);
+ &useContent);
coreAPI->registerSendCallback(sizeof(P2P_gap_query_MESSAGE),
&fillInQuery);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r3843 - in GNUnet/src/applications: fs/fsui gap,
grothoff <=