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

Changeset 5863a95 in mainline for kernel/generic/src/sysinfo/sysinfo.c


Ignore:
Timestamp:
2010-12-17T08:59:35Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
58854f2
Parents:
70e5ad5 (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 development/ changes

File:
1 edited

Legend:

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

    r70e5ad5 r5863a95  
    296296 */
    297297void sysinfo_set_item_val(const char *name, sysinfo_item_t **root,
    298     unative_t val)
     298    sysarg_t val)
    299299{
    300300        /* Protect sysinfo tree consistency */
     
    481481                sysinfo_indent(depth);
    482482               
    483                 unative_t val;
     483                sysarg_t val;
    484484                size_t size;
    485485               
     
    660660 *
    661661 */
    662 unative_t sys_sysinfo_get_tag(void *path_ptr, size_t path_size)
     662sysarg_t sys_sysinfo_get_tag(void *path_ptr, size_t path_size)
    663663{
    664664        /*
     
    679679                ret.tag = SYSINFO_VAL_DATA;
    680680       
    681         return (unative_t) ret.tag;
     681        return (sysarg_t) ret.tag;
    682682}
    683683
     
    696696 *
    697697 */
    698 unative_t sys_sysinfo_get_value(void *path_ptr, size_t path_size,
     698sysarg_t sys_sysinfo_get_value(void *path_ptr, size_t path_size,
    699699    void *value_ptr)
    700700{
     
    715715                rc = EINVAL;
    716716       
    717         return (unative_t) rc;
     717        return (sysarg_t) rc;
    718718}
    719719
     
    732732 *
    733733 */
    734 unative_t sys_sysinfo_get_data_size(void *path_ptr, size_t path_size,
     734sysarg_t sys_sysinfo_get_data_size(void *path_ptr, size_t path_size,
    735735    void *size_ptr)
    736736{
     
    752752                rc = EINVAL;
    753753       
    754         return (unative_t) rc;
     754        return (sysarg_t) rc;
    755755}
    756756
     
    774774 *
    775775 */
    776 unative_t sys_sysinfo_get_data(void *path_ptr, size_t path_size,
     776sysarg_t sys_sysinfo_get_data(void *path_ptr, size_t path_size,
    777777    void *buffer_ptr, size_t buffer_size)
    778778{
     
    797797                free(ret.data.data);
    798798       
    799         return (unative_t) rc;
     799        return (sysarg_t) rc;
    800800}
    801801
Note: See TracChangeset for help on using the changeset viewer.