Changeset 7715994 in mainline for uspace/srv/net/net/net_remote.c

Timestamp:

2010-03-13T12:17:02Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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.

File:

• uspace/srv/net/net/net_remote.c (modified) (1 diff)

uspace/srv/net/net/net_remote.c

@@ -50 +50 @@
 #include "net_messages.h"
 
-int     net_get_device_conf_req( int net_phone, device_id_t device_id, measured_string_ref * configuration, size_t count, char ** data ){
-        return generic_translate_req( net_phone, NET_NET_GET_DEVICE_CONF, device_id, 0, * configuration, count, configuration, data );
+int net_connect_module(services_t service){
+        return connect_to_service(SERVICE_NETWORKING);
 }
 
-int     net_get_conf_req( int net_phone, measured_string_ref * configuration, size_t count, char ** data ){
-        return generic_translate_req( net_phone, NET_NET_GET_DEVICE_CONF, 0, 0, * configuration, count, configuration, data );
+void net_free_settings(measured_string_ref settings, char * data){
+        if(settings){
+                free(settings);
+        }
+        if(data){
+                free(data);
+        }
 }
 
-void net_free_settings( measured_string_ref settings, char * data ){
-        if( settings ) free( settings );
-        if( data ) free( data );
+int net_get_conf_req(int net_phone, measured_string_ref * configuration, size_t count, char ** data){
+        return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF, 0, 0, * configuration, count, configuration, data);
 }
 
-int net_connect_module( services_t service ){
-        return connect_to_service( SERVICE_NETWORKING );
+int net_get_device_conf_req(int net_phone, device_id_t device_id, measured_string_ref * configuration, size_t count, char ** data){
+        return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF, device_id, 0, * configuration, count, configuration, data);
 }