Changeset a000878c in mainline for uspace/srv/net

Timestamp:

2010-02-25T19:11:25Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

958de16

Parents:

a634485

Message:

make sure that all statically allocated strings are declared as "const char *"
and are treated as read-only

Location:

uspace/srv/net

Files:

• il/ip/ip.c (modified) (1 diff)
• net/net.c (modified) (3 diffs)
• net/start/netstart.c (modified) (2 diffs)
• netif/lo/lo.c (modified) (1 diff)
• nil/eth/eth.c (modified) (1 diff)
• structures/module_map.c (modified) (2 diffs)
• structures/module_map.h (modified) (3 diffs)
• tl/icmp/icmp.c (modified) (1 diff)
• tl/udp/udp.c (modified) (1 diff)

uspace/srv/net/il/ip/ip.c

@@ -479 +479 @@
         ERROR_DECLARE;
 
-        measured_string_t       names[] = {{ "IPV", 3 }, { "IP_CONFIG", 9 }, { "IP_ADDR", 7 }, { "IP_NETMASK", 10 }, { "IP_GATEWAY", 10 }, { "IP_BROADCAST", 12 }, { "ARP", 3 }, { "IP_ROUTING", 10 }};
+        measured_string_t       names[] = {{ str_dup("IPV"), 3 }, { str_dup("IP_CONFIG"), 9 }, { str_dup("IP_ADDR"), 7 }, { str_dup("IP_NETMASK"), 10 }, { str_dup("IP_GATEWAY"), 10 }, { str_dup("IP_BROADCAST"), 12 }, { str_dup("ARP"), 3 }, { str_dup("IP_ROUTING"), 10 }};
         measured_string_ref     configuration;
         size_t                          count = sizeof( names ) / sizeof( measured_string_t );

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
 

uspace/srv/net/net/start/netstart.c

@@ -69 +69 @@
  *  @returns Other error codes as defined for the task_spawn() function.
  */
-task_id_t       spawn( char * fname );
+task_id_t       spawn( const char * fname );
 
 int main( int argc, char * argv[] ){
@@ -97 +97 @@
 }
 
-task_id_t spawn( char * fname ){
-        char *  argv[ 2 ];
+task_id_t spawn( const char * fname ){
+        const char *    argv[ 2 ];
         task_id_t       res;
 

uspace/srv/net/netif/lo/lo.c

@@ -102 +102 @@
 int netif_get_addr_message( device_id_t device_id, measured_string_ref address ){
         if( ! address ) return EBADMEM;
-        address->value = DEFAULT_ADDR;
+        address->value = str_dup(DEFAULT_ADDR);
         address->length = DEFAULT_ADDR_LEN;
         return EOK;

uspace/srv/net/nil/eth/eth.c

@@ -308 +308 @@
         eth_device_ref  device;
         int                             index;
-        measured_string_t       names[ 2 ] = {{ "ETH_MODE", 8 }, { "ETH_DUMMY", 9 }};
+        measured_string_t       names[ 2 ] = {{ str_dup("ETH_MODE"), 8 }, { str_dup("ETH_DUMMY"), 9 }};
         measured_string_ref     configuration;
         size_t                          count = sizeof( names ) / sizeof( measured_string_t );

uspace/srv/net/structures/module_map.c

@@ -49 +49 @@
 GENERIC_CHAR_MAP_IMPLEMENT( modules, module_t )
 
-int add_module( module_ref * module, modules_ref modules, char * name, char * filename, services_t service, task_id_t task_id, connect_module_t connect_module ){
+int add_module( module_ref * module, modules_ref modules, const char * name, const char * filename, services_t service, task_id_t task_id, connect_module_t connect_module ){
         ERROR_DECLARE;
 
@@ -86 +86 @@
 }
 
-task_id_t spawn( char * fname ){
-        char * argv[ 2 ];
+task_id_t spawn( const char * fname ){
+        const char * argv[ 2 ];
         task_id_t       res;
 

uspace/srv/net/structures/module_map.h

@@ -79 +79 @@
         /** Module name.
          */
-        char *          name;
+        const char *            name;
         /** Module full path filename.
          */
-        char *          filename;
+        const char *            filename;
         /** Connecting function.
          */
@@ -99 +99 @@
  *  @returns ENOMEM if there is not enough memory left.
  */
-int     add_module( module_ref * module, modules_ref modules, char * name, char * filename, services_t service, task_id_t task_id, connect_module_t * connect_module );
+int     add_module( module_ref * module, modules_ref modules, const char * name, const char * filename, services_t service, task_id_t task_id, connect_module_t * connect_module );
 
 /** Searches and returns the specified module.
@@ -116 +116 @@
  *  @returns 0 if there is no such module.
  */
-task_id_t       spawn( char * fname );
+task_id_t       spawn( const char * fname );
 
 #endif

uspace/srv/net/tl/icmp/icmp.c

@@ -464 +464 @@
         ERROR_DECLARE;
 
-        measured_string_t       names[] = {{ "ICMP_ERROR_REPORTING", 20 }, { "ICMP_ECHO_REPLYING", 18 }};
+        measured_string_t       names[] = {{ str_dup("ICMP_ERROR_REPORTING"), 20 }, { str_dup("ICMP_ECHO_REPLYING"), 18 }};
         measured_string_ref     configuration;
         size_t                          count = sizeof( names ) / sizeof( measured_string_t );

uspace/srv/net/tl/udp/udp.c

@@ -192 +192 @@
         ERROR_DECLARE;
 
-        measured_string_t       names[] = {{ "UDP_CHECKSUM_COMPUTING", 22 }, { "UDP_AUTOBINDING", 15 }};
+        measured_string_t       names[] = {{ str_dup("UDP_CHECKSUM_COMPUTING"), 22 }, { str_dup("UDP_AUTOBINDING"), 15 }};
         measured_string_ref     configuration;
         size_t                          count = sizeof( names ) / sizeof( measured_string_t );