Changeset 32eceb4f in mainline for uspace/lib/net/generic/net_remote.c

Timestamp:

2010-11-20T22:30:36Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

cb59f787

Parents:

1b22bd4 (diff), 7e1f9b7 (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/lib/net/generic/net_remote.c (modified) (4 diffs)

uspace/lib/net/generic/net_remote.c

@@ -49 +49 @@
 /** Connects to the networking module.
  *
- * @returns             The networking module phone on success.
+ * @return              The networking module phone on success.
  */
 int net_connect_module(void)
@@ -63 +63 @@
  * @see net_get_conf_req()
  */
-void net_free_settings(measured_string_ref settings, char *data)
+void net_free_settings(measured_string_t *settings, char *data)
 {
         if (settings)
@@ -83 +83 @@
  * @param[in] count     The configuration entries count.
  * @param[in,out] data  The configuration and settings data.
- * @returns             EOK on success.
- * @returns             EINVAL if the configuration is NULL.
- * @returns             EINVAL if the count is zero.
- * @returns             Other error codes as defined for the
+ * @return              EOK on success.
+ * @return              EINVAL if the configuration is NULL.
+ * @return              EINVAL if the count is zero.
+ * @return              Other error codes as defined for the
  *                      generic_translate_req() function.
  */
 int
-net_get_conf_req(int net_phone, measured_string_ref *configuration,
+net_get_conf_req(int net_phone, measured_string_t **configuration,
     size_t count, char **data)
 {
@@ -110 +110 @@
  * @param[in] count     The configuration entries count.
  * @param[in,out] data  The configuration and settings data.
- * @returns             EOK on success.
- * @returns             EINVAL if the configuration is NULL.
- * @returns             EINVAL if the count is zero.
- * @returns             Other error codes as defined for the
+ * @return              EOK on success.
+ * @return              EINVAL if the configuration is NULL.
+ * @return              EINVAL if the count is zero.
+ * @return              Other error codes as defined for the
  *                      generic_translate_req() function.
  */
 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)
 {
         return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF,