Changeset aa85487 in mainline for kernel/generic/src/sysinfo/sysinfo.c


Ignore:
Timestamp:
2010-03-07T15:11:56Z (14 years ago)
Author:
Lukas Mejdrech <lukasmejdrech@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade
Children:
aadf01e
Parents:
2e99277 (diff), 137691a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes, revision 308

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/sysinfo/sysinfo.c

    r2e99277 raa85487  
    4646                return NULL;
    4747       
    48         while (subtree != NULL) {
     48        while (subtree != NULL) {
    4949                int i = 0;
    5050                char *a = (char *) name;
     
    6868                /* No matches try next */
    6969                subtree = subtree->next;
    70                 i = 0;
    7170        }
    7271        return NULL;
     
    159158                        item->subinfo_type = SYSINFO_SUBINFO_NONE;
    160159                        return item;
    161                 } else {
     160                } else
    162161                        subtree = subtree->next;
    163                         i = 0;
    164                 }       
    165162        }
    166163
     
    225222                int i;
    226223                unative_t val = 0;
    227                 char *vtype = NULL;
     224                const char *vtype = NULL;
    228225               
    229226               
Note: See TracChangeset for help on using the changeset viewer.