clang-format all C code. Add symlink of clang-format to bootstrap.

1 files changed, 31 insertions, 48 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_egos.c b/src/conversation/gnunet-conversation-gtk_egos.c
index 716d7cdf..08801ced 100644
--- a/src/conversation/gnunet-conversation-gtk_egos.c
+++ b/src/conversation/gnunet-conversation-gtk_egos.c
@@ -74,14 +74,14 @@ GCG_EGOS_get_selected_ego ()
   GtkTreeIter iter;
   GtkComboBox *cb;
 
-  cb = GTK_COMBO_BOX (GCG_get_main_window_object
-                      ("gnunet_conversation_gtk_ego_combobox"));
-  if (! gtk_combo_box_get_active_iter (cb,
-                                       &iter))
+  cb = GTK_COMBO_BOX (
+    GCG_get_main_window_object ("gnunet_conversation_gtk_ego_combobox"));
+  if (! gtk_combo_box_get_active_iter (cb, &iter))
     return NULL;
   gtk_tree_model_get (GTK_TREE_MODEL (ego_liststore),
                       &iter,
-                      EGO_LS_EGO, &ego,
+                      EGO_LS_EGO,
+                      &ego,
                       -1);
   return ego;
 }
@@ -118,51 +118,43 @@ identity_cb (void *cls,
     /* new identity */
     GNUNET_assert (NULL != name);
     gtk_list_store_insert_with_values (ego_liststore,
-                                       &iter, -1,
-                                       EGO_LS_NAME, name,
-                                       EGO_LS_EGO, ego,
+                                       &iter,
+                                       -1,
+                                       EGO_LS_NAME,
+                                       name,
+                                       EGO_LS_EGO,
+                                       ego,
                                        -1);
-    cb = GTK_COMBO_BOX (GCG_get_main_window_object
-                        ("gnunet_conversation_gtk_ego_combobox"));
-    if ( (! gtk_combo_box_get_active_iter (cb,
-                                           &iter2)) &&
-         ( (NULL == default_ego) ||
-           (0 == strcmp (name,
-                         default_ego))) )
+    cb = GTK_COMBO_BOX (
+      GCG_get_main_window_object ("gnunet_conversation_gtk_ego_combobox"));
+    if ((! gtk_combo_box_get_active_iter (cb, &iter2)) &&
+        ((NULL == default_ego) || (0 == strcmp (name, default_ego))))
     {
       /* found the ego that we were supposed to use by default, select
          it! */
-      gtk_combo_box_set_active_iter (cb,
-                                     &iter);
+      gtk_combo_box_set_active_iter (cb, &iter);
     }
-    path = gtk_tree_model_get_path (GTK_TREE_MODEL (ego_liststore),
-                                    &iter);
-    rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (ego_liststore),
-                                     path);
+    path = gtk_tree_model_get_path (GTK_TREE_MODEL (ego_liststore), &iter);
+    rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (ego_liststore), path);
     gtk_tree_path_free (path);
     *ctx = rr;
     return;
   }
   /* existing ego, locate and execute rename/delete */
   path = gtk_tree_row_reference_get_path (rr);
-  GNUNET_assert (gtk_tree_model_get_iter (GTK_TREE_MODEL (ego_liststore),
-                                          &iter,
-                                          path));
+  GNUNET_assert (
+    gtk_tree_model_get_iter (GTK_TREE_MODEL (ego_liststore), &iter, path));
   gtk_tree_path_free (path);
   if (NULL == name)
   {
     /* deletion operation */
     gtk_tree_row_reference_free (rr);
     *ctx = NULL;
-    gtk_list_store_remove (ego_liststore,
-                           &iter);
+    gtk_list_store_remove (ego_liststore, &iter);
     return;
   }
   /* rename operation */
-  gtk_list_store_set (ego_liststore,
-                      &iter,
-                      EGO_LS_NAME, &name,
-                      -1);
+  gtk_list_store_set (ego_liststore, &iter, EGO_LS_NAME, &name, -1);
 }
 
 
@@ -175,7 +167,7 @@ identity_cb (void *cls,
  */
 void
 gnunet_conversation_gtk_ego_copy_button_clicked_cb (GtkButton *button,
-                                                    gpointer user_data)
+                                                    gpointer user_data)
 {
   struct GNUNET_IDENTITY_Ego *ego;
   const gchar *label;
@@ -185,21 +177,15 @@ gnunet_conversation_gtk_ego_copy_button_clicked_cb (GtkButton *button,
   char *uri;
   GtkClipboard *cb;
 
-  label = gtk_entry_get_text (GTK_ENTRY
-                              (GCG_get_main_window_object
-                               ("gnunet_conversation_gtk_ego_label_entry")));
-  GNUNET_break ( (NULL != label) &&
-                 (0 != strlen (label)) );
+  label = gtk_entry_get_text (GTK_ENTRY (
+    GCG_get_main_window_object ("gnunet_conversation_gtk_ego_label_entry")));
+  GNUNET_break ((NULL != label) && (0 != strlen (label)));
   ego = GCG_EGOS_get_selected_ego ();
   GNUNET_break (NULL != ego);
   priv = GNUNET_IDENTITY_ego_get_private_key (ego);
-  GNUNET_CRYPTO_ecdsa_key_get_public (priv,
-                                      &pub);
+  GNUNET_CRYPTO_ecdsa_key_get_public (priv, &pub);
   zkey = GNUNET_GNSRECORD_pkey_to_zkey (&pub);
-  GNUNET_asprintf (&uri,
-                   "gnunet://gns/%s.%s/",
-                   label,
-                   zkey);
+  GNUNET_asprintf (&uri, "gnunet://gns/%s.%s/", label, zkey);
   cb = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
   gtk_clipboard_set_text (cb, uri, -1);
   gtk_clipboard_store (cb);
@@ -217,12 +203,9 @@ GCG_EGOS_init (const char *ego_name)
 {
   if (NULL != ego_name)
     default_ego = GNUNET_strdup (ego_name);
-  ego_liststore
-    =  GTK_LIST_STORE (GCG_get_main_window_object
-                       ("gnunet_conversation_gtk_ego_liststore"));
-  id = GNUNET_IDENTITY_connect (GCG_get_configuration (),
-                                &identity_cb,
-                                NULL);
+  ego_liststore = GTK_LIST_STORE (
+    GCG_get_main_window_object ("gnunet_conversation_gtk_ego_liststore"));
+  id = GNUNET_IDENTITY_connect (GCG_get_configuration (), &identity_cb, NULL);
 }