better comments

14 files changed, 135 insertions, 69 deletions

diff --git a/src/util/common_logging.c b/src/util/common_logging.c
index 0ee4edbe2..96cfcd85c 100644
--- a/src/util/common_logging.c
+++ b/src/util/common_logging.c
@@ -438,14 +438,14 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind)
  * This is one of the very few calls in the entire API that is
  * NOT reentrant!
  *
- * @param pid the peer identity
+ * @param hc the hash code
  * @return string form; will be overwritten by next call to GNUNET_h2s.
  */
 const char *
-GNUNET_h2s (const GNUNET_HashCode *pid)
+GNUNET_h2s (const GNUNET_HashCode *hc)
 {
   static struct GNUNET_CRYPTO_HashAsciiEncoded ret;
-  GNUNET_CRYPTO_hash_to_enc (pid, &ret);
+  GNUNET_CRYPTO_hash_to_enc (hc, &ret);
   ret.encoding[8] = '\0';
   return (const char *) ret.encoding;
 }
diff --git a/src/util/container_bloomfilter.c b/src/util/container_bloomfilter.c
index 5e69fe8ab..612bad92f 100644
--- a/src/util/container_bloomfilter.c
+++ b/src/util/container_bloomfilter.c
@@ -666,14 +666,14 @@ GNUNET_CONTAINER_bloomfilter_remove (struct GNUNET_CONTAINER_BloomFilter *bf,
  *
  * @param bf the filter
  * @param iterator an iterator over all elements stored in the BF
- * @param iterator_arg argument to the iterator function
+ * @param iterator_cls argument to the iterator function
  * @param size the new size for the filter
  * @param k the new number of GNUNET_CRYPTO_hash-function to apply per element
  */
 void
 GNUNET_CONTAINER_bloomfilter_resize (struct GNUNET_CONTAINER_BloomFilter *bf,
                                      GNUNET_HashCodeIterator iterator,
-                                     void *iterator_arg, 
+                                     void *iterator_cls, 
                                      size_t size,
                                      unsigned int k)
 {
@@ -691,7 +691,7 @@ GNUNET_CONTAINER_bloomfilter_resize (struct GNUNET_CONTAINER_BloomFilter *bf,
   memset (bf->bitArray, 0, bf->bitArraySize);
   if (bf->filename != NULL)
     makeEmptyFile (bf->fh, bf->bitArraySize * 4);
-  while (GNUNET_YES == iterator (iterator_arg, &hc))
+  while (GNUNET_YES == iterator (iterator_cls, &hc))
     GNUNET_CONTAINER_bloomfilter_add (bf, &hc);
 }
 
diff --git a/src/util/container_meta_data.c b/src/util/container_meta_data.c
index bbe6dad3b..5ae3b15cf 100644
--- a/src/util/container_meta_data.c
+++ b/src/util/container_meta_data.c
@@ -139,6 +139,11 @@ GNUNET_CONTAINER_meta_data_insert (struct GNUNET_CONTAINER_MetaData *md,
 
 /**
  * Remove an item.
+ *
+ * @param md metadata to manipulate
+ * @param type type of the item to remove
+ * @param data specific value to remove, NULL to remove all
+ *        entries of the given type
  * @return GNUNET_OK on success, GNUNET_SYSERR if the item does not exist in md
  */
 int
@@ -170,13 +175,16 @@ GNUNET_CONTAINER_meta_data_delete (struct GNUNET_CONTAINER_MetaData *md,
 /**
  * Iterate over MD entries, excluding thumbnails.
  *
+ * @param md metadata to inspect
+ * @param iter function to call on each entry
+ * @param iter_cls closure for iterator
  * @return number of entries
  */
 int
 GNUNET_CONTAINER_meta_data_get_contents (const struct
                                          GNUNET_CONTAINER_MetaData *md,
                                          GNUNET_CONTAINER_MetaDataProcessor
-                                         iterator, void *closure)
+                                         iter, void *iter_cls)
 {
   uint32_t i;
   uint32_t sub;
@@ -187,9 +195,9 @@ GNUNET_CONTAINER_meta_data_get_contents (const struct
       if (!EXTRACTOR_isBinaryType (md->items[i].type))
         {
           if ((iterator != NULL) &&
-              (GNUNET_OK != iterator (closure,
-                                      md->items[i].type,
-                                      md->items[i].data)))
+              (GNUNET_OK != iter (iter_cls,
+                                  md->items[i].type,
+                                  md->items[i].data)))
             return GNUNET_SYSERR;
         }
       else
@@ -280,6 +288,9 @@ GNUNET_CONTAINER_meta_data_get_thumbnail (const struct
 
 /**
  * Duplicate struct GNUNET_CONTAINER_MetaData.
+ * 
+ * @param md what to duplicate
+ * @return duplicate meta-data container
  */
 struct GNUNET_CONTAINER_MetaData *
 GNUNET_CONTAINER_meta_data_duplicate (const struct GNUNET_CONTAINER_MetaData
@@ -439,7 +450,7 @@ struct MetaDataHeader
  * @param md metadata to serialize
  * @param target where to write the serialized metadata
  * @param max maximum number of bytes available in target
- * @param part is it ok to just write SOME of the
+ * @param opt is it ok to just write SOME of the
  *        meta-data to match the size constraint,
  *        possibly discarding some data?
  * @return number of bytes written on success,
@@ -451,7 +462,7 @@ GNUNET_CONTAINER_meta_data_serialize (const struct GNUNET_CONTAINER_MetaData
                                       *md, char *target, size_t max,
                                       enum
                                       GNUNET_CONTAINER_MetaDataSerializationOptions
-                                      part)
+                                      opt)
 {
   struct MetaDataHeader *hdr;
   size_t size;
@@ -488,7 +499,7 @@ GNUNET_CONTAINER_meta_data_serialize (const struct GNUNET_CONTAINER_MetaData
         }
 
       hdr->size = htonl (size);
-      if ((part & GNUNET_CONTAINER_META_DATA_SERIALIZE_NO_COMPRESS) == 0)
+      if ((opt & GNUNET_CONTAINER_META_DATA_SERIALIZE_NO_COMPRESS) == 0)
         {
           pos = tryCompression ((char *) &hdr[1],
                                 size - sizeof (struct MetaDataHeader));
@@ -507,7 +518,7 @@ GNUNET_CONTAINER_meta_data_serialize (const struct GNUNET_CONTAINER_MetaData
       GNUNET_free (hdr);
       hdr = NULL;
 
-      if ((part & GNUNET_CONTAINER_META_DATA_SERIALIZE_PART) == 0)
+      if ((opt & GNUNET_CONTAINER_META_DATA_SERIALIZE_PART) == 0)
         {
           return GNUNET_SYSERR; /* does not fit! */
         }
diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c
index c3fb9a84c..60e0ec5a2 100644
--- a/src/util/crypto_hash.c
+++ b/src/util/crypto_hash.c
@@ -562,7 +562,7 @@ getValue__ (unsigned char a)
  * small number of characters.  The GNUnet encoding uses 102
  * characters plus a null terminator.
  *
- * @param block the GNUNET_CRYPTO_hash code
+ * @param block the hash code
  * @param result where to store the encoding (struct GNUNET_CRYPTO_HashAsciiEncoded can be
  *  safely cast to char*, a '\\0' termination is set).
  */
diff --git a/src/util/crypto_random.c b/src/util/crypto_random.c
index b56523a46..50af9f251 100644
--- a/src/util/crypto_random.c
+++ b/src/util/crypto_random.c
@@ -30,6 +30,10 @@
 #include <gcrypt.h>
 
 /**
+ * Produce a random value.
+ *
+ * @param mode desired quality of the random number
+ * @param i the upper limit (exclusive) for the random number
  * @return a random value in the interval [0,i[.
  */
 uint32_t
@@ -97,26 +101,31 @@ GNUNET_CRYPTO_random_permute (enum GNUNET_CRYPTO_Quality mode, unsigned int n)
 
 /**
  * Random on unsigned 64-bit values.
+ *
+ *
+ * @param mode desired quality of the random number
+ * @param max value returned will be in range [0,max) (exclusive)
+ * @return random 64-bit number
  */
 uint64_t
 GNUNET_CRYPTO_random_u64 (enum GNUNET_CRYPTO_Quality mode,
-                          uint64_t u)
+                          uint64_t max)
 {
   uint64_t ret;
 
-  GNUNET_assert (u > 0);
+  GNUNET_assert (max > 0);
   if (mode == GNUNET_CRYPTO_QUALITY_STRONG)
     {
       gcry_randomize ((unsigned char *) &ret,
                       sizeof (uint64_t),
                       GCRY_STRONG_RANDOM);
-      return ret % u;
+      return ret % max;
     }
   else
     {
-      ret = u * ((double) RANDOM () / RAND_MAX);
-      if (ret >= u)
-        ret = u - 1;
+      ret = max * ((double) RANDOM () / RAND_MAX);
+      if (ret >= max)
+        ret = max - 1;
       return ret;
     }
 }
diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c
index 7bffa71ee..9da95a56e 100644
--- a/src/util/crypto_rsa.c
+++ b/src/util/crypto_rsa.c
@@ -186,15 +186,15 @@ key_from_sexp (gcry_mpi_t * array,
 
 /**
  * Extract the public key of the host.
- * @param hostkey the hostkey to extract into the result.
- * @param result where to write the result.
+ * @param priv the private key
+ * @param pub where to write the public key
  */
 void
 GNUNET_CRYPTO_rsa_key_get_public (const struct GNUNET_CRYPTO_RsaPrivateKey
-                                  *hostkey,
+                                  *priv,
                                   struct
                                   GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded
-                                  *result)
+                                  *pub)
 {
   gcry_mpi_t skey[2];
   size_t size;
@@ -750,15 +750,15 @@ GNUNET_CRYPTO_rsa_encrypt (const void *block,
 /**
  * Decrypt a given block with the hostkey.
  *
- * @param hostkey the hostkey with which to decrypt this block
+ * @param key the key with which to decrypt this block
  * @param block the data to decrypt, encoded as returned by encrypt
  * @param result pointer to a location where the result can be stored
  * @param max the maximum number of bits to store for the result, if
  *        the decrypted block is bigger, an error is returned
- * @returns the size of the decrypted block, -1 on error
+ * @return the size of the decrypted block, -1 on error
  */
 ssize_t
-GNUNET_CRYPTO_rsa_decrypt (const struct GNUNET_CRYPTO_RsaPrivateKey *hostkey,
+GNUNET_CRYPTO_rsa_decrypt (const struct GNUNET_CRYPTO_RsaPrivateKey *key,
                            const struct GNUNET_CRYPTO_RsaEncryptedData *block,
                            void *result, 
                            size_t max)
@@ -772,7 +772,7 @@ GNUNET_CRYPTO_rsa_decrypt (const struct GNUNET_CRYPTO_RsaPrivateKey *hostkey,
   unsigned char *tmp;
 
 #if EXTRA_CHECKS
-  GNUNET_assert (0 == gcry_pk_testkey (hostkey->sexp));
+  GNUNET_assert (0 == gcry_pk_testkey (key->sexp));
 #endif
   size = sizeof (struct GNUNET_CRYPTO_RsaEncryptedData);
   GNUNET_assert (0 == gcry_mpi_scan (&val,
@@ -782,7 +782,7 @@ GNUNET_CRYPTO_rsa_decrypt (const struct GNUNET_CRYPTO_RsaPrivateKey *hostkey,
                  gcry_sexp_build (&data, &erroff,
                                   "(enc-val(flags)(rsa(a %m)))", val));
   gcry_mpi_release (val);
-  GNUNET_assert (0 == gcry_pk_decrypt (&resultsexp, data, hostkey->sexp));
+  GNUNET_assert (0 == gcry_pk_decrypt (&resultsexp, data, key->sexp));
   gcry_sexp_release (data);
   /* resultsexp has format "(value %m)" */
   GNUNET_assert (NULL !=
@@ -805,13 +805,13 @@ GNUNET_CRYPTO_rsa_decrypt (const struct GNUNET_CRYPTO_RsaPrivateKey *hostkey,
 /**
  * Sign a given block.
  *
- * @param hostkey private key to use for the signing
+ * @param key private key to use for the signing
  * @param purpose what to sign (size, purpose)
  * @param sig where to write the signature
  * @return GNUNET_SYSERR on error, GNUNET_OK on success
  */
 int
-GNUNET_CRYPTO_rsa_sign (const struct GNUNET_CRYPTO_RsaPrivateKey *hostkey,
+GNUNET_CRYPTO_rsa_sign (const struct GNUNET_CRYPTO_RsaPrivateKey *key,
                         const struct GNUNET_CRYPTO_RsaSignaturePurpose
                         *purpose, struct GNUNET_CRYPTO_RsaSignature *sig)
 {
@@ -835,7 +835,7 @@ GNUNET_CRYPTO_rsa_sign (const struct GNUNET_CRYPTO_RsaPrivateKey *hostkey,
            - 1], &hc, sizeof (GNUNET_HashCode));
   GNUNET_assert (0 == gcry_sexp_new (&data, buff, bufSize, 0));
   GNUNET_free (buff);
-  GNUNET_assert (0 == gcry_pk_sign (&result, data, hostkey->sexp));
+  GNUNET_assert (0 == gcry_pk_sign (&result, data, key->sexp));
   gcry_sexp_release (data);
   GNUNET_assert (0 == key_from_sexp (&rval, result, "rsa", "s"));
   gcry_sexp_release (result);
diff --git a/src/util/getopt.c b/src/util/getopt.c
index e37390a3a..82d0baebd 100644
--- a/src/util/getopt.c
+++ b/src/util/getopt.c
@@ -987,7 +987,7 @@ GNgetopt_long (int argc,
 /**
  * Parse the command line.
  *
- * @param binaryOptions name of this binary / application
+ * @param binaryOptions Name of application with option summary
  * @param allOptions defined options and handlers
  * @param argc number of arguments
  * @param argv actual arguments
diff --git a/src/util/gnunet-service-resolver.c b/src/util/gnunet-service-resolver.c
index 304f11b7b..1dce5cedc 100644
--- a/src/util/gnunet-service-resolver.c
+++ b/src/util/gnunet-service-resolver.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file resolver/gnunet-service-resolver.c
+ * @file util/gnunet-service-resolver.c
  * @brief code to do DNS resolution
  * @author Christian Grothoff
  */
@@ -35,24 +35,55 @@
 #include "gnunet_time_lib.h"
 #include "resolver.h"
 
-
+/**
+ * A cached DNS lookup result.
+ */
 struct IPCache
 {
+  /**
+   * This is a linked list.
+   */
   struct IPCache *next;
+  
+  /**
+   * Hostname in human-readable form.
+   */
   char *addr;
+
+  /**
+   * Hostname in binary format.
+   */
   struct sockaddr *sa;
+  
+  /**
+   * Last time this entry was updated.
+   */
   struct GNUNET_TIME_Absolute last_refresh;
+
+  /**
+   * Last time this entry was requested.
+   */
   struct GNUNET_TIME_Absolute last_request;
-  unsigned int salen;
+
+  /**
+   * Number of bytes in sa.
+   */
+  socklen_t salen;
 };
 
 
+/**
+ * Start of the linked list of cached DNS lookup results.
+ */
 static struct IPCache *head;
 
 
-
-
 #if HAVE_GETNAMEINFO
+/**
+ * Resolve the given request using getnameinfo
+ *
+ * @param cache the request to resolve (and where to store the result)
+ */
 static void
 getnameinfo_resolve (struct IPCache *cache)
 {
@@ -69,6 +100,11 @@ getnameinfo_resolve (struct IPCache *cache)
 
 
 #if HAVE_GETHOSTBYADDR
+/**
+ * Resolve the given request using gethostbyaddr
+ *
+ * @param cache the request to resolve (and where to store the result)
+ */
 static void
 gethostbyaddr_resolve (struct IPCache *cache)
 {
@@ -92,7 +128,11 @@ gethostbyaddr_resolve (struct IPCache *cache)
 }
 #endif
 
-
+/**
+ * Resolve the given request using the available methods.
+ *
+ * @param cache the request to resolve (and where to store the result)
+ */
 static void
 cache_resolve (struct IPCache *cache)
 {
@@ -114,11 +154,13 @@ cache_resolve (struct IPCache *cache)
  * may not immediately result in the FQN (but instead in a
  * human-readable IP address).
  *
+ * @param client handle to the client making the request (for sending the reply)
  * @param sa should be of type "struct sockaddr*"
+ * @param salen number of bytes in sa
  */
 static void
 get_ip_as_string (struct GNUNET_SERVER_Client *client,
-                  const struct sockaddr *sav, socklen_t salen)
+                  const struct sockaddr *sa, socklen_t salen)
 {
   struct IPCache *cache;
   struct IPCache *prev;
@@ -134,7 +176,7 @@ get_ip_as_string (struct GNUNET_SERVER_Client *client,
   cache = head;
   prev = NULL;
   while ((cache != NULL) &&
-         ((cache->salen != salen) || (0 != memcmp (cache->sa, sav, salen))))
+         ((cache->salen != salen) || (0 != memcmp (cache->sa, sa, salen))))
     {
       if (GNUNET_TIME_absolute_get_duration (cache->last_request).value <
           60 * 60 * 1000)
@@ -178,7 +220,7 @@ get_ip_as_string (struct GNUNET_SERVER_Client *client,
       cache->next = head;
       cache->salen = salen;
       cache->sa = GNUNET_malloc (salen);
-      memcpy (cache->sa, sav, salen);
+      memcpy (cache->sa, sa, salen);
       cache->last_request = GNUNET_TIME_absolute_get ();
       cache->last_refresh = GNUNET_TIME_absolute_get ();
       cache->addr = NULL;
diff --git a/src/util/os_network.c b/src/util/os_network.c
index c78dc71c5..d18e5eb76 100644
--- a/src/util/os_network.c
+++ b/src/util/os_network.c
@@ -35,11 +35,11 @@
  * @brief Enumerate all network interfaces
  *
  * @param proc the callback function
- * @param cls closure for proc
+ * @param proc_cls closure for proc
  */
 void
 GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
-                                   void *cls)
+                                   void *proc_cls)
 {
 #ifdef MINGW
   PMIB_IFTABLE pTable;
@@ -148,7 +148,7 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
                 free (pszIfName);
 
               if (GNUNET_OK !=
-                  proc (cls,
+                  proc (proc_cls,
                         szEntry,
                         pAddrTable->table[dwIfIdx].dwIndex == dwExternalNIC,
                         NULL /* FIXME: pass actual IP address! */ ,
@@ -182,7 +182,7 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
                 alen = sizeof (struct sockaddr_in);
               else
                 alen = sizeof (struct sockaddr_in6);
-              if (GNUNET_OK != proc (cls,
+              if (GNUNET_OK != proc (proc_cls,
                                      ifa_ptr->ifa_name,
                                      0 == strcmp (ifa_ptr->ifa_name,
                                                   GNUNET_DEFAULT_INTERFACE),
@@ -255,7 +255,7 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
               a4.sin_family = AF_INET;
               a4.sin_addr = v4;
               if (GNUNET_OK !=
-                  proc (cls,
+                  proc (proc_cls,
                         ifc,
                         0 == strcmp (ifc, GNUNET_DEFAULT_INTERFACE),
                         (const struct sockaddr *) &a4, sizeof (a4)))
@@ -270,7 +270,7 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
               a6.sin6_addr = v6;
               fprintf (stderr, "procing %s\n", addrstr);
               if (GNUNET_OK !=
-                  proc (cls,
+                  proc (proc_cls,
                         ifc,
                         0 == strcmp (ifc, GNUNET_DEFAULT_INTERFACE),
                         (const struct sockaddr *) &a6, sizeof (a6)))
diff --git a/src/util/os_priority.c b/src/util/os_priority.c
index 46e2deb5c..6e18d9278 100644
--- a/src/util/os_priority.c
+++ b/src/util/os_priority.c
@@ -29,19 +29,23 @@
 #include "gnunet_os_lib.h"
 
 /**
- * Set our process priority
+ * Set process priority
+ *
+ * @param proc id of the process
+ * @param prio priority value
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error
  */
 int
 GNUNET_OS_set_process_priority (pid_t proc,
-                                enum GNUNET_SCHEDULER_Priority eprio)
+                                enum GNUNET_SCHEDULER_Priority prio)
 {
   int prio = 0;
 
-  GNUNET_assert (eprio < GNUNET_SCHEDULER_PRIORITY_COUNT);
-  if (eprio == GNUNET_SCHEDULER_PRIORITY_KEEP)
+  GNUNET_assert (prio < GNUNET_SCHEDULER_PRIORITY_COUNT);
+  if (prio == GNUNET_SCHEDULER_PRIORITY_KEEP)
     return GNUNET_OK;
   /* convert to MINGW/Unix values */
-  switch (eprio)
+  switch (prio)
     {
     case GNUNET_SCHEDULER_PRIORITY_DEFAULT:
 #ifdef MINGW
diff --git a/src/util/pseudonym.c b/src/util/pseudonym.c
index 8687b5c4d..04a6a1f78 100644
--- a/src/util/pseudonym.c
+++ b/src/util/pseudonym.c
@@ -588,7 +588,7 @@ merge_meta_helper (void *cls,
 /**
  * Add a pseudonym to the set of known pseudonyms.
  * For all pseudonym advertisements that we discover
- * FSUI should automatically call this function.
+ * FS should automatically call this function.
  *
  * @param cfg overall configuration
  * @param id the pseudonym identifier
diff --git a/src/util/resolver.h b/src/util/resolver.h
index 31637f01d..5adf43633 100644
--- a/src/util/resolver.h
+++ b/src/util/resolver.h
@@ -20,7 +20,7 @@
 
 /**
  * @author Christian Grothoff
- * @file resolver/resolver.h
+ * @file util/resolver.h
  */
 #ifndef RESOLVER_H
 #define RESOLVER_H
diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c
index cc81aa6b8..b2c8fda66 100644
--- a/src/util/resolver_api.c
+++ b/src/util/resolver_api.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file resolver/resolver_api.c
+ * @file util/resolver_api.c
  * @brief resolver for writing a tool
  * @author Christian Grothoff
  */
diff --git a/src/util/strings.c b/src/util/strings.c
index 23e6cd85b..133fda857 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -353,37 +353,37 @@ GNUNET_STRINGS_filename_expand (const char *fil)
 /**
  * Give relative time in human-readable fancy format.
  *
- * @param del time in milli seconds
+ * @param delta time in milli seconds
  * @return time as human-readable string
  */
 char *
-GNUNET_STRINGS_relative_time_to_string (struct GNUNET_TIME_Relative del)
+GNUNET_STRINGS_relative_time_to_string (struct GNUNET_TIME_Relative delta)
 {
   const char *unit = _( /* time unit */ "ms");
   char *ret;
-  uint64_t delta = del.value;
+  uint64_t dval = delta.value;
 
-  if (delta > 5 * 1000)
+  if (dval > 5 * 1000)
     {
-      delta = delta / 1000;
+      dval = dval / 1000;
       unit = _( /* time unit */ "s");
-      if (delta > 5 * 60)
+      if (dval > 5 * 60)
         {
-          delta = delta / 60;
+          dval = dval / 60;
           unit = _( /* time unit */ "m");
-          if (delta > 5 * 60)
+          if (dval > 5 * 60)
             {
-              delta = delta / 60;
+              dval = dval / 60;
               unit = _( /* time unit */ "h");
-              if (delta > 5 * 24)
+              if (dval > 5 * 24)
                 {
-                  delta = delta / 24;
+                  dval = dval / 24;
                   unit = _( /* time unit */ " days");
                 }
             }
         }
     }
-  GNUNET_asprintf (&ret, "%llu%s", delta, unit);
+  GNUNET_asprintf (&ret, "%llu%s", dval, unit);
   return ret;
 }