9 files changed, 31 insertions, 31 deletions

diff --git a/src/fs/gnunet-fs-gtk_advertise-pseudonym.c b/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
index 8cec9a82..0a0cd9b6 100644
--- a/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
+++ b/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
@@ -265,7 +265,7 @@ GNUNET_GTK_select_pseudonym_dialog_delete_event_cb (GtkWidget *widget,
 static void
 add_to_list (void *cls,
              const char *name,
-             const GNUNET_HashCode * id)
+             const struct GNUNET_HashCode * id)
 {
   GtkListStore *ls = cls;
   GtkTreeIter iter;
diff --git a/src/fs/gnunet-fs-gtk_common.c b/src/fs/gnunet-fs-gtk_common.c
index 1a8aa15c..19b9f30e 100644
--- a/src/fs/gnunet-fs-gtk_common.c
+++ b/src/fs/gnunet-fs-gtk_common.c
@@ -322,8 +322,8 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri,
   GtkLabel *sel_namespace_label;
   GtkTreePath *treepath;
   GtkEntry *query_entry;
-  GNUNET_HashCode *nsid;
-  GNUNET_HashCode want;
+  struct GNUNET_HashCode *nsid;
+  struct GNUNET_HashCode want;
   
   if (GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri))
   {
@@ -366,7 +366,7 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri,
     while ( ( (NULL == nsid) ||
               (0 != memcmp (nsid,
                             &want,
-                            sizeof (GNUNET_HashCode))) ) &&
+                            sizeof (struct GNUNET_HashCode))) ) &&
             (gtk_tree_model_iter_next (namespace_treestore, &iter)) )
       gtk_tree_model_get (namespace_treestore, &iter,
                           GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_KEY,
@@ -375,7 +375,7 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri,
     if ( (NULL == nsid) ||
          (0 != memcmp (nsid,
                        &want,
-                       sizeof (GNUNET_HashCode))) )
+                       sizeof (struct GNUNET_HashCode))) )
     {
       /* namespace unknown / not in list!? */
       GNUNET_break (0);
@@ -448,7 +448,7 @@ static int largest_namespace_rating = INT_MIN;
  */
 static int
 find_largest_namespace_rating_iterator (void *cls,
-    const GNUNET_HashCode *pseudonym, const char *name,
+    const struct GNUNET_HashCode *pseudonym, const char *name,
     const char *unique_name,
     const struct GNUNET_CONTAINER_MetaData *md, int rating)
 {
diff --git a/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c b/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
index b1f7ab59..e7ffd352 100644
--- a/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
+++ b/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
@@ -292,14 +292,14 @@ GNUNET_FS_GTK_search_namespace_dropdown_button_toggled_cb (GtkToggleButton *
  * @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort
  */
 static int
-add_namespace_to_ts (void *cls, const GNUNET_HashCode * pseudonym,
+add_namespace_to_ts (void *cls, const struct GNUNET_HashCode * pseudonym,
                      const char *name, const char *unique_name,
                      const struct GNUNET_CONTAINER_MetaData *md, int rating)
 {
   GtkTreeStore *ts = cls;
   char *root;
   char *ns_name, *unique_ns_name;
-  GNUNET_HashCode *nsid;
+  struct GNUNET_HashCode *nsid;
   char *description;
   int desc_is_a_dup;
   char *uris;
@@ -315,7 +315,7 @@ add_namespace_to_ts (void *cls, const GNUNET_HashCode * pseudonym,
   unique_ns_name = GNUNET_PSEUDONYM_name_uniquify (
       GNUNET_FS_GTK_get_configuration (), pseudonym, ns_name, NULL);
   GNUNET_free (ns_name);
-  nsid = GNUNET_malloc (sizeof (GNUNET_HashCode));
+  nsid = GNUNET_malloc (sizeof (struct GNUNET_HashCode));
   *nsid = *pseudonym;
   root = NULL;
   uris = GNUNET_CONTAINER_meta_data_get_by_type (md, EXTRACTOR_METATYPE_URI);
@@ -350,7 +350,7 @@ GNUNET_GTK_main_window_refresh_ns_list (struct GNUNET_GTK_MainWindowContext *mai
 {
   GtkTreeIter iter;
   GtkTreePath *treepath;
-  GNUNET_HashCode *key = NULL, *selected_ns_id;
+  struct GNUNET_HashCode *key = NULL, *selected_ns_id;
 
   gboolean found = FALSE;
   gchar *value = NULL;
@@ -377,8 +377,8 @@ GNUNET_GTK_main_window_refresh_ns_list (struct GNUNET_GTK_MainWindowContext *mai
   selected_ns_id = NULL;
   if (key != NULL)
   {
-    selected_ns_id = GNUNET_malloc (sizeof (GNUNET_HashCode));
-    memcpy (selected_ns_id, key, sizeof (GNUNET_HashCode));
+    selected_ns_id = GNUNET_malloc (sizeof (struct GNUNET_HashCode));
+    memcpy (selected_ns_id, key, sizeof (struct GNUNET_HashCode));
   }
 
   if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
@@ -429,7 +429,7 @@ GNUNET_GTK_main_window_refresh_ns_list (struct GNUNET_GTK_MainWindowContext *mai
                           -1);
       if (selected_ns_id == NULL)
         found = TRUE;
-      else if (key != NULL && memcmp (key, selected_ns_id, sizeof (GNUNET_HashCode)) == 0)
+      else if (key != NULL && memcmp (key, selected_ns_id, sizeof (struct GNUNET_HashCode)) == 0)
         found = TRUE;
       if (found || (TRUE != gtk_tree_model_iter_next (GTK_TREE_MODEL (
         main_ctx->search_ns_treestore), &iter)))
diff --git a/src/fs/gnunet-fs-gtk_main-window-search.c b/src/fs/gnunet-fs-gtk_main-window-search.c
index 881131a9..6d05e212 100644
--- a/src/fs/gnunet-fs-gtk_main-window-search.c
+++ b/src/fs/gnunet-fs-gtk_main-window-search.c
@@ -39,7 +39,7 @@ start_search (struct GNUNET_GTK_MainWindowContext *main_ctx)
   guint anonymity_level;
   gchar *keywords;
   gchar *mime_keyword;
-  GNUNET_HashCode *nsid;
+  struct GNUNET_HashCode *nsid;
   struct GNUNET_FS_Uri *uri;
 
   /* get anonymity level */
diff --git a/src/fs/gnunet-fs-gtk_namespace_manager.c b/src/fs/gnunet-fs-gtk_namespace_manager.c
index 8330949b..f33c00b6 100644
--- a/src/fs/gnunet-fs-gtk_namespace_manager.c
+++ b/src/fs/gnunet-fs-gtk_namespace_manager.c
@@ -199,7 +199,7 @@ GNUNET_GTK_namespace_manager_known_namespaces_delete_button_clicked_cb (
 {
   struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
   GtkTreeIter iter;
-  GNUNET_HashCode *nsid;
+  struct GNUNET_HashCode *nsid;
   GtkTreeRowReference *order_row, *known_row;
   struct GNUNET_CONTAINER_MetaData *md;
 
@@ -238,7 +238,7 @@ GNUNET_GTK_namespace_manager_known_namespaces_swap_rank_button_clicked_cb (
 {
   struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
   GtkTreeIter known_iter, order_iter;
-  GNUNET_HashCode *nsid;
+  struct GNUNET_HashCode *nsid;
   int32_t old_rank, new_rank;
   GtkTreeRowReference *order_row, *known_row;
 
@@ -495,7 +495,7 @@ GNUNET_GTK_namespace_manager_name_text_edited_cb (
     if (gtk_tree_model_get_iter (GTK_TREE_MODEL (ctx->known_ns_store),
         &iter, tree_path))
     {
-      GNUNET_HashCode *nsid;
+      struct GNUNET_HashCode *nsid;
       gtk_tree_model_get (GTK_TREE_MODEL (ctx->known_ns_store), &iter,
           GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, &nsid,
           GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, &order_row,
@@ -590,18 +590,18 @@ GNUNET_GTK_namespace_manager_namespace_details_value_text_edited_cb (
  * @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort
  */
 static int
-populate_known_ns_list (void *cls, const GNUNET_HashCode *pseudonym,
+populate_known_ns_list (void *cls, const struct GNUNET_HashCode *pseudonym,
     const char *name, const char *unique_name,
     const struct GNUNET_CONTAINER_MetaData *md, int rating)
 {
   struct GNUNET_GTK_NamespaceManagerContext *ctx = cls;
-  GNUNET_HashCode *nsid;
+  struct GNUNET_HashCode *nsid;
   struct GNUNET_CRYPTO_HashAsciiEncoded identifier;
   GtkTreeIter known_iter, order_iter;
   struct GNUNET_CONTAINER_MetaData *md_copy;
   char *non_null_name, *non_null_unique_name;
 
-  nsid = GNUNET_malloc (sizeof (GNUNET_HashCode));
+  nsid = GNUNET_malloc (sizeof (struct GNUNET_HashCode));
   *nsid = *pseudonym;
 
   GNUNET_CRYPTO_hash_to_enc (nsid, &identifier);
@@ -652,7 +652,7 @@ apply_known_ns_changes (struct GNUNET_GTK_NamespaceManagerContext *ctx)
   GtkTreeIter iter;
   gint i;
   gint row_count;
-  GNUNET_HashCode *nsid;
+  struct GNUNET_HashCode *nsid;
   char *name;
   int32_t rank;
   struct GNUNET_CONTAINER_MetaData *md;
@@ -686,7 +686,7 @@ free_lists_contents (struct GNUNET_GTK_NamespaceManagerContext *ctx)
   GtkTreeIter iter;
   gint i;
   gint row_count;
-  GNUNET_HashCode *nsid;
+  struct GNUNET_HashCode *nsid;
   GtkTreeRowReference *order_row;
   struct GNUNET_CONTAINER_MetaData *md;
 
@@ -764,13 +764,13 @@ static gboolean
 mark_as_mine (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
     gpointer data)
 {
-  const GNUNET_HashCode *mine_id = data;
-  const GNUNET_HashCode *ns_id;
+  const struct GNUNET_HashCode *mine_id = data;
+  const struct GNUNET_HashCode *ns_id;
 
   gtk_tree_model_get (model, iter,
       GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, &ns_id, -1);
 
-  if (memcmp (ns_id, mine_id, sizeof (GNUNET_HashCode)) != 0)
+  if (memcmp (ns_id, mine_id, sizeof (struct GNUNET_HashCode)) != 0)
     return FALSE;
 
   gtk_list_store_set (GTK_LIST_STORE (model), iter,
@@ -789,7 +789,7 @@ mark_as_mine (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
  */
 static void
 mark_namespaces_as_mine (void *cls, const char *name,
-    const GNUNET_HashCode * id)
+    const struct GNUNET_HashCode * id)
 {
   struct GNUNET_GTK_NamespaceManagerContext *ctx = cls;
 
diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index 0d3cf465..f94d13ec 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -2031,7 +2031,7 @@ add_updateable_to_ts (void *cls, const char *last_id,
   GtkTreeIter titer;
   char *desc;
   int desc_is_a_dup;
-  GNUNET_HashCode hc;
+  struct GNUNET_HashCode hc;
 
   uc->update_called = GNUNET_YES;
   GNUNET_CRYPTO_hash (last_id, strlen (last_id), &hc);
@@ -2103,7 +2103,7 @@ add_updateable_to_ts (void *cls, const char *last_id,
  * @param id identity of the namespace to add
  */
 static void
-add_namespace_to_ts (void *cls, const char *name, const GNUNET_HashCode * id)
+add_namespace_to_ts (void *cls, const char *name, const struct GNUNET_HashCode * id)
 {
   GtkTreeStore *ts = cls;
   struct UpdateableContext uc;
diff --git a/src/fs/gnunet-fs-gtk_unindex.c b/src/fs/gnunet-fs-gtk_unindex.c
index 7c056060..a3b5cf94 100644
--- a/src/fs/gnunet-fs-gtk_unindex.c
+++ b/src/fs/gnunet-fs-gtk_unindex.c
@@ -309,7 +309,7 @@ selection_changed_cb (GtkTreeSelection * ts,
  */
 static int 
 add_indexed_file (void *cls, const char *filename,
-                  const GNUNET_HashCode * file_id)
+                  const struct GNUNET_HashCode * file_id)
 {
   struct UnindexDialogContext *udc = cls;
   GtkTreeIter iter;
diff --git a/src/peerinfo/gnunet-peerinfo-gtk.c b/src/peerinfo/gnunet-peerinfo-gtk.c
index a0fde58f..0cafb402 100644
--- a/src/peerinfo/gnunet-peerinfo-gtk.c
+++ b/src/peerinfo/gnunet-peerinfo-gtk.c
@@ -184,7 +184,7 @@ get_object (const char *name)
  * @return GNUNET_OK (continue to iterate)
  */
 static int
-free_paths (void *cls, const GNUNET_HashCode * key, void *value)
+free_paths (void *cls, const struct GNUNET_HashCode * key, void *value)
 {
   struct PeerInfo *info = value;
 
diff --git a/src/setup/gnunet-setup-datacache-config.c b/src/setup/gnunet-setup-datacache-config.c
index c777f5ff..cc0f60ca 100644
--- a/src/setup/gnunet-setup-datacache-config.c
+++ b/src/setup/gnunet-setup-datacache-config.c
@@ -30,7 +30,7 @@
  * Stub implementation of the 'DeleteNotifyCallback' callback.
  */
 static void
-dnc_dummy (void *cls, const GNUNET_HashCode * key, size_t size)
+dnc_dummy (void *cls, const struct GNUNET_HashCode * key, size_t size)
 {
   /* do nothing */
 }