Changeset 22d990c in mainline for uspace/lib/c

Timestamp:

2020-01-11T00:36:26Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

06599a1

Parents:

8a74512

Message:

Clean up code

Correcting order of includes. Remove unnecessary new lines. Removing
old function declaration. Typos.

Location:

uspace/lib/c

Files:

• generic/async/client.c (modified) (1 diff)
• generic/async/server.c (modified) (3 diffs)
• generic/inetping.c (modified) (1 diff)
• generic/libc.c (modified) (1 diff)
• generic/loader.c (modified) (1 diff)
• generic/loc.c (modified) (1 diff)
• generic/private/async.h (modified) (2 diffs)
• generic/task.c (modified) (3 diffs)
• include/async.h (modified) (1 diff)
• include/ipc/taskman.h (modified) (1 diff)
• include/task.h (modified) (1 diff)

uspace/lib/c/generic/async/client.c

@@ -191 +191 @@
 
         return session;
-}
-
-cap_phone_handle_t async_session_phone(async_sess_t *sess)
-{
-        return sess->phone;
 }
 

uspace/lib/c/generic/async/server.c

@@ -390 +390 @@
  *                    calls routed through that phone.
  * @param in_task_id  Identification of the incoming connection.
- * @param call        Call data of the opening call. If call is NULL, it's
- *                    either a callback connection that was opened by
- *                    accepting the IPC_M_CONNECT_TO_ME call.
+ * @param call        Call data of the opening call. If call is NULL, the
+ *                    connection was opened by accepting the
+ *                    IPC_M_CONNECT_TO_ME call and this function is called
+ *                    directly by the server.
  * @param handler     Connection handler.
  * @param data        Client argument to pass to the connection handler.
@@ -967 +968 @@
 
         // TODO: Log the error.
+
         if (call->cap_handle != CAP_NIL)
                 /* Unknown call from unknown phone - hang it up */
@@ -1740 +1742 @@
         async_sess_t *sess = create_session(phandle, mgmt, 0, 0, 0);
         if (sess == NULL) {
-                ipc_hangup(phandle);
-                async_answer_0(&call, errno);
+                async_answer_0(&call, ENOMEM);
         } else {
                 /* Acknowledge the connected phone */

uspace/lib/c/generic/inetping.c

@@ -60 +60 @@
         inetping_sess = loc_service_connect(inetping_svc, INTERFACE_INETPING,
             IPC_AUTOSTART);
-
         if (inetping_sess == NULL)
                 return ENOENT;

uspace/lib/c/generic/libc.c

@@ -51 +51 @@
 #include "private/libc.h"
 #include "private/async.h"
+#include "private/malloc.h"
 #include "private/io.h"
 #include "private/fibril.h"
-#include "private/malloc.h"
 #include "private/task.h"
 #include "private/taskman.h"

uspace/lib/c/generic/loader.c

@@ -33 +33 @@
  */
 
-#include <async.h>
-#include <errno.h>
 #include <ipc/loader.h>
 #include <ipc/services.h>
 #include <ipc/taskman.h>
+#include <ns.h>
+#include <task.h>
+#include <str.h>
 #include <libc.h>
+#include <stdlib.h>
+#include <async.h>
+#include <errno.h>
+#include <vfs/vfs.h>
 #include <loader/loader.h>
-#include <ns.h>
-#include <stdlib.h>
-#include <str.h>
-#include <task.h>
-#include <vfs/vfs.h>
 
 #include "private/loader.h"

uspace/lib/c/generic/loc.c

@@ -325 +325 @@
         async_exch_t *exch;
 
-        if ((flags & IPC_FLAG_BLOCKING))
+        if (flags & IPC_FLAG_BLOCKING)
                 exch = loc_exchange_begin_blocking(INTERFACE_LOC_CONSUMER);
         else {

uspace/lib/c/generic/private/async.h

@@ -42 +42 @@
 #include <time.h>
 #include <stdbool.h>
-#include <stdatomic.h>
 
 /** Session data */
@@ -109 +108 @@
 extern async_sess_t *create_session(cap_phone_handle_t, exch_mgmt_t,
     sysarg_t, sysarg_t, sysarg_t);
-extern cap_phone_handle_t async_session_phone(async_sess_t *);
 
 #endif

uspace/lib/c/generic/task.c

@@ -35 +35 @@
 /** @file
  */
-
+#include <task.h>
+#include <loader/loader.h>
+#include <stdarg.h>
+#include <str.h>
+#include <macros.h>
 #include <assert.h>
 #include <async.h>
@@ -43 +47 @@
 #include <ipc/taskman.h>
 #include <libc.h>
-#include <loader/loader.h>
-#include <macros.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <str.h>
-#include <task.h>
 #include <taskman.h>
 #include <vfs/vfs.h>
@@ -424 +422 @@
         wait.flags = flags;
         errno_t rc = task_setup_wait(id, &wait);
-
         if (rc != EOK)
                 return rc;

uspace/lib/c/include/async.h

@@ -131 +131 @@
 extern void *async_get_client_data_by_id(task_id_t);
 extern void async_put_client_data_by_id(task_id_t);
-
-extern void async_set_implicit_connection(async_port_handler_t);
 
 extern errno_t async_create_port(iface_t, async_port_handler_t, void *,

uspace/lib/c/include/ipc/taskman.h

@@ -39 +39 @@
 
 typedef enum {
+        TASKMAN_NEW_TASK = IPC_FIRST_USER_METHOD,
+        TASKMAN_CONNECT_TO_NS,
+        TASKMAN_CONNECT_TO_LOADER
+} taskman_connection_t;
+
+typedef enum {
         TASKMAN_WAIT = IPC_FIRST_USER_METHOD,
         TASKMAN_RETVAL,
         TASKMAN_EVENT_CALLBACK,
-        TASKMAN_NEW_TASK,
-
         TASKMAN_I_AM_NS,
-        TASKMAN_I_AM_LOADER,
-
-        TASKMAN_CONNECT_TO_NS,
-        TASKMAN_CONNECT_TO_LOADER
+        TASKMAN_I_AM_LOADER
 } taskman_request_t;
 

uspace/lib/c/include/task.h

@@ -68 +68 @@
     __attribute__((sentinel));
 
+extern void task_cancel_wait(task_wait_t *);
 extern errno_t task_wait(task_wait_t *, task_exit_t *, int *);
 extern errno_t task_wait_task_id(task_id_t, int, task_exit_t *, int *);
-
-extern void task_cancel_wait(task_wait_t *);
 
 extern errno_t task_retval(int);