Changeset 132ab5d1 in mainline for uspace/srv/fs/exfat/exfat_directory.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/srv/fs/exfat/exfat_directory.c (modified) (5 diffs)

uspace/srv/fs/exfat/exfat_directory.c

@@ -43 +43 @@
 #include <byteorder.h>
 #include <mem.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <str.h>
 #include <align.h>
@@ -218 +218 @@
         uint16_t wname[EXFAT_FILENAME_LEN + 1];
         exfat_dentry_t *d = NULL;
-        int rc, i;
+        int rc;
+        int i;
         size_t offset = 0;
         aoff64_t start_pos = 0;
@@ -305 +306 @@
     exfat_stream_dentry_t *ds)
 {
-        int rc, i, count;
+        int rc;
+        int i, count;
         exfat_dentry_t *array = NULL, *de;
         aoff64_t pos = di->pos;
@@ -372 +374 @@
         exfat_dentry_t df, ds, *de;
         uint16_t wname[EXFAT_FILENAME_LEN + 1];
-        int rc, i;
+        int rc;
+        int i;
         size_t uctable_chars, j;
         aoff64_t pos;
@@ -473 +476 @@
 int exfat_directory_erase_file(exfat_directory_t *di, aoff64_t pos)
 {
-        int rc, count;
+        int rc;
+        int count;
         exfat_dentry_t *de;