Changeset 2a786f9 in mainline for uspace/lib/net/generic/net_remote.c


Ignore:
Timestamp:
2010-09-22T19:07:02Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ec1bdc8
Parents:
dc94cb2 (diff), 921a860 (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 from lp:~jakub/helenos/net.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/net/generic/net_remote.c

    rdc94cb2 r2a786f9  
    4747#include <net_net_messages.h>
    4848
    49 int net_connect_module(services_t service){
     49int net_connect_module(services_t service)
     50{
    5051        return connect_to_service(SERVICE_NETWORKING);
    5152}
    5253
    53 void net_free_settings(measured_string_ref settings, char * data){
    54         if(settings){
     54void net_free_settings(measured_string_ref settings, char * data)
     55{
     56        if (settings)
    5557                free(settings);
    56         }
    57         if(data){
     58
     59        if (data)
    5860                free(data);
    59         }
    6061}
    6162
    62 int net_get_conf_req(int net_phone, measured_string_ref * configuration, size_t count, char ** data){
    63         return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF, 0, 0, * configuration, count, configuration, data);
     63int
     64net_get_conf_req(int net_phone, measured_string_ref * configuration,
     65    size_t count, char ** data)
     66{
     67        return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF, 0, 0,
     68            *configuration, count, configuration, data);
    6469}
    6570
    66 int net_get_device_conf_req(int net_phone, device_id_t device_id, measured_string_ref * configuration, size_t count, char ** data){
    67         return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF, device_id, 0, * configuration, count, configuration, data);
     71int
     72net_get_device_conf_req(int net_phone, device_id_t device_id,
     73    measured_string_ref * configuration, size_t count, char ** data)
     74{
     75        return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF,
     76            device_id, 0, *configuration, count, configuration, data);
    6877}
    6978
Note: See TracChangeset for help on using the changeset viewer.