# HG changeset patch # User Paul Boddie # Date 1553363818 -3600 # Node ID 6111106f694741fc0af2d2feee40e13e746d53c5 # Parent bfbbaefd3a57c345f20e4a02e3b28670c326a77d Renamed error to send_error. Employed the start_resource convenience function. diff -r bfbbaefd3a57 -r 6111106f6947 server/src/main.cc --- a/server/src/main.cc Wed Feb 20 16:11:49 2019 +0100 +++ b/server/src/main.cc Sat Mar 23 18:56:58 2019 +0100 @@ -75,7 +75,7 @@ break; default: - error(msg, -L4_EBADPROTO); + send_error(msg, -L4_EBADPROTO); break; } } @@ -98,7 +98,7 @@ err = import_dataspace(msg, 0, &ds, (l4_addr_t *) &buffer); if (err) { - error(msg, -L4_EIO); + send_error(msg, -L4_EIO); return; } @@ -108,7 +108,7 @@ if (selected < 0) { - error(msg, -L4_ENOENT); + send_error(msg, -L4_ENOENT); return; } @@ -125,7 +125,7 @@ err = fs_ipc_open(flags, _servers[selected], op, ds, &server, &size); if (err) { - error(msg, -L4_EIO); + send_error(msg, -L4_EIO); return; } @@ -154,7 +154,7 @@ err = import_capability(msg, 0, &server); if (err) { - error(msg, -L4_EIO); + send_error(msg, -L4_EIO); return; } @@ -163,7 +163,7 @@ err = import_dataspace(msg, 1, &ds, (l4_addr_t *) &buffer); if (err) { - error(msg, -L4_EIO); + send_error(msg, -L4_EIO); return; }