Changeset aa85487 in mainline for uspace/srv/net/net/net.c

Timestamp:

2010-03-07T15:11:56Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

aadf01e

Parents:

2e99277 (diff), 137691a (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, revision 308

File:

• uspace/srv/net/net/net.c (modified) (3 diffs)

uspace/srv/net/net/net.c

@@ -154 +154 @@
  *  @returns Other error codes as defined for the add_configuration() function.
  */
-int     read_netif_configuration( char * name, netif_ref netif );
+int     read_netif_configuration( const char * name, netif_ref netif );
 
 /** Networking module global data.
@@ -413 +413 @@
 }
 
-int read_netif_configuration( char * name, netif_ref netif ){
+int read_netif_configuration( const char * name, netif_ref netif ){
         // read the netif configuration file
         return read_configuration_file( CONF_DIR, name, & netif->configuration );
@@ -485 +485 @@
 
 #ifdef CONFIG_NETIF_DP8390
-        char *          conf_files[] = { "lo", "ne2k" };
+        const char *            conf_files[] = { "lo", "ne2k" };
 #else
-        char *          conf_files[] = { "lo" };
+        const char *            conf_files[] = { "lo" };
 #endif