[GNUnet-SVN] r19694 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2012-02-05 09:37:13 +0100 (Sun, 05 Feb 2012)
New Revision: 19694

Modified:
   gnunet/src/fs/fs_directory.c
   gnunet/src/fs/gnunet-directory.c
Log:
-eliminate printing warning on MAGIC missmatch (#2138)

Modified: gnunet/src/fs/fs_directory.c
===================================================================
--- gnunet/src/fs/fs_directory.c        2012-02-04 22:27:13 UTC (rev 19693)
+++ gnunet/src/fs/fs_directory.c        2012-02-05 08:37:13 UTC (rev 19694)
@@ -197,11 +197,7 @@
   if ((offset == 0) &&
       ((size < 8 + sizeof (uint32_t)) ||
        (0 != memcmp (cdata, GNUNET_FS_DIRECTORY_MAGIC, 8))))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _("MAGIC mismatch.  This is not a GNUnet directory.\n"));
     return GNUNET_SYSERR;
-  }
   pos = offset;
   if (offset == 0)
   {

Modified: gnunet/src/fs/gnunet-directory.c
===================================================================
--- gnunet/src/fs/gnunet-directory.c    2012-02-04 22:27:13 UTC (rev 19693)
+++ gnunet/src/fs/gnunet-directory.c    2012-02-05 08:37:13 UTC (rev 19694)
@@ -150,8 +150,11 @@
     len = (size_t) size;
     data = GNUNET_DISK_file_map (h, &map, GNUNET_DISK_MAP_TYPE_READ, len);
     GNUNET_assert (NULL != data);
-    GNUNET_FS_directory_list_contents (len, data, 0, &print_entry, NULL);
-    printf ("\n");
+    if (GNUNET_OK != GNUNET_FS_directory_list_contents (len, data, 0, 
&print_entry, NULL))
+      fprintf (stdout, _("`%s' is not a GNUnet directory\n"),
+              filename);
+    else
+      printf ("\n");
     GNUNET_DISK_file_unmap (map);
     GNUNET_DISK_file_close (h);
   }