Changeset 92fd52d7 in mainline for uspace/srv/loader/main.c

Timestamp:

2009-04-09T21:16:50Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

7afb4a5

Parents:

a2c58f6

Message:

Nuke strcpy() and strcmp().

File:

• uspace/srv/loader/main.c (modified) (5 diffs)

uspace/srv/loader/main.c

@@ -151 +151 @@
 {
         ipc_callid_t callid;
-        size_t buf_len, arg_len;
+        size_t buf_size, arg_size;
         char *p;
         int n;
         
-        if (!ipc_data_write_receive(&callid, &buf_len)) {
+        if (!ipc_data_write_receive(&callid, &buf_size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -171 +171 @@
         }
         
-        arg_buf = malloc(buf_len + 1);
+        arg_buf = malloc(buf_size + 1);
         if (!arg_buf) {
                 ipc_answer_0(callid, ENOMEM);
@@ -178 +178 @@
         }
         
-        ipc_data_write_finalize(callid, arg_buf, buf_len);
-        
-        arg_buf[buf_len] = '\0';
+        ipc_data_write_finalize(callid, arg_buf, buf_size);
+        
+        arg_buf[buf_size] = '\0';
         
         /*
@@ -187 +187 @@
         p = arg_buf;
         n = 0;
-        while (p < arg_buf + buf_len) {
-                arg_len = strlen(p);
-                p = p + arg_len + 1;
+        while (p < arg_buf + buf_size) {
+                arg_size = str_size(p);
+                p = p + arg_size + 1;
                 ++n;
         }
@@ -207 +207 @@
         p = arg_buf;
         n = 0;
-        while (p < arg_buf + buf_len) {
+        while (p < arg_buf + buf_size) {
                 argv[n] = p;
                 
-                arg_len = strlen(p);
-                p = p + arg_len + 1;
+                arg_size = str_size(p);
+                p = p + arg_size + 1;
                 ++n;
         }