-fix many more typos

10 files changed, 84 insertions, 75 deletions

diff --git a/src/reclaim/gnunet-service-reclaim.c b/src/reclaim/gnunet-service-reclaim.c
index 04c12735b..105187c26 100644
--- a/src/reclaim/gnunet-service-reclaim.c
+++ b/src/reclaim/gnunet-service-reclaim.c
@@ -1824,7 +1824,7 @@ handle_credential_delete_message (void *cls,
 
 
 /*************************************************
- * Attrubute iteration
+ * Attribute iteration
  *************************************************/
 
 
diff --git a/src/reclaim/gnunet-service-reclaim_tickets.c b/src/reclaim/gnunet-service-reclaim_tickets.c
index 48b3fe214..5d3119c6f 100644
--- a/src/reclaim/gnunet-service-reclaim_tickets.c
+++ b/src/reclaim/gnunet-service-reclaim_tickets.c
@@ -29,7 +29,7 @@
 
 
 /**
- * FIXME: the defaul ticket iteration interval should probably
+ * FIXME: the default ticket iteration interval should probably
  * be the minimim attribute expiration.
  */
 #define DEFAULT_TICKET_REFRESH_INTERVAL GNUNET_TIME_UNIT_HOURS
@@ -129,7 +129,7 @@ struct RECLAIM_TICKETS_ConsumeHandle
   RECLAIM_TICKETS_ConsumeCallback cb;
 
   /**
-   * Callbacl closure
+   * Callback closure
    */
   void *cb_cls;
 };
@@ -1319,31 +1319,32 @@ issue_ticket (struct TicketIssueHandle *ih)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Attribute is backed by credential. Adding...\n");
-      struct GNUNET_RECLAIM_Presentation *pres = NULL;
+      struct GNUNET_RECLAIM_Presentation *presentation = NULL;
       for (j = 0; j < i; j++)
       {
         if (attrs_record[j].record_type
             != GNUNET_GNSRECORD_TYPE_RECLAIM_PRESENTATION)
           continue;
-        pres = GNUNET_RECLAIM_presentation_deserialize (attrs_record[j].data,
-                                                        attrs_record[j].
-                                                        data_size);
-        if (NULL == pres)
+        presentation = GNUNET_RECLAIM_presentation_deserialize (
+          attrs_record[j].data,
+          attrs_record[j].
+          data_size);
+        if (NULL == presentation)
         {
           GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                       "Failed to deserialize presentation\n");
           continue;
         }
-        if (0 == memcmp (&pres->credential_id,
+        if (0 == memcmp (&presentation->credential_id,
                          &le->attribute->credential,
                          sizeof (le->attribute->credential)))
           break;
-        GNUNET_free (pres);
-        pres = NULL;
+        GNUNET_free (presentation);
+        presentation = NULL;
       }
-      if (NULL != pres)
+      if (NULL != presentation)
       {
-        GNUNET_free (pres);
+        GNUNET_free (presentation);
         continue; // Skip as we have already added this credential presentation.
       }
       for (ple = ih->presentations->list_head; NULL != ple; ple = ple->next)
@@ -1361,6 +1362,7 @@ issue_ticket (struct TicketIssueHandle *ih)
         }
         char *pres_buf;
         size_t pres_size;
+
         pres_size =
           GNUNET_RECLAIM_presentation_serialize_get_size (ple->presentation);
         pres_buf = GNUNET_malloc (pres_size);
