Index: kernel/generic/src/lib/func.c
===================================================================
--- kernel/generic/src/lib/func.c	(revision e535eeb8ca65f325690f9d79d60ea2f3c9e9da35)
+++ kernel/generic/src/lib/func.c	(revision 278b4a3073e1c10f12dee772798386520fad774a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup generic	
+/** @addtogroup generic
  * @{
  */
@@ -33,5 +33,5 @@
 /**
  * @file
- * @brief	Miscellaneous functions.
+ * @brief Miscellaneous functions.
  */
 
@@ -79,48 +79,4 @@
 }
 
-/** Convert ascii representation to unative_t
- *
- * Supports 0x for hexa & 0 for octal notation.
- * Does not check for overflows, does not support negative numbers
- *
- * @param text Textual representation of number
- * @return Converted number or 0 if no valid number ofund 
- */
-unative_t atoi(const char *text)
-{
-	int base = 10;
-	unative_t result = 0;
-
-	if (text[0] == '0' && text[1] == 'x') {
-		base = 16;
-		text += 2;
-	} else if (text[0] == '0')
-		base = 8;
-
-	while (*text) {
-		if (base != 16 && \
-		    ((*text >= 'A' && *text <= 'F' )
-		     || (*text >='a' && *text <='f')))
-			break;
-		if (base == 8 && *text >='8')
-			break;
-
-		if (*text >= '0' && *text <= '9') {
-			result *= base;
-			result += *text - '0';
-		} else if (*text >= 'A' && *text <= 'F') {
-			result *= base;
-			result += *text - 'A' + 10;
-		} else if (*text >= 'a' && *text <= 'f') {
-			result *= base;
-			result += *text - 'a' + 10;
-		} else
-			break;
-		text++;
-	}
-
-	return result;
-}
-
 /** @}
  */
Index: kernel/generic/src/lib/str.c
===================================================================
--- kernel/generic/src/lib/str.c	(revision e535eeb8ca65f325690f9d79d60ea2f3c9e9da35)
+++ kernel/generic/src/lib/str.c	(revision 278b4a3073e1c10f12dee772798386520fad774a)
@@ -823,4 +823,6 @@
 				str++;
 				break;
+			default:
+				str--;
 			}
 		}
@@ -886,5 +888,5 @@
  * @param base   Zero or number between 2 and 36 inclusive.
  * @param strict Do not allow any trailing characters.
- * @apram result Result of the conversion.
+ * @param result Result of the conversion.
  *
  * @return EOK if conversion was successful.