Changeset b7fd2a0 in mainline for uspace/app/wavplay

Timestamp:

2018-01-13T03:10:29Z (8 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:

a53ed3a

Parents:

36f0738

Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
<sup>git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`</sup>

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

Location:

uspace/app/wavplay

Files:

• dplay.c (modified) (4 diffs)
• drec.c (modified) (2 diffs)
• main.c (modified) (6 diffs)
• wave.c (modified) (1 diff)
• wave.h (modified) (1 diff)

uspace/app/wavplay/dplay.c

@@ -148 +148 @@
         const size_t fragment_size = pb->buffer.size / DEFAULT_FRAGMENTS;
         printf("Registering event callback\n");
-        int ret = audio_pcm_register_event_callback(pb->device,
+        errno_t ret = audio_pcm_register_event_callback(pb->device,
             device_event_callback, pb);
         if (ret != EOK) {
@@ -282 +282 @@
 
                 if (!started) {
-                        int ret = audio_pcm_start_playback(pb->device,
+                        errno_t ret = audio_pcm_start_playback(pb->device,
                             pb->f.channels, pb->f.sampling_rate,
                             pb->f.sample_format);
@@ -309 +309 @@
                         async_usleep(real_delay);
                 /* update buffer position */
-                const int ret = audio_pcm_get_buffer_pos(pb->device, &pos);
+                const errno_t ret = audio_pcm_get_buffer_pos(pb->device, &pos);
                 if (ret != EOK) {
                         printf("Failed to update position indicator %s\n",
@@ -333 +333 @@
 int dplay(const char *device, const char *file)
 {
-        int ret = EOK;
+        errno_t ret = EOK;
         audio_pcm_sess_t *session = NULL;
         if (str_cmp(device, "default") == 0) {

uspace/app/wavplay/drec.c

@@ -139 +139 @@
         assert(rec);
         assert(rec->device);
-        int ret = audio_pcm_register_event_callback(rec->device,
+        errno_t ret = audio_pcm_register_event_callback(rec->device,
             device_event_callback, rec);
         if (ret != EOK) {
@@ -174 +174 @@
 int drecord(const char *device, const char *file)
 {
-        int ret = EOK;
+        errno_t ret = EOK;
         audio_pcm_sess_t *session = NULL;
         sysarg_t val;

uspace/app/wavplay/main.c

@@ -57 +57 @@
  * @return Error code.
  */
-static int hplay_ctx(hound_context_t *ctx, const char *filename)
+static errno_t hplay_ctx(hound_context_t *ctx, const char *filename)
 {
         printf("Hound context playback: %s\n", filename);
@@ -76 +76 @@
         pcm_format_t format;
         const char *error;
-        int ret = wav_parse_header(&header, NULL, NULL, &format.channels,
+        errno_t ret = wav_parse_header(&header, NULL, NULL, &format.channels,
             &format.sampling_rate, &format.sample_format, &error);
         if (ret != EOK) {
@@ -118 +118 @@
  * @return Error code
  */
-static int hplay(const char *filename)
+static errno_t hplay(const char *filename)
 {
         printf("Hound playback: %s\n", filename);
@@ -137 +137 @@
         pcm_format_t format;
         const char *error;
-        int ret = wav_parse_header(&header, NULL, NULL, &format.channels,
+        errno_t ret = wav_parse_header(&header, NULL, NULL, &format.channels,
             &format.sampling_rate, &format.sample_format, &error);
         if (ret != EOK) {
@@ -197 +197 @@
  * @return Error code.
  */
-static int play_wrapper(void *arg)
+static errno_t play_wrapper(void *arg)
 {
         assert(arg);
         fib_play_t *p = arg;
-        const int ret = hplay_ctx(p->ctx, p->file);
+        const errno_t ret = hplay_ctx(p->ctx, p->file);
         atomic_dec(p->count);
         free(arg);
@@ -289 +289 @@
                         return 1;
                 }
-                const int ret = hound_context_connect_target(hound_ctx,
+                const errno_t ret = hound_context_connect_target(hound_ctx,
                     HOUND_DEFAULT_TARGET);
                 if (ret != EOK) {

uspace/app/wavplay/wave.c

@@ -52 +52 @@
  * Does sanity checks and endian conversion.
  */
-int wav_parse_header(const void *hdata, const void **data, size_t *data_size,
+errno_t wav_parse_header(const void *hdata, const void **data, size_t *data_size,
     unsigned *channels, unsigned *sampling_rate, pcm_sample_format_t *format,
     const char **error)

uspace/app/wavplay/wave.h

@@ -90 +90 @@
 } wave_header_t;
 
-int wav_parse_header(const void *, const void**, size_t *, unsigned *,
+errno_t wav_parse_header(const void *, const void**, size_t *, unsigned *,
     unsigned *, pcm_sample_format_t *, const char **);