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

Timestamp:

2010-11-19T21:28:02Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a9c6b966

Parents:

45f04f8 (diff), aaa3f33a (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 xxx_ref typedefs removal.

File:

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

uspace/srv/net/net/net.c

@@ -88 +88 @@
  *
  */
-int add_configuration(measured_strings_ref configuration, const char *name,
+int add_configuration(measured_strings_t *configuration, const char *name,
     const char *value)
 {
         int rc;
         
-        measured_string_ref setting =
+        measured_string_t *setting =
             measured_string_create_bulk(value, 0);
         if (!setting)
@@ -117 +117 @@
 }
 
-static int parse_line(measured_strings_ref configuration, char *line)
+static int parse_line(measured_strings_t *configuration, char *line)
 {
         int rc;
@@ -163 +163 @@
         
         /* Create a bulk measured string till the end */
-        measured_string_ref setting =
+        measured_string_t *setting =
             measured_string_create_bulk(value, 0);
         if (!setting)
@@ -179 +179 @@
 
 static int read_configuration_file(const char *directory, const char *filename,
-    measured_strings_ref configuration)
+    measured_strings_t *configuration)
 {
         printf("%s: Reading configuration file %s/%s\n", NAME, directory, filename);
@@ -356 +356 @@
  *
  */
-static int net_get_conf(measured_strings_ref netif_conf,
-    measured_string_ref configuration, size_t count, char **data)
+static int net_get_conf(measured_strings_t *netif_conf,
+    measured_string_t *configuration, size_t count, char **data)
 {
         if (data)
@@ -364 +364 @@
         size_t index;
         for (index = 0; index < count; index++) {
-                measured_string_ref setting =
+                measured_string_t *setting =
                     measured_strings_find(netif_conf, configuration[index].value, 0);
                 if (!setting)
@@ -382 +382 @@
 }
 
-int net_get_conf_req(int net_phone, measured_string_ref *configuration,
+int net_get_conf_req(int net_phone, measured_string_t **configuration,
     size_t count, char **data)
 {
@@ -392 +392 @@
 
 int net_get_device_conf_req(int net_phone, device_id_t device_id,
-    measured_string_ref *configuration, size_t count, char **data)
+    measured_string_t **configuration, size_t count, char **data)
 {
         if ((!configuration) || (count == 0))
@@ -404 +404 @@
 }
 
-void net_free_settings(measured_string_ref settings, char *data)
+void net_free_settings(measured_string_t *settings, char *data)
 {
 }
@@ -429 +429 @@
         
         /* Mandatory netif */
-        measured_string_ref setting =
+        measured_string_t *setting =
             measured_strings_find(&netif->configuration, CONF_NETIF, 0);
         
@@ -550 +550 @@
                 
                 /* Mandatory name */
-                measured_string_ref setting =
+                measured_string_t *setting =
                     measured_strings_find(&netif->configuration, CONF_NAME, 0);
                 if (!setting) {
@@ -620 +620 @@
     int *answer_count)
 {
-        measured_string_ref strings;
+        measured_string_t *strings;
         char *data;
         int rc;