Changeset 6efd162 in mainline for uspace/drv/bus/isa/isa.c

Timestamp:

2015-04-05T07:50:32Z (9 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

eb94d84

Parents:

c0393db

Message:

isa: partially revert the previous commit and replace read() with read_all().

As pointed out by Jakub, we already have a read_all() function in libc.

File:

• uspace/drv/bus/isa/isa.c (modified) (4 diffs)

uspace/drv/bus/isa/isa.c

@@ -245 +245 @@
         bool opened = false;
         int fd;
-        size_t file_len;
-        size_t total_read = 0;
+        size_t len;
         ssize_t r;
 
@@ -257 +256 @@
         opened = true;
 
-        file_len = lseek(fd, 0, SEEK_END);
+        len = lseek(fd, 0, SEEK_END);
         lseek(fd, 0, SEEK_SET);
-        if (file_len == 0) {
+        if (len == 0) {
                 ddf_msg(LVL_ERROR, "Configuration file '%s' is empty.",
                     conf_path);
@@ -265 +264 @@
         }
 
-        buf = malloc(file_len + 1);
+        buf = malloc(len + 1);
         if (buf == NULL) {
                 ddf_msg(LVL_ERROR, "Memory allocation failed.");
@@ -271 +270 @@
         }
 
-        do {
-                r = read(fd, &buf[total_read], file_len - total_read);
-                if (r < 0) {
-                        ddf_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path);
-                        goto cleanup;
-                }
-
-                total_read += r;
-        } while (total_read < file_len);
-
-        buf[file_len] = 0;
+        r = read_all(fd, buf, len);
+        if (r < 0) {
+                ddf_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path);
+                goto cleanup;
+        }
+
+        buf[len] = 0;
 
         suc = true;