[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r3518 - in GNUnet/src: applications/fs/fsui util/os
From: |
grothoff |
Subject: |
[GNUnet-SVN] r3518 - in GNUnet/src: applications/fs/fsui util/os |
Date: |
Fri, 20 Oct 2006 20:45:03 -0700 (PDT) |
Author: grothoff
Date: 2006-10-20 20:44:58 -0700 (Fri, 20 Oct 2006)
New Revision: 3518
Modified:
GNUnet/src/applications/fs/fsui/deserialize.c
GNUnet/src/applications/fs/fsui/serialize.c
GNUnet/src/util/os/statuscalls.c
Log:
bugfixes
Modified: GNUnet/src/applications/fs/fsui/deserialize.c
===================================================================
--- GNUnet/src/applications/fs/fsui/deserialize.c 2006-10-21 03:30:07 UTC
(rev 3517)
+++ GNUnet/src/applications/fs/fsui/deserialize.c 2006-10-21 03:44:58 UTC
(rev 3518)
@@ -510,7 +510,9 @@
READLONG(l.start_time);
if (l.start_time != 0)
l.start_time = (get_time() - stime) + l.start_time;
- READURI(l.uri);
+ l.uri = NULL;
+ if (big == 1)
+ READURI(l.uri);
l.filename = read_string(fd, 1024*1024);
if (l.filename == NULL) {
ECRS_freeUri(l.uri);
Modified: GNUnet/src/applications/fs/fsui/serialize.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serialize.c 2006-10-21 03:30:07 UTC (rev
3517)
+++ GNUnet/src/applications/fs/fsui/serialize.c 2006-10-21 03:44:58 UTC (rev
3518)
@@ -232,10 +232,7 @@
while (upos != NULL) {
if (upos->parent == &ctx->activeUploads) {
shared = upos->shared;
- if (shared->extractor_config != NULL)
- WRITEINT(fd, 2);
- else
- WRITEINT(fd, 3);
+ WRITEINT(fd, (shared->extractor_config != NULL) ? 2 : 3);
WRITEINT(fd, shared->doIndex);
WRITEINT(fd, shared->anonymityLevel);
WRITEINT(fd, shared->priority);
@@ -245,14 +242,15 @@
WRITESTRING(fd, shared->extractor_config);
} else {
WRITEINT(fd, 1);
- WRITEINT(fd, 1);
+ WRITEINT(fd, (upos->uri != NULL) ? 1 : 2);
}
WRITEINT(fd, upos->state);
WRITELONG(fd, upos->completed);
WRITELONG(fd, upos->total);
WRITELONG(fd, get_time());
WRITELONG(fd, upos->start_time);
- writeURI(fd, upos->uri);
+ if (upos->uri != NULL)
+ writeURI(fd, upos->uri);
WRITESTRING(fd, upos->filename);
writeUploads(fd, ctx, upos->child);
upos = upos->next;
Modified: GNUnet/src/util/os/statuscalls.c
===================================================================
--- GNUnet/src/util/os/statuscalls.c 2006-10-21 03:30:07 UTC (rev 3517)
+++ GNUnet/src/util/os/statuscalls.c 2006-10-21 03:44:58 UTC (rev 3518)
@@ -486,6 +486,7 @@
monitor->ifcsSize,
0);
MUTEX_DESTROY(monitor->statusMutex);
+ FREE(monitor);
}
/* end of statuscalls.c */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r3518 - in GNUnet/src: applications/fs/fsui util/os,
grothoff <=