Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset f2962621 in mainline for kernel/generic/src/lib/memstr.c


Ignore:
Timestamp:
2010-12-17T10:14:01Z (11 years ago)
Author:
Matus Dekanek <smekideki@…>
Branches:
lfn, master
Children:
6e5dc07
Parents:
9223dc5c (diff), 11658b64 (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 with usb/development

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/lib/memstr.c

    r9223dc5c rf2962621  
    6262        unsigned int i, j;
    6363       
    64         if (ALIGN_UP((uintptr_t) src, sizeof(unative_t)) != (uintptr_t) src ||
    65             ALIGN_UP((uintptr_t) dst, sizeof(unative_t)) != (uintptr_t) dst) {
     64        if (ALIGN_UP((uintptr_t) src, sizeof(sysarg_t)) != (uintptr_t) src ||
     65            ALIGN_UP((uintptr_t) dst, sizeof(sysarg_t)) != (uintptr_t) dst) {
    6666                for (i = 0; i < cnt; i++)
    6767                        ((uint8_t *) dst)[i] = ((uint8_t *) src)[i];
    6868        } else {
    69                 for (i = 0; i < cnt / sizeof(unative_t); i++)
    70                         ((unative_t *) dst)[i] = ((unative_t *) src)[i];
     69                for (i = 0; i < cnt / sizeof(sysarg_t); i++)
     70                        ((sysarg_t *) dst)[i] = ((sysarg_t *) src)[i];
    7171               
    72                 for (j = 0; j < cnt % sizeof(unative_t); j++)
    73                         ((uint8_t *)(((unative_t *) dst) + i))[j] =
    74                             ((uint8_t *)(((unative_t *) src) + i))[j];
     72                for (j = 0; j < cnt % sizeof(sysarg_t); j++)
     73                        ((uint8_t *)(((sysarg_t *) dst) + i))[j] =
     74                            ((uint8_t *)(((sysarg_t *) src) + i))[j];
    7575        }
    7676               
Note: See TracChangeset for help on using the changeset viewer.