Changeset 45058baa in mainline

Timestamp:

2011-08-16T17:53:09Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

12f9f0d0, db6e419

Parents:

cce8a83

Message:

Use async_data_read() instead of async_data_read_start() to get actual number of bytes read.

File:

• uspace/lib/c/generic/loc.c (modified) (2 diffs)

uspace/lib/c/generic/loc.c

@@ -304 +304 @@
         async_exch_t *exch;
         char name_buf[LOC_NAME_MAXLEN + 1];
+        ipc_call_t dreply;
+        size_t act_size;
+        sysarg_t dretval;
         
         *name = NULL;
-        memset(name_buf, 0, LOC_NAME_MAXLEN + 1);
         exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER);
         
         ipc_call_t answer;
         aid_t req = async_send_1(exch, LOC_SERVICE_GET_NAME, svc_id, &answer);
-        int rc = async_data_read_start(exch, name_buf, LOC_NAME_MAXLEN);
-        
-        loc_exchange_end(exch);
-        
-        if (rc != EOK) {
+        aid_t dreq = async_data_read(exch, name_buf, LOC_NAME_MAXLEN,
+            &dreply);
+        async_wait_for(dreq, &dretval);
+        
+        loc_exchange_end(exch);
+        
+        if (dretval != EOK) {
                 async_wait_for(req, NULL);
-                return rc;
+                return dretval;
         }
         
@@ -326 +330 @@
                 return retval;
         
+        act_size = IPC_GET_ARG2(dreply);
+        assert(act_size <= LOC_NAME_MAXLEN);
+        name_buf[act_size] = '\0';
+
         *name = str_dup(name_buf);
         if (*name == NULL)