Changes in uspace/srv/loader/main.c [b4cbef1:19f857a] in mainline

File:

• uspace/srv/loader/main.c (modified) (6 diffs)

uspace/srv/loader/main.c

@@ -58 +58 @@
 #include <errno.h>
 #include <async.h>
-#include <string.h>
+#include <str.h>
 #include <as.h>
 
@@ -126 +126 @@
 {
         char *buf;
-        int rc = async_string_receive(&buf, 0, NULL);
+        int rc = async_data_write_accept((void **) &buf, true, 0, 0, 0, NULL);
         
         if (rc == EOK) {
@@ -146 +146 @@
 {
         char *buf;
-        int rc = async_string_receive(&buf, 0, NULL);
+        int rc = async_data_write_accept((void **) &buf, true, 0, 0, 0, NULL);
         
         if (rc == EOK) {
@@ -167 +167 @@
         char *buf;
         size_t buf_size;
-        int rc = async_string_receive(&buf, 0, &buf_size);
+        int rc = async_data_write_accept((void **) &buf, true, 0, 0, 0, &buf_size);
         
         if (rc == EOK) {
@@ -232 +232 @@
         fdi_node_t *buf;
         size_t buf_size;
-        int rc = async_data_receive(&buf, 0, 0, sizeof(fdi_node_t), &buf_size);
+        int rc = async_data_write_accept((void **) &buf, false, 0, 0,
+            sizeof(fdi_node_t), &buf_size);
         
         if (rc == EOK) {
@@ -240 +241 @@
                  * Allocate new filv
                  */
-                fdi_node_t **_filv = (fdi_node_t *) malloc((count + 1) * sizeof(fdi_node_t *));
+                fdi_node_t **_filv = (fdi_node_t **) calloc(count + 1, sizeof(fdi_node_t *));
                 if (_filv == NULL) {
                         free(buf);