Changeset 46c20c8 in mainline for uspace/srv/loader/main.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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/srv/loader/main.c (modified) (3 diffs)

uspace/srv/loader/main.c

@@ -58 +58 @@
 #include <errno.h>
 #include <async.h>
-#include <string.h>
+#include <str.h>
 #include <as.h>
 
@@ -241 +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);
@@ -411 +411 @@
                         break;
                 }
-                if ((callid & IPC_CALLID_NOTIFICATION) == 0 &&
-                    IPC_GET_METHOD(call) != IPC_M_PHONE_HUNGUP) {
+                if (IPC_GET_METHOD(call) != IPC_M_PHONE_HUNGUP) {
                         DPRINTF("Responding EINVAL to method %d.\n",
                             IPC_GET_METHOD(call));