summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/codec_thread.c6
-rw-r--r--firmware/storage.c1
-rw-r--r--tools/rbspeex/rbspeexdec.c2
-rw-r--r--tools/voicefont.c3
4 files changed, 7 insertions, 5 deletions
diff --git a/apps/codec_thread.c b/apps/codec_thread.c
index e45e9aec6b..7189332673 100644
--- a/apps/codec_thread.c
+++ b/apps/codec_thread.c
@@ -127,13 +127,13 @@ static int codec_check_queue__have_msg(void)
127 switch (ev.id) 127 switch (ev.id)
128 { 128 {
129 case Q_CODEC_SEEK: 129 case Q_CODEC_SEEK:
130 LOGFQUEUE("codec - Q_CODEC_SEEK", ev.id); 130 LOGFQUEUE("codec - Q_CODEC_SEEK %ld", ev.id);
131 return -1; 131 return -1;
132 case Q_CODEC_PAUSE: 132 case Q_CODEC_PAUSE:
133 LOGFQUEUE("codec - Q_CODEC_PAUSE", ev.id); 133 LOGFQUEUE("codec - Q_CODEC_PAUSE %ld", ev.id);
134 return -1; 134 return -1;
135 case Q_CODEC_STOP: 135 case Q_CODEC_STOP:
136 LOGFQUEUE("codec - Q_CODEC_STOP", ev.id); 136 LOGFQUEUE("codec - Q_CODEC_STOP %ld", ev.id);
137 return -1; 137 return -1;
138 } 138 }
139 139
diff --git a/firmware/storage.c b/firmware/storage.c
index 790cddcd1a..1c7dfd7afb 100644
--- a/firmware/storage.c
+++ b/firmware/storage.c
@@ -694,6 +694,7 @@ int storage_spinup_time(void)
694#if (CONFIG_STORAGE & STORAGE_SD) 694#if (CONFIG_STORAGE & STORAGE_SD)
695 //t=sd_spinup_time(); 695 //t=sd_spinup_time();
696 //if (t>max) max=t; 696 //if (t>max) max=t;
697 (void)t;
697#endif 698#endif
698 699
699#if (CONFIG_STORAGE & STORAGE_NAND) 700#if (CONFIG_STORAGE & STORAGE_NAND)
diff --git a/tools/rbspeex/rbspeexdec.c b/tools/rbspeex/rbspeexdec.c
index 14ee971697..3cf65f0331 100644
--- a/tools/rbspeex/rbspeexdec.c
+++ b/tools/rbspeex/rbspeexdec.c
@@ -70,7 +70,7 @@ int main(int argc, char **argv)
70 insize = ftell(fin); 70 insize = ftell(fin);
71 fseek(fin, 0, SEEK_SET); 71 fseek(fin, 0, SEEK_SET);
72 indata = malloc(insize); 72 indata = malloc(insize);
73 fread(indata, 1, insize, fin); 73 insize = fread(indata, 1, insize, fin);
74 fclose(fin); 74 fclose(fin);
75 75
76 /* fill in wav header */ 76 /* fill in wav header */
diff --git a/tools/voicefont.c b/tools/voicefont.c
index 4d1363b1bc..f4318b3b26 100644
--- a/tools/voicefont.c
+++ b/tools/voicefont.c
@@ -103,7 +103,8 @@ int voicefont(FILE* voicefontids,int targetnum,char* filedir, FILE* output, unsi
103 memset(voiceonly, 0, sizeof(voiceonly)); 103 memset(voiceonly, 0, sizeof(voiceonly));
104 while (!feof(voicefontids)) 104 while (!feof(voicefontids))
105 { 105 {
106 fgets(line, sizeof(line), voicefontids); 106 if (!fgets(line, sizeof(line), voicefontids))
107 break;
107 if (line[0] == '#') /* comment */ 108 if (line[0] == '#') /* comment */
108 continue; 109 continue;
109 110