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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/loader/main.c

    rfb150d78 r46c20c8  
    5858#include <errno.h>
    5959#include <async.h>
    60 #include <string.h>
     60#include <str.h>
    6161#include <as.h>
    6262
     
    241241                 * Allocate new filv
    242242                 */
    243                 fdi_node_t **_filv = (fdi_node_t *) malloc((count + 1) * sizeof(fdi_node_t *));
     243                fdi_node_t **_filv = (fdi_node_t **) calloc(count + 1, sizeof(fdi_node_t *));
    244244                if (_filv == NULL) {
    245245                        free(buf);
     
    411411                        break;
    412412                }
    413                 if ((callid & IPC_CALLID_NOTIFICATION) == 0 &&
    414                     IPC_GET_METHOD(call) != IPC_M_PHONE_HUNGUP) {
     413                if (IPC_GET_METHOD(call) != IPC_M_PHONE_HUNGUP) {
    415414                        DPRINTF("Responding EINVAL to method %d.\n",
    416415                            IPC_GET_METHOD(call));
Note: See TracChangeset for help on using the changeset viewer.