Changeset b7fd2a0 in mainline for uspace/srv/ns

Timestamp:

2018-01-13T03:10:29Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

a53ed3a

Parents:

36f0738

Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
<sup>git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`</sup>

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

Location:

uspace/srv/ns

Files:

• clonable.c (modified) (2 diffs)
• clonable.h (modified) (1 diff)
• ns.c (modified) (2 diffs)
• service.c (modified) (3 diffs)
• service.h (modified) (1 diff)
• task.c (modified) (5 diffs)
• task.h (modified) (1 diff)

uspace/srv/ns/clonable.c

@@ -55 +55 @@
 static list_t cs_req;
 
-int clonable_init(void)
+errno_t clonable_init(void)
 {
         list_initialize(&cs_req);
@@ -128 +128 @@
         
         /* Spawn a loader. */
-        int rc = loader_spawn("loader");
+        errno_t rc = loader_spawn("loader");
         
         if (rc != EOK) {

uspace/srv/ns/clonable.h

@@ -39 +39 @@
 #include <stdbool.h>
 
-extern int clonable_init(void);
+extern errno_t clonable_init(void);
 
 extern bool service_clonable(service_t);

uspace/srv/ns/ns.c

@@ -80 +80 @@
                 
                 task_id_t id;
-                int retval;
+                errno_t retval;
                 
                 service_t service;
@@ -131 +131 @@
         printf("%s: HelenOS IPC Naming Service\n", NAME);
         
-        int rc = service_init();
+        errno_t rc = service_init();
         if (rc != EOK)
                 return rc;

uspace/srv/ns/service.c

@@ -95 +95 @@
 static list_t pending_conn;
 
-int service_init(void)
+errno_t service_init(void)
 {
         if (!hash_table_create(&service_hash_table, 0, 0,
@@ -139 +139 @@
  *
  */
-int register_service(service_t service, sysarg_t phone, ipc_call_t *call)
+errno_t register_service(service_t service, sysarg_t phone, ipc_call_t *call)
 {
         if (hash_table_find(&service_hash_table, &service))
@@ -173 +173 @@
         sysarg_t arg3 = IPC_GET_ARG3(*call);
         sysarg_t flags = IPC_GET_ARG4(*call);
-        int retval;
+        errno_t retval;
         
         ht_link_t *link = hash_table_find(&service_hash_table, &service);

uspace/srv/ns/service.h

@@ -38 +38 @@
 #include <abi/ipc/interfaces.h>
 
-extern int service_init(void);
+extern errno_t service_init(void);
 extern void process_pending_conn(void);
 
-extern int register_service(service_t, sysarg_t, ipc_call_t *);
+extern errno_t register_service(service_t, sysarg_t, ipc_call_t *);
 extern void connect_to_service(service_t, iface_t, ipc_call_t *, ipc_callid_t);
 

uspace/srv/ns/task.c

@@ -151 +151 @@
 static list_t pending_wait;
 
-int task_init(void)
+errno_t task_init(void)
 {
         if (!hash_table_create(&task_hash_table, 0, 0, &task_hash_table_ops)) {
@@ -225 +225 @@
 }
 
-int ns_task_id_intro(ipc_call_t *call)
+errno_t ns_task_id_intro(ipc_call_t *call)
 {
         task_id_t id = MERGE_LOUP32(IPC_GET_ARG1(*call), IPC_GET_ARG2(*call));
@@ -264 +264 @@
 }
 
-static int get_id_by_phone(sysarg_t phone_hash, task_id_t *id)
+static errno_t get_id_by_phone(sysarg_t phone_hash, task_id_t *id)
 {
         ht_link_t *link = hash_table_find(&phone_to_id, &phone_hash);
@@ -276 +276 @@
 }
 
-int ns_task_retval(ipc_call_t *call)
+errno_t ns_task_retval(ipc_call_t *call)
 {
         task_id_t id = call->in_task_id;
@@ -296 +296 @@
 }
 
-int ns_task_disconnect(ipc_call_t *call)
+errno_t ns_task_disconnect(ipc_call_t *call)
 {
         task_id_t id;
-        int rc = get_id_by_phone(call->in_phone_hash, &id);
+        errno_t rc = get_id_by_phone(call->in_phone_hash, &id);
         if (rc != EOK)
                 return rc;

uspace/srv/ns/task.h

@@ -37 +37 @@
 #include <abi/proc/task.h>
 
-extern int task_init(void);
+extern errno_t task_init(void);
 extern void process_pending_wait(void);
 
 extern void wait_for_task(task_id_t, ipc_call_t *, ipc_callid_t);
 
-extern int ns_task_id_intro(ipc_call_t *);
-extern int ns_task_disconnect(ipc_call_t *);
-extern int ns_task_retval(ipc_call_t *);
+extern errno_t ns_task_id_intro(ipc_call_t *);
+extern errno_t ns_task_disconnect(ipc_call_t *);
+extern errno_t ns_task_retval(ipc_call_t *);