1 files changed, 54 insertions, 39 deletions

diff --git a/src/fs/gnunet-fs-gtk-common.c b/src/fs/gnunet-fs-gtk-common.c
index c4058cd1..586c51fd 100644
--- a/src/fs/gnunet-fs-gtk-common.c
+++ b/src/fs/gnunet-fs-gtk-common.c
@@ -42,38 +42,38 @@ char *
 GNUNET_FS_GTK_dubious_meta_to_utf8 (enum EXTRACTOR_MetaFormat format,
                                     const char *data, size_t data_len)
 {
-  gchar *result = NULL;
-
-  if (format == EXTRACTOR_METAFORMAT_UTF8)
+  switch (format)
   {
+  case EXTRACTOR_METAFORMAT_UTF8:
     /* data must not contain NULLs (hence the -1) */
     if (g_utf8_validate (data, data_len - 1, NULL))
-      result = GNUNET_strdup (data);
-    else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Failed to validate supposedly utf-8 string `%s' of length %u, assuming it to be a C string\n",
-                  data, data_len);
-      format = EXTRACTOR_METAFORMAT_C_STRING;
-    }
-  }
-  if (format == EXTRACTOR_METAFORMAT_C_STRING)
-  {
+      return GNUNET_strdup (data);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                _("Failed to validate supposedly utf-8 string `%s' of length %u, assuming it to be a C string\n"),
+                data, 
+                (unsigned int) data_len);
+    format = EXTRACTOR_METAFORMAT_C_STRING;
+    /* fall-through */
+  case EXTRACTOR_METAFORMAT_C_STRING:  
     if (data_len > 0)
-    { /* There are no guarantees that data is NULL-terminated, AFAIU,
-      * so let's play it safe, shall we?
-      */
-      char *data_copy = GNUNET_malloc (data_len + 1);
+    {
+      /* There are no guarantees that data is NULL-terminated, AFAIU,
+       * so let's play it safe, shall we?
+       */
+      char data_copy[data_len + 1];
 
       memcpy (data_copy, data, data_len);
       data_copy[data_len] = '\0';
-      result = GNUNET_GTK_from_loc_to_utf8 (data_copy);
-      GNUNET_free (data_copy);
+      return GNUNET_GTK_from_loc_to_utf8 (data_copy);
     }
+    break;
+  default:
+    break;
   }
-  return result;
+  return NULL;
 }
 
+
 /**
  * Add meta data to list store.
  *
@@ -98,18 +98,15 @@ GNUNET_FS_GTK_add_meta_data_to_list_store (void *cls, const char *plugin_name,
                                            const char *data, size_t data_len)
 {
   GtkListStore *ls = GTK_LIST_STORE (cls);
-  gchar *data_to_insert = NULL;
+  char *data_to_insert;
 
   data_to_insert = GNUNET_FS_GTK_dubious_meta_to_utf8 (format, data, data_len);
-
-  if (NULL != data_to_insert)
-  {
-    gtk_list_store_insert_with_values (ls, NULL, G_MAXINT, 0, type, 1, format,
-                                       2, EXTRACTOR_metatype_to_string (type),
-                                       3, data_to_insert, -1);
-    g_free (data_to_insert);
-  }
-
+  if (NULL == data_to_insert)
+    return 0;
+  gtk_list_store_insert_with_values (ls, NULL, G_MAXINT, 0, type, 1, format,
+                                     2, EXTRACTOR_metatype_to_string (type),
+                                     3, data_to_insert, -1);
+  GNUNET_free (data_to_insert); 
   return 0;
 }
 
@@ -117,6 +114,9 @@ GNUNET_FS_GTK_add_meta_data_to_list_store (void *cls, const char *plugin_name,
 /**
  * Convert the year from the spin button to an expiration
  * time (on midnight, January 1st of that year).
+ *
+ * @param spin button with an expiration year
+ * @return expiration time in the usual GNUnet format
  */
 struct GNUNET_TIME_Absolute
 GNUNET_FS_GTK_get_expiration_time (GtkSpinButton * spin)
@@ -132,6 +132,14 @@ GNUNET_FS_GTK_get_expiration_time (GtkSpinButton * spin)
 }
 
 
+/**
+ * Initialize the 'expiration_year_adjustment' of the given
+ * builder to have a lower range of current-year+1 and a
+ * default of current-year+2.
+ *
+ * @param builder builder object for which we should manipulate
+ * the adjustment
+ */
 void
 GNUNET_FS_GTK_setup_expiration_year_adjustment (GtkBuilder * builder)
 {
@@ -146,6 +154,12 @@ GNUNET_FS_GTK_setup_expiration_year_adjustment (GtkBuilder * builder)
 }
 
 
+/**
+ * Obtain pixbuf from thumbnail data in meta data.
+ *
+ * @param meta input meta data
+ * @return NULL on error, otherwise the embedded thumbnail
+ */
 GdkPixbuf *
 GNUNET_FS_GTK_get_thumbnail_from_meta_data (const struct
                                             GNUNET_CONTAINER_MetaData *meta)
@@ -157,13 +171,13 @@ GNUNET_FS_GTK_get_thumbnail_from_meta_data (const struct
 
   thumb = NULL;
   ts = GNUNET_CONTAINER_meta_data_get_thumbnail (meta, &thumb);
-  if (ts == 0)
+  if (0 == ts)
     return NULL;
   loader = gdk_pixbuf_loader_new ();
   gdk_pixbuf_loader_write (loader, (const guchar *) thumb, ts, NULL);
   pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
   gdk_pixbuf_loader_close (loader, NULL);
-  if (pixbuf != NULL)
+  if (NULL != pixbuf)
     g_object_ref (pixbuf);
   g_object_unref (loader);
   GNUNET_free (thumb);
@@ -174,6 +188,10 @@ GNUNET_FS_GTK_get_thumbnail_from_meta_data (const struct
 /**
  * mmap the given file and run the GNUNET_FS_directory_list_contents
  * function on it.
+ *
+ * @param filename name with the directory
+ * @param dep function to call on each entry
+ * @param dep_cls closure for 'dep'
  */
 void
 GNUNET_FS_GTK_mmap_and_scan (const char *filename,
@@ -190,16 +208,13 @@ GNUNET_FS_GTK_mmap_and_scan (const char *filename,
     GNUNET_break (0);
     return;
   }
-  fh = GNUNET_DISK_file_open (filename, GNUNET_DISK_OPEN_READ,
-                              GNUNET_DISK_PERM_NONE);
-  if (fh == NULL)
+  if (NULL == (fh = GNUNET_DISK_file_open (filename, GNUNET_DISK_OPEN_READ,
+                                           GNUNET_DISK_PERM_NONE)))
   {
     GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "open", filename);
     return;
   }
-  ddata =
-      GNUNET_DISK_file_map (fh, &mh, GNUNET_DISK_MAP_TYPE_READ, (size_t) fsize);
-  if (ddata == NULL)
+  if (NULL == (ddata = GNUNET_DISK_file_map (fh, &mh, GNUNET_DISK_MAP_TYPE_READ, (size_t) fsize)))
   {
     GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "mmap", filename);
     GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close (fh));