Changes in uspace/lib/trackmod/protracker.c [43dd72b7:b7fd2a0] in mainline

File:

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

uspace/lib/trackmod/protracker.c

@@ -79 +79 @@
  * @return         EOK on success, EINVAL if tag is not recognized.
  */
-static int smp_tag_decode(uint8_t *tag, size_t *channels)
+static errno_t smp_tag_decode(uint8_t *tag, size_t *channels)
 {
         size_t nentries = sizeof(smp_tags) / sizeof(smptag_desc_t);
@@ -138 +138 @@
  * @return       EOK on success, ENOMEM if out of memory, EIO on I/O error.
  */
-static int protracker_load_patterns(FILE *f, trackmod_module_t *module)
+static errno_t protracker_load_patterns(FILE *f, trackmod_module_t *module)
 {
         size_t cells;
         size_t i, j;
-        int rc;
+        errno_t rc;
         size_t nread;
         uint32_t *buf = NULL;
@@ -191 +191 @@
  * @return       EOk on success, ENOMEM if out of memory, EIO on I/O error.
  */
-static int protracker_load_samples(FILE *f, protracker_smp_t *smp,
+static errno_t protracker_load_samples(FILE *f, protracker_smp_t *smp,
     trackmod_module_t *module)
 {
-        int rc;
+        errno_t rc;
         size_t i;
         uint8_t ftval;
@@ -256 +256 @@
  *                or if any error is found in the format of the file.
  */
-int trackmod_protracker_load(char *fname, trackmod_module_t **rmodule)
+errno_t trackmod_protracker_load(char *fname, trackmod_module_t **rmodule)
 {
         FILE *f = NULL;
@@ -269 +269 @@
         size_t i;
         size_t nread;
-        int rc;
+        errno_t rc;
 
         f = fopen(fname, "rb");
@@ -302 +302 @@
                 memcpy(&mod15, &mod31, sizeof(protracker_15smp_t));
 
-                rc = fseek(f, sizeof(protracker_15smp_t), SEEK_SET);
-                if (rc != 0) {
+                if (fseek(f, sizeof(protracker_15smp_t), SEEK_SET) < 0) {
                         printf("Error seeking.\n");
                         rc = EIO;