diff options
-rw-r--r-- | apps/mpeg.c | 2 | ||||
-rw-r--r-- | apps/tagcache.c | 6 | ||||
-rw-r--r-- | firmware/buflib.c | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/apps/mpeg.c b/apps/mpeg.c index 2beece1c0c..2a2821bcda 100644 --- a/apps/mpeg.c +++ b/apps/mpeg.c | |||
@@ -128,6 +128,7 @@ static struct trackdata trackdata[MAX_TRACK_ENTRIES]; | |||
128 | static unsigned int current_track_counter = 0; | 128 | static unsigned int current_track_counter = 0; |
129 | 129 | ||
130 | #ifndef SIMULATOR | 130 | #ifndef SIMULATOR |
131 | static void stop_playing(void); | ||
131 | /* Play time of the previous track */ | 132 | /* Play time of the previous track */ |
132 | static unsigned long prev_track_elapsed; | 133 | static unsigned long prev_track_elapsed; |
133 | 134 | ||
@@ -493,7 +494,6 @@ unsigned long mpeg_get_last_header(void) | |||
493 | #endif /* !SIMULATOR */ | 494 | #endif /* !SIMULATOR */ |
494 | } | 495 | } |
495 | 496 | ||
496 | static void stop_playing(void); | ||
497 | static void do_stop(void) | 497 | static void do_stop(void) |
498 | { | 498 | { |
499 | is_playing = false; | 499 | is_playing = false; |
diff --git a/apps/tagcache.c b/apps/tagcache.c index 5ab77264f6..e3f2f4fe68 100644 --- a/apps/tagcache.c +++ b/apps/tagcache.c | |||
@@ -3905,9 +3905,7 @@ static bool allocate_tagcache(void) | |||
3905 | static bool tagcache_dumpload(void) | 3905 | static bool tagcache_dumpload(void) |
3906 | { | 3906 | { |
3907 | struct statefile_header shdr; | 3907 | struct statefile_header shdr; |
3908 | int fd, rc; | 3908 | int fd, rc, handle; |
3909 | long offpos; | ||
3910 | int i, handle; | ||
3911 | 3909 | ||
3912 | fd = open(TAGCACHE_STATEFILE, O_RDONLY); | 3910 | fd = open(TAGCACHE_STATEFILE, O_RDONLY); |
3913 | if (fd < 0) | 3911 | if (fd < 0) |
@@ -3932,7 +3930,7 @@ static bool tagcache_dumpload(void) | |||
3932 | /* Lets allocate real memory and load it */ | 3930 | /* Lets allocate real memory and load it */ |
3933 | handle = core_alloc_ex("tc ramcache", shdr.tc_stat.ramcache_allocated, &ops); | 3931 | handle = core_alloc_ex("tc ramcache", shdr.tc_stat.ramcache_allocated, &ops); |
3934 | ramcache_hdr = core_get_data(handle); | 3932 | ramcache_hdr = core_get_data(handle); |
3935 | moev_lock++; | 3933 | move_lock++; |
3936 | rc = read(fd, ramcache_hdr, shdr.tc_stat.ramcache_allocated); | 3934 | rc = read(fd, ramcache_hdr, shdr.tc_stat.ramcache_allocated); |
3937 | move_lock--; | 3935 | move_lock--; |
3938 | close(fd); | 3936 | close(fd); |
diff --git a/firmware/buflib.c b/firmware/buflib.c index 880357ccf4..f7ef35ea8b 100644 --- a/firmware/buflib.c +++ b/firmware/buflib.c | |||
@@ -765,7 +765,7 @@ void buflib_print_block_at(struct buflib_context *ctx, int block_num, | |||
765 | block_num -= 1; | 765 | block_num -= 1; |
766 | } | 766 | } |
767 | snprintf(buf, bufsize, "%8p: val: %4ld (%s)", | 767 | snprintf(buf, bufsize, "%8p: val: %4ld (%s)", |
768 | this, this->val, | 768 | this, (long)this->val, |
769 | this->val > 0? this[3].name:"<unallocated>"); | 769 | this->val > 0? this[3].name:"<unallocated>"); |
770 | } | 770 | } |
771 | 771 | ||