Changes in uspace/lib/trackmod/xm.c [16bfcd3:b7fd2a0] in mainline

File:

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

uspace/lib/trackmod/xm.c

@@ -53 +53 @@
  * @return EOK on success, EIO on format error, ENOMEM if out of memory.
  */
-static int trackmod_xm_load_order_list(xm_hdr_t *xm_hdr, trackmod_module_t *module)
+static errno_t trackmod_xm_load_order_list(xm_hdr_t *xm_hdr, trackmod_module_t *module)
 {
-        int rc;
+        errno_t rc;
         size_t i;
 
@@ -94 +94 @@
  * @return        EOK on success, EINVAL if there is error in the coded data.
  */
-static int trackmod_xm_decode_pattern(uint8_t *data, size_t dsize,
+static errno_t trackmod_xm_decode_pattern(uint8_t *data, size_t dsize,
     trackmod_pattern_t *pattern)
 {
@@ -162 +162 @@
  * @return EOK on success, EIO on format error, ENOMEM if out of memory.
  */
-static int trackmod_xm_load_patterns(FILE *f, trackmod_module_t *module)
+static errno_t trackmod_xm_load_patterns(FILE *f, trackmod_module_t *module)
 {
         size_t i;
@@ -173 +173 @@
         uint8_t *buf = NULL;
         long seek_amount;
-        int rc;
+        errno_t 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;
@@ -280 +281 @@
  * @return EOK on success, EIO on format error, ENOMEM if out of memory.
  */
-static int trackmod_xm_load_instruments(xm_hdr_t *xm_hdr, FILE *f,
+static errno_t trackmod_xm_load_instruments(xm_hdr_t *xm_hdr, FILE *f,
     trackmod_module_t *module)
 {
@@ -296 +297 @@
         void *smp_data;
         long pos;
-        int rc;
+        errno_t 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;
@@ -420 +422 @@
  *                or if any error is found in the format of the file.
  */
-int trackmod_xm_load(char *fname, trackmod_module_t **rmodule)
+errno_t trackmod_xm_load(char *fname, trackmod_module_t **rmodule)
 {
         FILE *f = NULL;
@@ -427 +429 @@
         size_t nread;
         size_t hdr_size;
-        int rc;
+        errno_t rc;
 
         f = fopen(fname, "rb");