Changeset 132ab5d1 in mainline for uspace/lib/c/generic/vbd.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/lib/c/generic/vbd.c (modified) (10 diffs)

uspace/lib/c/generic/vbd.c

@@ -95 +95 @@
  * @param count Place to store length of array (number of entries)
  *
- * @return EOK on success or negative error code
+ * @return EOK on success or an error code
  */
 int vbd_get_disks(vbd_t *vbd, service_id_t **data, size_t *count)
@@ -106 +106 @@
 {
         async_exch_t *exch;
-        sysarg_t retval;
+        int retval;
         ipc_call_t answer;
 
@@ -165 +165 @@
  * @param act_size Place to store actual size of complete data.
  *
- * @return EOK on success or negative error code.
+ * @return EOK on success or an error code.
  */
 static int vbd_get_ids_once(vbd_t *vbd, sysarg_t method, sysarg_t arg1,
@@ -183 +183 @@
         }
 
-        sysarg_t retval;
+        int retval;
         async_wait_for(req, &retval);
 
@@ -203 +203 @@
  * @param data   Place to store pointer to array of IDs
  * @param count  Place to store number of IDs
- * @return       EOK on success or negative error code
+ * @return       EOK on success or an error code
  */
 static int vbd_get_ids_internal(vbd_t *vbd, sysarg_t method, sysarg_t arg1,
@@ -247 +247 @@
  * @param count Place to store length of array (number of entries)
  *
- * @return EOK on success or negative error code
+ * @return EOK on success or an error code
  */
 int vbd_label_get_parts(vbd_t *vbd, service_id_t disk,
@@ -259 +259 @@
 {
         async_exch_t *exch;
-        sysarg_t retval;
+        int retval;
         ipc_call_t answer;
 
@@ -283 +283 @@
 {
         async_exch_t *exch;
-        sysarg_t retval;
+        int retval;
         ipc_call_t answer;
 
@@ -332 +332 @@
  * @param ptype Place to store suggested partition type
  *
- * @return EOK on success or negative error code
+ * @return EOK on success or an error code
  */
 int vbd_suggest_ptype(vbd_t *vbd, service_id_t disk, label_pcnt_t pcnt,
@@ -338 +338 @@
 {
         async_exch_t *exch;
-        sysarg_t retval;
+        int retval;
         ipc_call_t answer;