Changeset 98000fb in mainline for kernel/generic/src/lib/string.c

Timestamp:

2009-06-03T19:34:45Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

301ff30

Parents:

69e68e3

Message:

remove redundant index_t and count_t types (which were always quite ambiguous and not actually needed)

File:

• kernel/generic/src/lib/string.c (modified) (14 diffs)

kernel/generic/src/lib/string.c

@@ -63 +63 @@
  *
  *  [wide] string length  number of CHARACTERS in a [wide] string (excluding
- *                        the NULL-terminator), count_t
+ *                        the NULL-terminator), size_t
  *
  *  [wide] string width   number of display cells on a monospace display taken
- *                        by a [wide] string, count_t
+ *                        by a [wide] string, size_t
  *
  *
@@ -76 +76 @@
  *                            NULL-terminator)
  *
- *  length  l        count_t  number of CHARACTERS in a string (excluding the
+ *  length  l        size_t   number of CHARACTERS in a string (excluding the
  *                            null terminator)
  *
- *  width  w         count_t  number of display cells on a monospace display
+ *  width  w         size_t   number of display cells on a monospace display
  *                            taken by a string
  *
@@ -98 +98 @@
  *  pointer (char *, wchar_t *)
  *  byte offset (size_t)
- *  character index (count_t)
+ *  character index (size_t)
  *
  */
@@ -310 +310 @@
  *
  */
-size_t str_lsize(const char *str, count_t max_len)
-{
-        count_t len = 0;
+size_t str_lsize(const char *str, size_t max_len)
+{
+        size_t len = 0;
         size_t offset = 0;
         
@@ -338 +338 @@
  *
  */
-size_t wstr_lsize(const wchar_t *str, count_t max_len)
+size_t wstr_lsize(const wchar_t *str, size_t max_len)
 {
         return (wstr_nlength(str, max_len * sizeof(wchar_t)) * sizeof(wchar_t));
@@ -350 +350 @@
  *
  */
-count_t str_length(const char *str)
-{
-        count_t len = 0;
+size_t str_length(const char *str)
+{
+        size_t len = 0;
         size_t offset = 0;
         
@@ -368 +368 @@
  *
  */
-count_t wstr_length(const wchar_t *wstr)
-{
-        count_t len = 0;
+size_t wstr_length(const wchar_t *wstr)
+{
+        size_t len = 0;
         
         while (*wstr++ != 0)
@@ -386 +386 @@
  *
  */
-count_t str_nlength(const char *str, size_t size)
-{
-        count_t len = 0;
+size_t str_nlength(const char *str, size_t size)
+{
+        size_t len = 0;
         size_t offset = 0;
         
@@ -405 +405 @@
  *
  */
-count_t wstr_nlength(const wchar_t *str, size_t size)
-{
-        count_t len = 0;
-        count_t limit = ALIGN_DOWN(size, sizeof(wchar_t));
-        count_t offset = 0;
+size_t wstr_nlength(const wchar_t *str, size_t size)
+{
+        size_t len = 0;
+        size_t limit = ALIGN_DOWN(size, sizeof(wchar_t));
+        size_t offset = 0;
         
         while ((offset < limit) && (*str++ != 0)) {
@@ -497 +497 @@
  *
  */
-int str_lcmp(const char *s1, const char *s2, count_t max_len)
+int str_lcmp(const char *s1, const char *s2, size_t max_len)
 {
         wchar_t c1 = 0;
@@ -505 +505 @@
         size_t off2 = 0;
         
-        count_t len = 0;
+        size_t len = 0;
 
         while (true) {
@@ -616 +616 @@
         
         wchar_t ch;
-        count_t src_idx = 0;
+        size_t src_idx = 0;
         size_t dst_off = 0;
         
@@ -667 +667 @@
  *
  */
-bool wstr_linsert(wchar_t *str, wchar_t ch, count_t pos, count_t max_pos)
-{
-        count_t len = wstr_length(str);
+bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos)
+{
+        size_t len = wstr_length(str);
         
         if ((pos > len) || (pos + 1 > max_pos))
                 return false;
         
-        count_t i;
+        size_t i;
         for (i = len; i + 1 > pos; i--)
                 str[i + 1] = str[i];
@@ -695 +695 @@
  *
  */
-bool wstr_remove(wchar_t *str, count_t pos)
-{
-        count_t len = wstr_length(str);
+bool wstr_remove(wchar_t *str, size_t pos)
+{
+        size_t len = wstr_length(str);
         
         if (pos >= len)
                 return false;
         
-        count_t i;
+        size_t i;
         for (i = pos + 1; i <= len; i++)
                 str[i - 1] = str[i];