Changeset 71b00dcc in mainline for uspace/srv/net/net/net_remote.c


Ignore:
Timestamp:
2010-03-07T22:51:38Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
60ab6c3
Parents:
b5cbff4 (diff), 31c80a5 (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:~lukasmejdrech/helenos/network.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/net/net_remote.c

    rb5cbff4 r71b00dcc  
    5050#include "net_messages.h"
    5151
    52 int     net_get_device_conf_req( int net_phone, device_id_t device_id, measured_string_ref * configuration, size_t count, char ** data ){
    53         return generic_translate_req( net_phone, NET_NET_GET_DEVICE_CONF, device_id, 0, * configuration, count, configuration, data );
     52int net_get_device_conf_req(int net_phone, device_id_t device_id, measured_string_ref * configuration, size_t count, char ** data){
     53        return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF, device_id, 0, * configuration, count, configuration, data);
    5454}
    5555
    56 int     net_get_conf_req( int net_phone, measured_string_ref * configuration, size_t count, char ** data ){
    57         return generic_translate_req( net_phone, NET_NET_GET_DEVICE_CONF, 0, 0, * configuration, count, configuration, data );
     56int net_get_conf_req(int net_phone, measured_string_ref * configuration, size_t count, char ** data){
     57        return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF, 0, 0, * configuration, count, configuration, data);
    5858}
    5959
    60 void net_free_settings( measured_string_ref settings, char * data ){
    61         if( settings ) free( settings );
    62         if( data ) free( data );
     60void net_free_settings(measured_string_ref settings, char * data){
     61        if(settings){
     62                free(settings);
     63        }
     64        if(data){
     65                free(data);
     66        }
    6367}
    6468
    65 int net_connect_module( services_t service ){
    66         return connect_to_service( SERVICE_NETWORKING );
     69int net_connect_module(services_t service){
     70        return connect_to_service(SERVICE_NETWORKING);
    6771}
    6872
Note: See TracChangeset for help on using the changeset viewer.