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

[gnunet]

Author: grothoff
Date: 2013-08-08 17:24:44 +0200 (Thu, 08 Aug 2013)
New Revision: 28474

Modified:
   gnunet/src/fs/fs_publish_ksk.c
   gnunet/src/fs/fs_publish_ublock.c
   gnunet/src/fs/fs_search.c
   gnunet/src/fs/plugin_block_fs.c
Log:
-minor fixes

Modified: gnunet/src/fs/fs_publish_ksk.c
===================================================================
--- gnunet/src/fs/fs_publish_ksk.c      2013-08-08 15:24:32 UTC (rev 28473)
+++ gnunet/src/fs/fs_publish_ksk.c      2013-08-08 15:24:44 UTC (rev 28474)
@@ -168,7 +168,8 @@
   keyword = pkc->ksk_uri->data.ksk.keywords[pkc->i++];
   pkc->uc = GNUNET_FS_publish_ublock_ (pkc->h,
                                       pkc->dsh,
-                                      keyword, NULL,
+                                      keyword + 1 /* skip '+' */,
+                                      NULL,
                                       GNUNET_CRYPTO_ecc_key_get_anonymous (),
                                       pkc->meta,
                                       pkc->uri,

Modified: gnunet/src/fs/fs_publish_ublock.c
===================================================================
--- gnunet/src/fs/fs_publish_ublock.c   2013-08-08 15:24:32 UTC (rev 28473)
+++ gnunet/src/fs/fs_publish_ublock.c   2013-08-08 15:24:44 UTC (rev 28474)
@@ -190,7 +190,7 @@
   uris = GNUNET_FS_uri_to_string (uri);
   slen = strlen (uris) + 1;
   if (NULL == ulabel)
-    ulen = 0;
+    ulen = 1;
   else
     ulen = strlen (ulabel) + 1;
   size = mdsize + sizeof (struct UBlock) + slen + ulen;
@@ -201,7 +201,8 @@
   }
   ub_plain = GNUNET_malloc (size);
   kbe = (char *) &ub_plain[1];
-  memcpy (kbe, ulabel, ulen);
+  if (NULL != ulabel)
+    memcpy (kbe, ulabel, ulen);
   kbe += ulen;
   memcpy (kbe, uris, slen);
   kbe += slen;

Modified: gnunet/src/fs/fs_search.c
===================================================================
--- gnunet/src/fs/fs_search.c   2013-08-08 15:24:32 UTC (rev 28473)
+++ gnunet/src/fs/fs_search.c   2013-08-08 15:24:44 UTC (rev 28474)
@@ -558,7 +558,7 @@
   is_new = (NULL == sr) || (sr->mandatory_missing > 0);
   if (NULL == sr)
   {
-    sr = GNUNET_malloc (sizeof (struct GNUNET_FS_SearchResult));
+    sr = GNUNET_new (struct GNUNET_FS_SearchResult);
     sr->h = sc->h;
     sr->sc = sc;
     sr->anonymity = sc->anonymity;
@@ -639,7 +639,7 @@
                                                   &test_result_present,
                                                   (void *) uri))
     return;                     /* duplicate result */
-  sr = GNUNET_malloc (sizeof (struct GNUNET_FS_SearchResult));
+  sr = GNUNET_new (struct GNUNET_FS_SearchResult);
   sr->h = sc->h;
   sr->sc = sc;
   sr->anonymity = sc->anonymity;
@@ -721,7 +721,8 @@
  * @param size size of nb
  */
 static void
-process_kblock (struct GNUNET_FS_SearchContext *sc, const struct UBlock *ub,
+process_kblock (struct GNUNET_FS_SearchContext *sc, 
+               const struct UBlock *ub,
                 size_t size)
 {
   size_t j;
@@ -793,7 +794,6 @@
   size_t off;
   char *emsg;
 
-  /* decrypt */
   GNUNET_FS_ublock_decrypt_ (&ub[1], len,
                             &sc->uri->data.sks.ns,
                             sc->uri->data.sks.identifier,
@@ -837,7 +837,8 @@
  * @param size size of data
  */
 static void
-process_result (struct GNUNET_FS_SearchContext *sc, enum GNUNET_BLOCK_Type 
type,
+process_result (struct GNUNET_FS_SearchContext *sc, 
+               enum GNUNET_BLOCK_Type type,
                 struct GNUNET_TIME_Absolute expiration, 
                const void *data,
                 size_t size)
@@ -1106,7 +1107,7 @@
                                         &dpub);
     GNUNET_CRYPTO_hash (&dpub,
                        sizeof (dpub),
-                       &sm->query);
+                       &sm->query); 
     mbc.put_cnt = (size - msize) / sizeof (struct GNUNET_HashCode);
     sqms = GNUNET_CONTAINER_multihashmap_size (sc->master_result_map);
     mbc.put_cnt = GNUNET_MIN (mbc.put_cnt, sqms - mbc.skip_cnt);

Modified: gnunet/src/fs/plugin_block_fs.c
===================================================================
--- gnunet/src/fs/plugin_block_fs.c     2013-08-08 15:24:32 UTC (rev 28473)
+++ gnunet/src/fs/plugin_block_fs.c     2013-08-08 15:24:44 UTC (rev 28474)
@@ -198,7 +198,7 @@
   };
   struct GNUNET_BLOCK_PluginFunctions *api;
 
-  api = GNUNET_malloc (sizeof (struct GNUNET_BLOCK_PluginFunctions));
+  api = GNUNET_new (struct GNUNET_BLOCK_PluginFunctions);
   api->evaluate = &block_plugin_fs_evaluate;
   api->get_key = &block_plugin_fs_get_key;
   api->types = types;