Changes in uspace/lib/c/generic/str.c [8e893ae:1737bfb] in mainline

File:

• uspace/lib/c/generic/str.c (modified) (7 diffs)

uspace/lib/c/generic/str.c

@@ -46 +46 @@
 #include <mem.h>
 #include <str.h>
-
-/** Check the condition if wchar_t is signed */
-#ifdef WCHAR_IS_UNSIGNED
-        #define WCHAR_SIGNED_CHECK(cond)  (true)
-#else
-        #define WCHAR_SIGNED_CHECK(cond)  (cond)
-#endif
 
 /** Byte mask consisting of lowest @n bits (out of 8) */
@@ -268 +261 @@
 }
 
-/** Get size of string with size limit.
- *
- * Get the number of bytes which are used by the string @a str
- * (excluding the NULL-terminator), but no more than @max_size bytes.
- *
- * @param str      String to consider.
- * @param max_size Maximum number of bytes to measure.
- *
- * @return Number of bytes used by the string
- *
- */
-size_t str_nsize(const char *str, size_t max_size)
-{
-        size_t size = 0;
-        
-        while ((*str++ != 0) && (size < max_size))
-                size++;
-        
-        return size;
-}
-
-/** Get size of wide string with size limit.
- *
- * Get the number of bytes which are used by the wide string @a str
- * (excluding the NULL-terminator), but no more than @max_size bytes.
- *
- * @param str      Wide string to consider.
- * @param max_size Maximum number of bytes to measure.
- *
- * @return Number of bytes used by the wide string
- *
- */
-size_t wstr_nsize(const wchar_t *str, size_t max_size)
-{
-        return (wstr_nlength(str, max_size) * sizeof(wchar_t));
-}
-
 /** Get size of wide string with length limit.
  *
@@ -406 +362 @@
 bool ascii_check(wchar_t ch)
 {
-        if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 127))
+        if ((ch >= 0) && (ch <= 127))
                 return true;
         
@@ -419 +375 @@
 bool chr_check(wchar_t ch)
 {
-        if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 1114111))
+        if ((ch >= 0) && (ch <= 1114111))
                 return true;
         
@@ -520 +476 @@
  * @param count Size of the destination buffer (must be > 0).
  * @param src   Source string.
- *
  */
 void str_cpy(char *dest, size_t size, const char *src)
@@ -553 +508 @@
  * @param src   Source string.
  * @param n     Maximum number of bytes to read from @a src.
- *
  */
 void str_ncpy(char *dest, size_t size, const char *src, size_t n)
@@ -1544 +1498 @@
  *
  */
-int str_uint64_t(const char *nptr, char **endptr, unsigned int base,
+int str_uint64(const char *nptr, char **endptr, unsigned int base,
     bool strict, uint64_t *result)
 {