Quieten over-pick compiler.

[disorder] / lib / hex.c

diff --git a/lib/hex.c b/lib/hex.c
index d2a2a0021f96d8e39ec87bcabe6ff2627d31ebab..15860ad9bdc3099c5ab880697276ae90490ef193 100644 (file)
--- a/lib/hex.c
+++ b/lib/hex.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder
- * Copyright (C) 2004, 2005 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
+/** @file lib/hex.c @brief Hexadecimal encoding and decoding */
 
 #include <config.h>
 #include "types.h"
@@ -28,14 +29,26 @@
 #include "mem.h"
 #include "log.h"
 
+/** @brief Convert a byte sequence to hex
+ * @param ptr Pointer to first byte
+ * @param n Number of bytes
+ * @return Allocated string containing hexdump
+ */
 char *hex(const uint8_t *ptr, size_t n) {
   char *buf = xmalloc_noptr(n * 2 + 1), *p = buf;
 
   while(n-- > 0)
     p += sprintf(p, "%02x", (unsigned)*ptr++);
+  *p = 0;
   return buf;
 }
 
+/** @brief Convert a character to its value as a hex digit
+ * @param c Character code
+ * @return Value has hex digit or -1
+ *
+ * The 'q' stands for 'quiet' - this function does not report errors.
+ */
 int unhexdigitq(int c) {
   switch(c) {
   case '0': return 0;
@@ -58,6 +71,13 @@ int unhexdigitq(int c) {
   }
 }
 
+/** @brief Convert a character to its value as a hex digit
+ * @param c Character code
+ * @return Value has hex digit or -1
+ *
+ * If the character is not a valid hex digit then an error is logged.
+ * See @ref unhexdigitq() if that is a problem.
+ */
 int unhexdigit(int c) {
   int d;
 
@@ -65,6 +85,17 @@ int unhexdigit(int c) {
   return d;
 }
 
+/** @brief Convert a hex string to bytes
+ * @param s Pointer to hex string
+ * @param np Where to store byte string length or NULL
+ * @return Allocated buffer, or 0
+ *
+ * @p s should point to a 0-terminated string containing an even number
+ * of hex digits.  They are converted to bytes and returned via the return
+ * value and optionally the length via @p np.
+ *
+ * On any error a message is logged and a null pointer is returned.
+ */
 uint8_t *unhex(const char *s, size_t *np) {
   size_t l;
   uint8_t *buf, *p;
@@ -91,4 +122,3 @@ c-basic-offset:2
 comment-column:40
 End:
 */
-/* arch-tag:3d2adfde608c6d54dc2cf2b42d78e462 */