Changeset 6c441cf8 in mainline for kernel/generic/src/lib

Timestamp:

2008-02-27T11:49:17Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

56976a17

Parents:

fdb7795

Message:

code cleanup (mostly signed/unsigned)
allow extra compiler warnings

Location:

kernel/generic/src/lib

Files:

• elf.c (modified) (2 diffs)
• func.c (modified) (2 diffs)
• memstr.c (modified) (3 diffs)
• sort.c (modified) (1 diff)

kernel/generic/src/lib/elf.c

@@ -70 +70 @@
  * @return EE_OK on success
  */
-int elf_load(elf_header_t *header, as_t * as)
+unsigned int elf_load(elf_header_t *header, as_t * as)
 {
         int i, rc;
@@ -132 +132 @@
  * @return NULL terminated description of error.
  */
-char *elf_error(int rc)
+char *elf_error(unsigned int rc)
 {
         ASSERT(rc < sizeof(error_codes) / sizeof(char *));

kernel/generic/src/lib/func.c

@@ -140 +140 @@
 int strncmp(const char *src, const char *dst, size_t len)
 {
-        int i;
+        unsigned int i;
         
-        for (i = 0; *src && *dst && i < len; src++, dst++, i++) {
+        for (i = 0; (*src) && (*dst) && (i < len); src++, dst++, i++) {
                 if (*src < *dst)
                         return -1;
@@ -169 +169 @@
 void strncpy(char *dest, const char *src, size_t len)
 {
-        int i;
+        unsigned int i;
         for (i = 0; i < len; i++) {
                 if (!(dest[i] = src[i]))

kernel/generic/src/lib/memstr.c

@@ -60 +60 @@
 void *_memcpy(void * dst, const void *src, size_t cnt)
 {
-        int i, j;
+        unsigned int i, j;
         
         if (ALIGN_UP((uintptr_t) src, sizeof(unative_t)) != (uintptr_t) src ||
@@ -90 +90 @@
 void _memsetb(uintptr_t dst, size_t cnt, uint8_t x)
 {
-        int i;
+        unsigned int i;
         uint8_t *p = (uint8_t *) dst;
         
@@ -109 +109 @@
 void _memsetw(uintptr_t dst, size_t cnt, uint16_t x)
 {
-        int i;
+        unsigned int i;
         uint16_t *p = (uint16_t *) dst;
         

kernel/generic/src/lib/sort.c

@@ -97 +97 @@
 {
         if (n > 4) {
-                int i = 0, j = n - 1;
+                unsigned int i = 0, j = n - 1;
 
                 memcpy(pivot, data, e_size);
 
                 while (1) {
-                        while ((cmp(data + i * e_size, pivot) < 0) && i < n) i++;
-                        while ((cmp(data + j * e_size, pivot) >=0) && j > 0) j--;
-                        if (i<j) {
+                        while ((cmp(data + i * e_size, pivot) < 0) && (i < n))
+                                i++;
+                        while ((cmp(data + j * e_size, pivot) >= 0) && (j > 0))
+                                j--;
+                        
+                        if (i < j) {
                                 memcpy(tmp, data + i * e_size, e_size);
                                 memcpy(data + i * e_size, data + j * e_size, e_size);