Changeset 5a6cc679 in mainline for uspace/lib/trackmod

Timestamp:

2018-01-31T02:21:24Z (8 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

Location:

uspace/lib/trackmod

Files:

• protracker.c (modified) (5 diffs)
• protracker.h (modified) (1 diff)
• trackmod.c (modified) (2 diffs)
• trackmod.h (modified) (1 diff)
• xm.c (modified) (8 diffs)
• xm.h (modified) (1 diff)

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");

uspace/lib/trackmod/protracker.h

@@ -39 +39 @@
 #include "types/trackmod.h"
 
-extern int trackmod_protracker_load(char *, trackmod_module_t **);
+extern errno_t trackmod_protracker_load(char *, trackmod_module_t **);
 
 #endif

uspace/lib/trackmod/trackmod.c

@@ -152 +152 @@
 }
 
-int trackmod_module_load(char *fname, trackmod_module_t **rmodule)
-{
-        int rc;
+errno_t trackmod_module_load(char *fname, trackmod_module_t **rmodule)
+{
+        errno_t rc;
 
         rc = trackmod_xm_load(fname, rmodule);
@@ -780 +780 @@
  * @param rmodplay Place to store pointer to module playback object
  */
-int trackmod_modplay_create(trackmod_module_t *module,
+errno_t trackmod_modplay_create(trackmod_module_t *module,
     unsigned smp_freq, trackmod_modplay_t **rmodplay)
 {

uspace/lib/trackmod/trackmod.h

@@ -40 +40 @@
 
 extern trackmod_module_t *trackmod_module_new(void);
-extern int trackmod_module_load(char *, trackmod_module_t **);
+extern errno_t trackmod_module_load(char *, trackmod_module_t **);
 extern void trackmod_module_destroy(trackmod_module_t *);
-extern int trackmod_modplay_create(trackmod_module_t *, unsigned,
+extern errno_t trackmod_modplay_create(trackmod_module_t *, unsigned,
     trackmod_modplay_t **);
 extern void trackmod_modplay_destroy(trackmod_modplay_t *);

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;
 
@@ -281 +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)
 {
@@ -297 +297 @@
         void *smp_data;
         long pos;
-        int rc;
+        errno_t rc;
         int ret;
 
@@ -422 +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;
@@ -429 +429 @@
         size_t nread;
         size_t hdr_size;
-        int rc;
+        errno_t rc;
 
         f = fopen(fname, "rb");

uspace/lib/trackmod/xm.h

@@ -39 +39 @@
 #include "types/trackmod.h"
 
-extern int trackmod_xm_load(char *, trackmod_module_t **);
+extern errno_t trackmod_xm_load(char *, trackmod_module_t **);
 
 #endif