Merge branch 'master' of ssh://gnunet.org/gnunet

2 files changed, 38 insertions, 8 deletions

diff --git a/src/util/buffer.c b/src/util/buffer.c
index d0261889e..8fb10c2a5 100644
--- a/src/util/buffer.c
+++ b/src/util/buffer.c
@@ -248,3 +248,35 @@ GNUNET_buffer_write_vfstr (struct GNUNET_Buffer *buf,
   buf->position += res;
   GNUNET_assert (buf->position <= buf->capacity);
 }
+
+
+/**
+ * Write data encoded via #GNUNET_STRINGS_data_to_string to the buffer.
+ *
+ * Grows the buffer if necessary.
+ *
+ * @param buf buffer to write to
+ * @param data data to read from
+ * @param len number of bytes to copy from @a data to @a buf
+ */
+void
+GNUNET_buffer_write_data_encoded (struct GNUNET_Buffer *buf,
+                                  const char *data,
+                                  size_t len)
+{
+  size_t outlen = len * 8;
+
+  if (outlen % 5 > 0)
+    outlen += 5 - outlen % 5;
+  outlen /= 5;
+
+  GNUNET_buffer_ensure_remaining (buf, outlen);
+  GNUNET_assert (NULL !=
+                 GNUNET_STRINGS_data_to_string (data,
+                                                len,
+                                                (buf->mem +
+                                                 buf->position),
+                                                outlen));
+  buf->position += outlen;
+  GNUNET_assert (buf->position <= buf->capacity);
+}
diff --git a/src/util/disk.c b/src/util/disk.c
index 6560726ea..c95e9753c 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -1377,14 +1377,13 @@ GNUNET_DISK_file_map (const struct GNUNET_DISK_FileHandle *h,
                       enum GNUNET_DISK_MapType access,
                       size_t len)
 {
+  int prot;
+
   if (NULL == h)
   {
     errno = EINVAL;
     return NULL;
   }
-
-  int prot;
-
   prot = 0;
   if (access & GNUNET_DISK_MAP_TYPE_READ)
     prot = PROT_READ;
@@ -1405,22 +1404,21 @@ GNUNET_DISK_file_map (const struct GNUNET_DISK_FileHandle *h,
 
 /**
  * Unmap a file
+ *
  * @param h mapping handle
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
 GNUNET_DISK_file_unmap (struct GNUNET_DISK_MapHandle *h)
 {
   int ret;
 
-  if (h == NULL)
+  if (NULL == h)
   {
     errno = EINVAL;
     return GNUNET_SYSERR;
   }
-
   ret = munmap (h->addr, h->len) != -1 ? GNUNET_OK : GNUNET_SYSERR;
-
   GNUNET_free (h);
   return ret;
 }
@@ -1429,7 +1427,7 @@ GNUNET_DISK_file_unmap (struct GNUNET_DISK_MapHandle *h)
 /**
  * Write file changes to disk
  * @param h handle to an open file
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
 GNUNET_DISK_file_sync (const struct GNUNET_DISK_FileHandle *h)