Fixed a couple of memory leaks detected by Valgrind.

[citadel.git] / webcit / cookie_conversion.c

diff --git a/webcit/cookie_conversion.c b/webcit/cookie_conversion.c
index 599e20228c0317e8c8a1c3c01ef1d542c14a788c..24e29ce740872f44a6bda5601b6ddba7862b2bf2 100644 (file)
--- a/webcit/cookie_conversion.c
+++ b/webcit/cookie_conversion.c
@@ -1,20 +1,30 @@
 /*
  * $Id$
- *
+ */
+/**
+ * \defgroup CookieConversion Grep Cookies
  * Utility functions which convert the HTTP cookie format we use to and
  * from user/password/room strings.
  *
+ * \ingroup WebcitHttpServer 
  */
-
+/*@{*/
 #include "webcit.h"
 
-#define TRUE  1
-#define FALSE 0
 
-typedef unsigned char byte;          /* Byte type */
+#define TRUE  1    /**< for sure? */
+#define FALSE 0    /**< nope. */
 
-/*
+typedef unsigned char byte;          /**< Byte type */
+
+/**
+ * \brief find cookie
  * Pack all session info into one easy-to-digest cookie. Healthy and delicious!
+ * \param cookie cookie string to create???
+ * \param session the session we want to convert into a cookie
+ * \param user the user to be associated with the cookie
+ * \param pass his passphrase
+ * \param room the room he wants to enter
  */
 void stuff_to_cookie(char *cookie, int session,
                char *user, char *pass, char *room)
@@ -29,21 +39,37 @@ void stuff_to_cookie(char *cookie, int session,
        }
 }
 
+/**
+ * \brief      Convert unpacked hex string to an integer
+ * \param      in      Input hex string
+ * \param      len     the length of the string
+ * \return     the corrosponding integer value
+ */
 int xtoi(char *in, size_t len)
 {
-    int val = 0;
-    while (isxdigit((byte) *in) && (len-- > 0)) {
-       char c = *in++;
-       val <<= 4;
-       val += isdigit((unsigned char)c)
-           ? (c - '0')
-           : (tolower((unsigned char)c) - 'a' + 10);
-    }
-    return val;
+       int val = 0;
+       char c = 0;
+       while (isxdigit((byte) *in) && (len-- > 0))
+       {
+               c = *in++;
+               val <<= 4;
+               val += isdigit((unsigned char)c)
+               ? (c - '0')
+               : (tolower((unsigned char)c) - 'a' + 10);
+       }
+       return val;
 }
 
-/*
- * Extract all that fun stuff out of the cookie.
+/**
+ * \brief Extract all that fun stuff out of the cookie.
+ * \param cookie the cookie string
+ * \param session the corrosponding session to return
+ * \param user the user string
+ * \param user_len the user stringlength
+ * \param pass the passphrase
+ * \param pass_len length of the passphrase string 
+ * \param room the room he is in
+ * \param room_len the length of the room string
  */
 void cookie_to_stuff(char *cookie, int *session,
                char *user, size_t user_len,
@@ -69,3 +95,4 @@ void cookie_to_stuff(char *cookie, int *session,
        if (room != NULL)
                extract_token(room, buf, 3, '|', room_len);
 }
+/*@}*/