Changeset 80e9e5e in mainline for uspace/srv/devman/util.c

Timestamp:

2011-07-27T01:54:34Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

0837ab4

Parents:

c936c7f (diff), 75aa59a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/srv/devman/util.c (modified) (2 diffs)

uspace/srv/devman/util.c

@@ -91 +91 @@
 }
 
-char *clone_string(const char *s)
-{
-        size_t size = str_size(s) + 1;
-        char *str;
-        
-        str = (char *) malloc(size);
-        if (str != NULL)
-                str_cpy(str, size, s);
-        return str;
-}
-
 void replace_char(char *str, char orig, char repl)
 {
@@ -111 +100 @@
 }
 
-ssize_t safe_read(int fd, void *buffer, size_t size)
-{
-        if (size == 0) {
-                return 0;
-        }
-
-        uint8_t *buf_ptr = (uint8_t *) buffer;
-
-        size_t total_read = 0;
-        while (total_read < size) {
-                ssize_t bytes_read = read(fd, buf_ptr, size - total_read);
-                if (bytes_read < 0) {
-                        /* Error. */
-                        return bytes_read;
-                } else if (bytes_read == 0) {
-                        /* Possibly end of file. */
-                        break;
-                } else {
-                        /* Read at least something. */
-                        buf_ptr += bytes_read;
-                        total_read += bytes_read;
-                }
-        }
-
-        return (ssize_t) total_read;
-}
-
 /** @}
  */