Changeset 5a6cc679 in mainline for uspace/app/sysinst/futil.c

Timestamp:

2018-01-31T02:21:24Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

• uspace/app/sysinst/futil.c (modified) (4 diffs)

uspace/app/sysinst/futil.c

@@ -54 +54 @@
  * @return EOK on success, EIO on I/O error
  */
-int futil_copy_file(const char *srcp, const char *destp)
+errno_t futil_copy_file(const char *srcp, const char *destp)
 {
         int sf, df;
         size_t nr, nw;
-        int rc;
+        errno_t rc;
         aoff64_t posr = 0, posw = 0;
 
@@ -104 +104 @@
  * @return EOK on success, ENOMEM if out of memory, EIO on I/O error
  */
-int futil_rcopy_contents(const char *srcdir, const char *destdir)
+errno_t futil_rcopy_contents(const char *srcdir, const char *destdir)
 {
         DIR *dir;
@@ -110 +110 @@
         struct stat s;
         char *srcp, *destp;
-        int rc;
+        errno_t rc;
 
         dir = opendir(srcdir);
@@ -158 +158 @@
  *         I/O error, ENOMEM if out of memory
  */
-int futil_get_file(const char *srcp, void **rdata, size_t *rsize)
+errno_t futil_get_file(const char *srcp, void **rdata, size_t *rsize)
 {
         int sf;
         size_t nr;
-        int rc;
+        errno_t rc;
         size_t fsize;
         char *data;