@@ -1457,7 +1459,7 @@ filter_tickets_cb (void *cls,
 {
   struct TicketIssueHandle *tih = cls;
   struct GNUNET_RECLAIM_Ticket *ticket = NULL;
-  struct GNUNET_RECLAIM_Presentation *pres;
+  struct GNUNET_RECLAIM_Presentation *presentation;
   struct GNUNET_RECLAIM_PresentationList *ticket_presentations;
   struct GNUNET_RECLAIM_Credential *cred;
   struct GNUNET_RECLAIM_PresentationListEntry *ple;
@@ -1526,7 +1528,7 @@ filter_tickets_cb (void *cls,
         if (GNUNET_OK != GNUNET_RECLAIM_credential_get_presentation (
               cred,
               tih->attrs,
-              &pres))
+              &presentation))
         {
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                       "Unable to retrieve presentation from credential\n");
@@ -1534,7 +1536,7 @@ filter_tickets_cb (void *cls,
           continue;
         }
         ple = GNUNET_new (struct GNUNET_RECLAIM_PresentationListEntry);
-        ple->presentation = pres;
+        ple->presentation = presentation;
         GNUNET_CONTAINER_DLL_insert (tih->presentations->list_head,
                                      tih->presentations->list_tail,
                                      ple);
@@ -1546,20 +1548,21 @@ filter_tickets_cb (void *cls,
     {
       for (le = tih->attrs->list_head; NULL != le; le = le->next)
       {
-        pres = GNUNET_RECLAIM_presentation_deserialize (rd[i].data,
-                                                        rd[i].data_size);
-        if (NULL == pres)
+        presentation = GNUNET_RECLAIM_presentation_deserialize (rd[i].data,
+                                                                rd[i].data_size);
+        if (NULL == presentation)
         {
           GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                       "Failed to deserialize presentation\n");
           continue;
         }
-        if (GNUNET_YES == GNUNET_RECLAIM_id_is_equal (&pres->credential_id,
-                                                      &le->attribute->credential))
+        if (GNUNET_YES == GNUNET_RECLAIM_id_is_equal (
+              &presentation->credential_id,
+              &le->attribute->credential))
         {
           found_pres_cnt++;
           ple = GNUNET_new (struct GNUNET_RECLAIM_PresentationListEntry);
-          ple->presentation = pres;
+          ple->presentation = presentation;
           GNUNET_CONTAINER_DLL_insert (ticket_presentations->list_head,
                                        ticket_presentations->list_tail,
                                        ple);
diff --git a/src/reclaim/oidc_helper.c b/src/reclaim/oidc_helper.c
index 7b24ee598..9237902ce 100644
--- a/src/reclaim/oidc_helper.c
+++ b/src/reclaim/oidc_helper.c
@@ -237,7 +237,7 @@ generate_userinfo_json (const struct GNUNET_IDENTITY_PublicKey *sub_key,
                                                   le->attribute->data,
                                                   le->attribute->data_size);
       /**
-       * There is this wierd quirk that the individual address claim(s) must be
+       * There is this weird quirk that the individual address claim(s) must be
        * inside a JSON object of the "address" claim.
        */
       if (GNUNET_YES == is_claim_in_address_scope (le->attribute->name))
@@ -287,7 +287,7 @@ generate_userinfo_json (const struct GNUNET_IDENTITY_PublicKey *sub_key,
         continue;
       }
       /**
-       * There is this wierd quirk that the individual address claim(s) must be
+       * There is this weird quirk that the individual address claim(s) must be
        * inside a JSON object of the "address" claim.
        */
       if (GNUNET_YES == is_claim_in_address_scope (le->attribute->name))
diff --git a/src/reclaim/plugin_reclaim_credential_jwt.c b/src/reclaim/plugin_reclaim_credential_jwt.c
index fb01903aa..5d5e221f9 100644
--- a/src/reclaim/plugin_reclaim_credential_jwt.c
+++ b/src/reclaim/plugin_reclaim_credential_jwt.c
@@ -194,7 +194,8 @@ jwt_parse_attributes (void *cls,
       continue;
     if (0 == strcmp ("address", key))
     {
-      if (!json_is_object(value)) {
+      if (! json_is_object (value))
+      {
         GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                     "address claim in wrong format!");
         continue;
@@ -202,12 +203,12 @@ jwt_parse_attributes (void *cls,
       json_object_foreach (value, addr_key, addr_value) {
         val_str = json_dumps (addr_value, JSON_ENCODE_ANY);
         tmp = val_str;
-        //Remove leading " from jasson conversion
+        // Remove leading " from jasson conversion
         if (tmp[0] == '"')
           tmp++;
-        //Remove trailing " from jansson conversion
-        if (tmp[strlen(tmp)-1] == '"')
-          tmp[strlen(tmp)-1] = '\0';
+        // Remove trailing " from jansson conversion
+        if (tmp[strlen (tmp) - 1] == '"')
+          tmp[strlen (tmp) - 1] = '\0';
         GNUNET_RECLAIM_attribute_list_add (attrs,
                                            addr_key,
                                            NULL,
@@ -220,12 +221,12 @@ jwt_parse_attributes (void *cls,
     }
     val_str = json_dumps (value, JSON_ENCODE_ANY);
     tmp = val_str;
-    //Remove leading " from jasson conversion
+    // Remove leading " from jasson conversion
     if (tmp[0] == '"')
       tmp++;
-    //Remove trailing " from jansson conversion
-    if (tmp[strlen(tmp)-1] == '"')
-      tmp[strlen(tmp)-1] = '\0';
+    // Remove trailing " from jansson conversion
+    if (tmp[strlen (tmp) - 1] == '"')
+      tmp[strlen (tmp) - 1] = '\0';
     GNUNET_RECLAIM_attribute_list_add (attrs,
                                        key,
                                        NULL,
@@ -307,7 +308,8 @@ jwt_get_issuer (void *cls,
   if (NULL == json_val)
     return NULL;
   issuer_json = json_object_get (json_val, "iss");
-  if ((NULL == issuer_json) || (! json_is_string (issuer_json))) {
+  if ((NULL == issuer_json) || (! json_is_string (issuer_json)))
+  {
     json_decref (json_val);
     return NULL;
   }
@@ -384,7 +386,8 @@ jwt_get_expiration (void *cls,
   if (NULL == json_val)
     return GNUNET_SYSERR;
   exp_json = json_object_get (json_val, "exp");
-  if ((NULL == exp_json) || (! json_is_integer (exp_json))) {
+  if ((NULL == exp_json) || (! json_is_integer (exp_json)))
+  {
     json_decref (json_val);
     return GNUNET_SYSERR;
   }
@@ -434,13 +437,14 @@ enum GNUNET_GenericReturnValue
 jwt_create_presentation (void *cls,
                          const struct GNUNET_RECLAIM_Credential *cred,
                          const struct GNUNET_RECLAIM_AttributeList *attrs,
-                         struct GNUNET_RECLAIM_Presentation **pres)
+                         struct GNUNET_RECLAIM_Presentation **presentation)
 {
   if (GNUNET_RECLAIM_CREDENTIAL_TYPE_JWT != cred->type)
     return GNUNET_NO;
-  *pres = GNUNET_RECLAIM_presentation_new (GNUNET_RECLAIM_CREDENTIAL_TYPE_JWT,
-                                           cred->data,
-                                           cred->data_size);
+  *presentation = GNUNET_RECLAIM_presentation_new (
+    GNUNET_RECLAIM_CREDENTIAL_TYPE_JWT,
+    cred->data,
+    cred->data_size);
   return GNUNET_OK;
 }
 
diff --git a/src/reclaim/plugin_reclaim_credential_pabc.c b/src/reclaim/plugin_reclaim_credential_pabc.c
index 89acd9032..a906805fb 100644
--- a/src/reclaim/plugin_reclaim_credential_pabc.c
+++ b/src/reclaim/plugin_reclaim_credential_pabc.c
@@ -154,7 +154,7 @@ inspect_attrs (char const *const key,
   if (NULL == value)
     return;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Found attribue in PABC credential: `%s': `%s'\n",
+              "Found attribute in PABC credential: `%s': `%s'\n",
               key, value);
   if (0 == strcmp (key, "expiration"))
     return;
@@ -362,7 +362,7 @@ int
 pabc_create_presentation (void *cls,
                           const struct GNUNET_RECLAIM_Credential *credential,
                           const struct GNUNET_RECLAIM_AttributeList *attrs,
-                          struct GNUNET_RECLAIM_Presentation **pres)
+                          struct GNUNET_RECLAIM_Presentation **presentation)
 {
   struct pabc_context *ctx = NULL;
   struct pabc_user_context *usr_ctx = NULL;
@@ -508,9 +508,10 @@ pabc_create_presentation (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
               "Presentation: %s\n", json_enc);
   // clean up
-  *pres = GNUNET_RECLAIM_presentation_new (GNUNET_RECLAIM_CREDENTIAL_TYPE_PABC,
-                                           json_enc,
-                                           strlen (json_enc) + 1);
+  *presentation = GNUNET_RECLAIM_presentation_new (
+    GNUNET_RECLAIM_CREDENTIAL_TYPE_PABC,
+    json_enc,
+    strlen (json_enc) + 1);
   GNUNET_free (json_enc);
   PABC_FREE_NULL (json);
   pabc_free_proof (ctx, pp, &proof);
diff --git a/src/reclaim/plugin_rest_openid_connect.c b/src/reclaim/plugin_rest_openid_connect.c
index fef79fb10..88b928526 100644
--- a/src/reclaim/plugin_rest_openid_connect.c
+++ b/src/reclaim/plugin_rest_openid_connect.c
@@ -551,7 +551,7 @@ struct RequestHandle
   char *edesc;
 
   /**
-   * Reponse code
+   * Response code
    */
   int response_code;
 
@@ -974,7 +974,8 @@ oidc_iteration_error (void *cls)
 static void
 oidc_ticket_issue_cb (void *cls,
                       const struct GNUNET_RECLAIM_Ticket *ticket,
-                      const struct GNUNET_RECLAIM_PresentationList *pres)
+                      const struct
+                      GNUNET_RECLAIM_PresentationList *presentation)
 {
   struct RequestHandle *handle = cls;
   struct MHD_Response *resp;
@@ -997,7 +998,7 @@ oidc_ticket_issue_cb (void *cls,
   code_string = OIDC_build_authz_code (&handle->priv_key,
                                        &handle->ticket,
                                        handle->attr_idtoken_list,
-                                       pres,
+                                       presentation,
                                        handle->oidc->nonce,
                                        handle->oidc->code_challenge);
   if ((NULL != handle->redirect_prefix) && (NULL != handle->redirect_suffix) &&
@@ -1103,7 +1104,7 @@ oidc_cred_collect_finished_cb (void *cls)
                                       handle->attr_userinfo_list);
   for (le_m = merged_list->list_head; NULL != le_m; le_m = le_m->next)
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "List Attibute in ticket to issue: %s\n",
+                "List Attribute in ticket to issue: %s\n",
                 le_m->attribute->name);
   handle->idp_op = GNUNET_RECLAIM_ticket_issue (idp,
                                                 &handle->priv_key,
@@ -1387,7 +1388,8 @@ build_redirect (void *cls)
     }
     resp = GNUNET_REST_create_response ("");
     GNUNET_assert (MHD_NO != MHD_add_response_header (resp,
-                                                      "Location", redirect_uri));
+                                                      "Location",
+                                                      redirect_uri));
     handle->proc (handle->proc_cls, resp, MHD_HTTP_FOUND);
     cleanup_handle (handle);
     GNUNET_free (redirect_uri);
@@ -2192,7 +2194,7 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
                                      &cache_key,
                                      code,
                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
-  /* If there was a previus code in there, free the old value */
+  /* If there was a previous code in there, free the old value */
   if (NULL != tmp_at)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -2231,7 +2233,7 @@ static void
 consume_ticket (void *cls,
                 const struct GNUNET_IDENTITY_PublicKey *identity,
                 const struct GNUNET_RECLAIM_Attribute *attr,
-                const struct GNUNET_RECLAIM_Presentation *pres)
+                const struct GNUNET_RECLAIM_Presentation *presentation)
 {
   struct RequestHandle *handle = cls;
   struct GNUNET_RECLAIM_AttributeListEntry *ale;
@@ -2268,14 +2270,14 @@ consume_ticket (void *cls,
   GNUNET_CONTAINER_DLL_insert (handle->attr_userinfo_list->list_head,
                                handle->attr_userinfo_list->list_tail,
                                ale);
-  if (NULL == pres)
+  if (NULL == presentation)
     return;
   for (atle = handle->presentations->list_head;
        NULL != atle; atle = atle->next)
   {
     if (GNUNET_NO == GNUNET_RECLAIM_id_is_equal (
           &atle->presentation->credential_id,
-          &pres->credential_id))
+          &presentation->credential_id))
       continue;
     break; /** already in list **/
   }
@@ -2283,10 +2285,11 @@ consume_ticket (void *cls,
   {
     /** Credential matches for attribute, add **/
     atle = GNUNET_new (struct GNUNET_RECLAIM_PresentationListEntry);
-    atle->presentation = GNUNET_RECLAIM_presentation_new (pres->type,
-                                                          pres->data,
-                                                          pres->data_size);
-    atle->presentation->credential_id = pres->credential_id;
+    atle->presentation = GNUNET_RECLAIM_presentation_new (presentation->type,
+                                                          presentation->data,
+                                                          presentation->
+                                                          data_size);
+    atle->presentation->credential_id = presentation->credential_id;
     GNUNET_CONTAINER_DLL_insert (handle->presentations->list_head,
                                  handle->presentations->list_tail,
                                  atle);
@@ -2643,7 +2646,7 @@ oidc_config_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
                        response_types);
   sub_types = json_array ();
   json_array_append_new (sub_types,
-                         json_string ("public"));  /* no pairwise suppport */
+                         json_string ("public"));  /* no pairwise support */
   json_object_set_new (oidc_config,
                        "subject_types_supported",
                        sub_types);
diff --git a/src/reclaim/plugin_rest_pabc.c b/src/reclaim/plugin_rest_pabc.c
index 6603fb888..a0551f215 100644
--- a/src/reclaim/plugin_rest_pabc.c
+++ b/src/reclaim/plugin_rest_pabc.c
@@ -112,7 +112,7 @@ struct RequestHandle
   char *emsg;
 
   /**
-   * Reponse code
+   * Response code
    */
   int response_code;
 
diff --git a/src/reclaim/plugin_rest_reclaim.c b/src/reclaim/plugin_rest_reclaim.c
index 1d1231cbd..80d6ca976 100644
--- a/src/reclaim/plugin_rest_reclaim.c
+++ b/src/reclaim/plugin_rest_reclaim.c
@@ -245,7 +245,7 @@ struct RequestHandle
   char *emsg;
 
   /**
-   * Reponse code
+   * Response code
    */
   int response_code;
 
@@ -1200,7 +1200,7 @@ static void
 consume_cont (void *cls,
               const struct GNUNET_IDENTITY_PublicKey *identity,
               const struct GNUNET_RECLAIM_Attribute *attr,
-              const struct GNUNET_RECLAIM_Presentation *pres)
+              const struct GNUNET_RECLAIM_Presentation *presentation)
 {
   struct RequestHandle *handle = cls;
   char *val_str;
diff --git a/src/reclaim/reclaim_api.c b/src/reclaim/reclaim_api.c
index c08cc868c..f41473f9f 100644
--- a/src/reclaim/reclaim_api.c
+++ b/src/reclaim/reclaim_api.c
@@ -907,7 +907,7 @@ handle_ticket_result (void *cls, const struct TicketResultMessage *msg)
   struct GNUNET_RECLAIM_Handle *handle = cls;
   struct GNUNET_RECLAIM_Operation *op;
   struct GNUNET_RECLAIM_TicketIterator *it;
-  struct GNUNET_RECLAIM_PresentationList *pres;
+  struct GNUNET_RECLAIM_PresentationList *presentation;
   uint32_t r_id = ntohl (msg->id);
   static const struct GNUNET_RECLAIM_Ticket ticket;
   uint32_t pres_len = ntohs (msg->presentations_len);
@@ -923,8 +923,9 @@ handle_ticket_result (void *cls, const struct TicketResultMessage *msg)
   if (NULL != op)
   {
     if (0 < pres_len)
-      pres = GNUNET_RECLAIM_presentation_list_deserialize ((char*) &msg[1],
-                                                           pres_len);
+      presentation = GNUNET_RECLAIM_presentation_list_deserialize (
+        (char*) &msg[1],
+        pres_len);
     GNUNET_CONTAINER_DLL_remove (handle->op_head, handle->op_tail, op);
     if (0 ==
         memcmp (&msg->ticket, &ticket, sizeof(struct GNUNET_RECLAIM_Ticket)))
@@ -937,10 +938,10 @@ handle_ticket_result (void *cls, const struct TicketResultMessage *msg)
       if (NULL != op->ti_cb)
         op->ti_cb (op->cls,
                    &msg->ticket,
-                   (0 < pres_len) ? pres : NULL);
+                   (0 < pres_len) ? presentation : NULL);
     }
     if (0 < pres_len)
-      GNUNET_RECLAIM_presentation_list_destroy (pres);
+      GNUNET_RECLAIM_presentation_list_destroy (presentation);
     free_op (op);
     return;
   }
diff --git a/src/reclaim/reclaim_credential.c b/src/reclaim/reclaim_credential.c
index da5cee988..b4aeedf29 100644
--- a/src/reclaim/reclaim_credential.c
+++ b/src/reclaim/reclaim_credential.c
@@ -135,7 +135,6 @@ RECLAIM_CREDENTIAL_fini ()
 }
 
 
-
 /**
  * Convert an credential type name to the corresponding number
  *
@@ -1030,6 +1029,7 @@ GNUNET_RECLAIM_presentation_get_expiration (const struct
   return GNUNET_SYSERR;
 }
 
+
 /**
  * Create a presentation from a credential and a lift of (selected)
  * attributes in the credential.
@@ -1042,9 +1042,9 @@ GNUNET_RECLAIM_presentation_get_expiration (const struct
  */
 int
 GNUNET_RECLAIM_credential_get_presentation (
-                              const struct GNUNET_RECLAIM_Credential *cred,
-                              const struct GNUNET_RECLAIM_AttributeList *attrs,
-                              struct GNUNET_RECLAIM_Presentation **pres)
+  const struct GNUNET_RECLAIM_Credential *cred,
+  const struct GNUNET_RECLAIM_AttributeList *attrs,
+  struct GNUNET_RECLAIM_Presentation **presentation)
 {
   unsigned int i;
   struct Plugin *plugin;
@@ -1055,13 +1055,10 @@ GNUNET_RECLAIM_credential_get_presentation (
     if (GNUNET_OK !=  plugin->api->create_presentation (plugin->api->cls,
                                                         cred,
                                                         attrs,
-                                                        pres))
+                                                        presentation))
       continue;
-    (*pres)->credential_id = cred->id;
+    (*presentation)->credential_id = cred->id;
     return GNUNET_OK;
   }
   return GNUNET_SYSERR;
 }
-
-
-