[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r3951 - in GNUnet/src/applications/fs: . module
From: |
grothoff |
Subject: |
[GNUnet-SVN] r3951 - in GNUnet/src/applications/fs: . module |
Date: |
Sat, 16 Dec 2006 19:54:24 -0800 (PST) |
Author: grothoff
Date: 2006-12-16 19:54:22 -0800 (Sat, 16 Dec 2006)
New Revision: 3951
Modified:
GNUnet/src/applications/fs/ecrs_core.c
GNUnet/src/applications/fs/module/ondemand.c
Log:
normal
Modified: GNUnet/src/applications/fs/ecrs_core.c
===================================================================
--- GNUnet/src/applications/fs/ecrs_core.c 2006-12-17 03:37:02 UTC (rev
3950)
+++ GNUnet/src/applications/fs/ecrs_core.c 2006-12-17 03:54:22 UTC (rev
3951)
@@ -84,7 +84,6 @@
if (! equalsHashCode512(query,
&hc)) {
FREE(val);
- GE_BREAK(NULL, 0);
*value = NULL;
return SYSERR;
}
Modified: GNUnet/src/applications/fs/module/ondemand.c
===================================================================
--- GNUnet/src/applications/fs/module/ondemand.c 2006-12-17 03:37:02 UTC
(rev 3950)
+++ GNUnet/src/applications/fs/module/ondemand.c 2006-12-17 03:54:22 UTC
(rev 3951)
@@ -369,19 +369,19 @@
}
odb = (OnDemandBlock*) dbv;
fn = getOnDemandFile(&odb->fileId);
-
- fileHandle = disk_file_open(ectx,
- fn,
- O_LARGEFILE | O_RDONLY,
- 0);
- if (fileHandle == -1) {
+ if ( (YES != disk_file_test(ectx,
+ fn)) ||
+ (-1 == (fileHandle = disk_file_open(ectx,
+ fn,
+ O_LARGEFILE | O_RDONLY,
+ 0))) ) {
char unavail_key[256];
EncName enc;
unsigned long long * first_unavail;
struct stat linkStat;
GE_LOG_STRERROR_FILE(ectx,
- GE_ERROR | GE_ADMIN | GE_USER | GE_BULK,
+ GE_WARNING | GE_ADMIN | GE_USER | GE_BULK,
"open",
fn);
@@ -494,7 +494,7 @@
ntohl(odb->blockSize));
if (blen != ntohl(odb->blockSize)) {
GE_LOG_STRERROR_FILE(ectx,
- GE_ERROR | GE_ADMIN | GE_USER | GE_BULK,
+ GE_WARNING | GE_ADMIN | GE_USER | GE_BULK,
"read",
fn);
FREE(fn);
@@ -512,8 +512,8 @@
FREE(fn);
if (ret == SYSERR) {
GE_LOG(ectx,
- GE_ERROR | GE_BULK | GE_USER,
- "Indexed content does not match its hash.\n");
+ GE_WARNING | GE_BULK | GE_USER,
+ _("Indexed content changed (does not match its hash).\n"));
asyncDelete(datastore, dbv, query);
return SYSERR;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r3951 - in GNUnet/src/applications/fs: . module,
grothoff <=