Changeset d5c1051 in mainline for uspace/lib/trackmod/xm.c

Timestamp:

2017-12-20T22:25:34Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

39b54fe

Parents:

8610c2c

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-20 22:22:29)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-20 22:25:34)

Message:

"Obviously harmless" error handling tweaks.

File:

• uspace/lib/trackmod/xm.c (modified) (6 diffs)

uspace/lib/trackmod/xm.c

@@ -174 +174 @@
         long seek_amount;
         int rc;
+        int ret;
 
         module->pattern = calloc(sizeof(trackmod_pattern_t), module->patterns);
@@ -182 +183 @@
 
         for (i = 0; i < module->patterns; i++) {
-                rc = fread(&pattern, 1, sizeof(xm_pattern_t), f);
-                if (rc != sizeof(xm_pattern_t)) {
+                ret = fread(&pattern, 1, sizeof(xm_pattern_t), f);
+                if (ret != sizeof(xm_pattern_t)) {
                         rc = EIO;
                         goto error;
@@ -297 +298 @@
         long pos;
         int rc;
+        int ret;
 
         module->instrs = uint16_t_le2host(xm_hdr->instruments);
@@ -305 +307 @@
         for (i = 0; i < module->instrs; i++) {
                 pos = ftell(f);
-                rc = fread(&instr, 1, sizeof(xm_instr_t), f);
-                if (rc != sizeof(xm_instr_t)) {
+                ret = fread(&instr, 1, sizeof(xm_instr_t), f);
+                if (ret != sizeof(xm_instr_t)) {
                         rc = EIO;
                         goto error;
@@ -315 +317 @@
 
                 if (samples > 0) {
-                        rc = fread(&instrx, 1, sizeof(xm_instr_ext_t), f);
-                        if (rc != sizeof(xm_instr_ext_t)) {
+                        ret = fread(&instrx, 1, sizeof(xm_instr_ext_t), f);
+                        if (ret != sizeof(xm_instr_ext_t)) {
                                 rc = EIO;
                                 goto error;
@@ -346 +348 @@
                         pos = ftell(f);
 
-                        rc = fread(&smp, 1, sizeof(xm_smp_t), f);
-                        if (rc != sizeof(xm_smp_t)) {
+                        ret = fread(&smp, 1, sizeof(xm_smp_t), f);
+                        if (ret != sizeof(xm_smp_t)) {
                                 rc = EIO;
                                 goto error;