diff options
Diffstat (limited to 'apps/tagdb')
-rw-r--r-- | apps/tagdb/album.c | 2 | ||||
-rw-r--r-- | apps/tagdb/album.h | 2 | ||||
-rw-r--r-- | apps/tagdb/array_buffer.c | 3 | ||||
-rw-r--r-- | apps/tagdb/array_buffer.h | 2 | ||||
-rw-r--r-- | apps/tagdb/artist.c | 2 | ||||
-rw-r--r-- | apps/tagdb/artist.h | 2 | ||||
-rw-r--r-- | apps/tagdb/config.h | 2 | ||||
-rw-r--r-- | apps/tagdb/db.c | 2 | ||||
-rw-r--r-- | apps/tagdb/db.h | 2 | ||||
-rw-r--r-- | apps/tagdb/file.c | 2 | ||||
-rw-r--r-- | apps/tagdb/file.h | 2 | ||||
-rw-r--r-- | apps/tagdb/header.c | 3 | ||||
-rw-r--r-- | apps/tagdb/header.h | 2 | ||||
-rw-r--r-- | apps/tagdb/main.c | 2 | ||||
-rw-r--r-- | apps/tagdb/malloc.c | 2 | ||||
-rw-r--r-- | apps/tagdb/malloc.h | 2 | ||||
-rw-r--r-- | apps/tagdb/parser.c | 2 | ||||
-rw-r--r-- | apps/tagdb/song.c | 2 | ||||
-rw-r--r-- | apps/tagdb/song.h | 2 | ||||
-rw-r--r-- | apps/tagdb/tag_dummy.c | 2 | ||||
-rw-r--r-- | apps/tagdb/tag_dummy.h | 2 | ||||
-rw-r--r-- | apps/tagdb/unique.c | 2 | ||||
-rw-r--r-- | apps/tagdb/unique.h | 2 |
23 files changed, 46 insertions, 2 deletions
diff --git a/apps/tagdb/album.c b/apps/tagdb/album.c index 53b3660c90..0c06329fa5 100644 --- a/apps/tagdb/album.c +++ b/apps/tagdb/album.c | |||
@@ -1,3 +1,4 @@ | |||
1 | #ifdef HAVE_TAGCACHE | ||
1 | #include "malloc.h" // realloc() and free() | 2 | #include "malloc.h" // realloc() and free() |
2 | #include <strings.h> // strncasecmp() | 3 | #include <strings.h> // strncasecmp() |
3 | #include <string.h> // strlen() | 4 | #include <string.h> // strlen() |
@@ -452,3 +453,4 @@ int album_entry_add_song_file(FILE *fd, struct album_entry *e, struct album_size | |||
452 | 453 | ||
453 | return ERR_NO_INPLACE_UPDATE; | 454 | return ERR_NO_INPLACE_UPDATE; |
454 | } | 455 | } |
456 | #endif | ||
diff --git a/apps/tagdb/album.h b/apps/tagdb/album.h index 08995a2940..3f4eacd754 100644 --- a/apps/tagdb/album.h +++ b/apps/tagdb/album.h | |||
@@ -1,3 +1,4 @@ | |||
1 | #ifdef HAVE_TAGCACHE | ||
1 | #ifndef __ALBUM_H__ | 2 | #ifndef __ALBUM_H__ |
2 | #define __ALBUM_H__ | 3 | #define __ALBUM_H__ |
3 | 4 | ||
@@ -101,3 +102,4 @@ int album_entry_add_song_file(FILE *fd, struct album_entry *e, struct album_size | |||
101 | */ | 102 | */ |
102 | 103 | ||
103 | #endif | 104 | #endif |
105 | #endif | ||
diff --git a/apps/tagdb/array_buffer.c b/apps/tagdb/array_buffer.c index 24772d6bc9..2b8b017802 100644 --- a/apps/tagdb/array_buffer.c +++ b/apps/tagdb/array_buffer.c | |||
@@ -1,3 +1,4 @@ | |||
1 | #ifdef HAVE_TAGCACHE | ||
1 | #include "malloc.h" // malloc() and free() | 2 | #include "malloc.h" // malloc() and free() |
2 | 3 | ||
3 | #include "array_buffer.h" | 4 | #include "array_buffer.h" |
@@ -664,4 +665,4 @@ int array_buffer_write(FILE *fd, struct array_buffer *b) { | |||
664 | 665 | ||
665 | return ERR_NONE; | 666 | return ERR_NONE; |
666 | } | 667 | } |
667 | 668 | #endif | |
diff --git a/apps/tagdb/array_buffer.h b/apps/tagdb/array_buffer.h index 6dccefe917..d098c7a0fa 100644 --- a/apps/tagdb/array_buffer.h +++ b/apps/tagdb/array_buffer.h | |||
@@ -1,3 +1,4 @@ | |||
1 | #ifdef HAVE_TAGCACHE | ||
1 | #ifndef __ARRAY_BUFFER_H__ | 2 | #ifndef __ARRAY_BUFFER_H__ |
2 | #define __ARRAY_BUFFER_H__ | 3 | #define __ARRAY_BUFFER_H__ |
3 | 4 | ||
@@ -157,3 +158,4 @@ int array_buffer_write(FILE *fd, struct array_buffer *b); | |||
157 | */ | 158 | */ |
158 | 159 | ||
159 | #endif | 160 | #endif |
161 | #endif | ||
diff --git a/apps/tagdb/artist.c b/apps/tagdb/artist.c index 82db81df2f..36ce560bee 100644 --- a/apps/tagdb/artist.c +++ b/apps/tagdb/artist.c | |||
@@ -1,3 +1,4 @@ | |||
1 | #ifdef HAVE_TAGCACHE | ||
1 | #include "malloc.h" // realloc() and free() | 2 | #include "malloc.h" // realloc() and free() |
2 | #include <string.h> // strncasecmp() | 3 | #include <string.h> // strncasecmp() |
3 | 4 | ||
@@ -368,3 +369,4 @@ int artist_entry_add_album_file(FILE *fd, struct artist_entry *e, struct artist_ | |||
368 | 369 | ||
369 | return ERR_NO_INPLACE_UPDATE; | 370 | return ERR_NO_INPLACE_UPDATE; |
370 | } | 371 | } |
372 | #endif | ||
diff --git a/apps/tagdb/artist.h b/apps/tagdb/artist.h index c741594936..102e2879a7 100644 --- a/apps/tagdb/artist.h +++ b/apps/tagdb/artist.h | |||
@@ -1,3 +1,4 @@ | |||
1 | #ifdef HAVE_TAGCACHE | ||
1 | #ifndef __ARTIST_H__ | 2 | #ifndef __ARTIST_H__ |
2 | #define __ARTIST_H__ | 3 | #define __ARTIST_H__ |
3 | 4 | ||
@@ -98,3 +99,4 @@ int artist_entry_add_album_file(FILE *fd, struct artist_entry *e, struct artist_ | |||
98 | */ | 99 | */ |
99 | 100 | ||
100 | #endif | 101 | #endif |
102 | #endif | ||
diff --git a/apps/tagdb/config.h b/apps/tagdb/config.h index 86461349e3..5e5e870248 100644 --- a/apps/tagdb/config.h +++ b/apps/tagdb/config.h | |||
@@ -1,3 +1,4 @@ | |||
1 | #ifdef HAVE_TAGCACHE | ||
1 | #ifndef __CONFIG_H // Include me only once | 2 | #ifndef __CONFIG_H // Include me only once |
2 | #define __CONFIG_H | 3 | #define __CONFIG_H |
3 | 4 | ||
@@ -37,3 +38,4 @@ | |||
37 | #include <assert.h> | 38 | #include <assert.h> |
38 | 39 | ||
39 | #endif | 40 | #endif |
41 | #endif | ||
diff --git a/apps/tagdb/db.c b/apps/tagdb/db.c index 1c84b2b75c..4dfeb4708f 100644 --- a/apps/tagdb/db.c +++ b/apps/tagdb/db.c | |||
@@ -1,3 +1,4 @@ | |||
1 | #ifdef HAVE_TAGCACHE | ||
1 | #include <string.h> // strlen() strcpy() strcat() | 2 | #include <string.h> // strlen() strcpy() strcat() |
2 | 3 | ||
3 | #include "malloc.h" | 4 | #include "malloc.h" |
@@ -601,3 +602,4 @@ int tag_info_destruct(struct tag_info *t) { | |||
601 | 602 | ||
602 | return ERR_NONE; | 603 | return ERR_NONE; |
603 | } | 604 | } |
605 | #endif | ||
diff --git a/apps/tagdb/db.h b/apps/tagdb/db.h index be29581a09..709bf1fc9f 100644 --- a/apps/tagdb/db.h +++ b/apps/tagdb/db.h | |||
@@ -1,3 +1,4 @@ | |||
1 | #ifdef HAVE_TAGCACHE | ||
1 | #ifndef __DB_H__ | 2 | #ifndef __DB_H__ |
2 | #define __DB_H__ | 3 | #define __DB_H__ |
3 | 4 | ||
@@ -35,3 +36,4 @@ struct tag_info* new_tag_info(); | |||
35 | int tag_info_destruct(struct tag_info *t); | 36 | int tag_info_destruct(struct tag_info *t); |
36 | 37 | ||
37 | #endif | 38 | #endif |
39 | #endif | ||
diff --git a/apps/tagdb/file.c b/apps/tagdb/file.c index de641fec38..762f0088d5 100644 --- a/apps/tagdb/file.c +++ b/apps/tagdb/file.c | |||
@@ -1,3 +1,4 @@ | |||
1 | #ifdef HAVE_TAGCACHE | ||
1 | #include "malloc.h" // realloc() and free() | 2 | #include "malloc.h" // realloc() and free() |
2 | #include <string.h> // strncasecmp() | 3 | #include <string.h> // strncasecmp() |
3 | 4 | ||
@@ -266,3 +267,4 @@ int file_size_destruct(struct file_size *s) { | |||
266 | free(s); | 267 | free(s); |
267 | return ERR_NONE; | 268 | return ERR_NONE; |
268 | } | 269 | } |
270 | #endif | ||
diff --git a/apps/tagdb/file.h b/apps/tagdb/file.h index d2538a7569..103a601abf 100644 --- a/apps/tagdb/file.h +++ b/apps/tagdb/file.h | |||
@@ -1,3 +1,4 @@ | |||
1 | #ifdef HAVE_TAGCACHE | ||
1 | #ifndef __FILE_H__ | 2 | #ifndef __FILE_H__ |
2 | #define __FILE_H__ | 3 | #define __FILE_H__ |
3 | 4 | ||
@@ -82,3 +83,4 @@ int file_size_destruct(struct file_size *s); | |||
82 | */ | 83 | */ |
83 | 84 | ||
84 | #endif | 85 | #endif |
86 | #ifdef HAVE_TAGCACHE | ||
diff --git a/apps/tagdb/header.c b/apps/tagdb/header.c index 01f973824b..524c5b7e84 100644 --- a/apps/tagdb/header.c +++ b/apps/tagdb/header.c | |||
@@ -1,4 +1,4 @@ | |||
1 | 1 | #ifdef HAVE_TAGCACHE | |
2 | #include <stdio.h> | 2 | #include <stdio.h> |
3 | 3 | ||
4 | #include "header.h" | 4 | #include "header.h" |
@@ -119,3 +119,4 @@ int header_write(FILE *fd, const struct header *h) { | |||
119 | 119 | ||
120 | return ERR_NONE; | 120 | return ERR_NONE; |
121 | } | 121 | } |
122 | #endif | ||
diff --git a/apps/tagdb/header.h b/apps/tagdb/header.h index 08a563ec72..28a28d3fd9 100644 --- a/apps/tagdb/header.h +++ b/apps/tagdb/header.h | |||
@@ -1,3 +1,4 @@ | |||
1 | #ifdef HAVE_TAGCACHE | ||
1 | #ifndef __HEADER_H__ | 2 | #ifndef __HEADER_H__ |
2 | #define __HEADER_H__ | 3 | #define __HEADER_H__ |
3 | 4 | ||
@@ -37,3 +38,4 @@ struct header { | |||
37 | int header_write(FILE *fd, const struct header *header); | 38 | int header_write(FILE *fd, const struct header *header); |
38 | 39 | ||
39 | #endif | 40 | #endif |
41 | #endif | ||
diff --git a/apps/tagdb/main.c b/apps/tagdb/main.c index 61a0330c81..ce695e6ca2 100644 --- a/apps/tagdb/main.c +++ b/apps/tagdb/main.c | |||
@@ -1,3 +1,4 @@ | |||
1 | #ifdef HAVE_TAGCACHE | ||
1 | #include "config.h" | 2 | #include "config.h" |
2 | 3 | ||
3 | #include <stdio.h> | 4 | #include <stdio.h> |
@@ -113,3 +114,4 @@ int main(int argc, char* argv[]) { | |||
113 | 114 | ||
114 | return 0; | 115 | return 0; |
115 | } | 116 | } |
117 | #endif | ||
diff --git a/apps/tagdb/malloc.c b/apps/tagdb/malloc.c index 78d24f9d4e..dbc2c5b048 100644 --- a/apps/tagdb/malloc.c +++ b/apps/tagdb/malloc.c | |||
@@ -1,3 +1,4 @@ | |||
1 | #ifdef HAVE_TAGCACHE | ||
1 | #include "config.h" | 2 | #include "config.h" |
2 | #include "malloc.h" | 3 | #include "malloc.h" |
3 | 4 | ||
@@ -129,3 +130,4 @@ void malloc_stats() { | |||
129 | printf(" Maximum amount of allocated memory: %dbytes\n", max_total); | 130 | printf(" Maximum amount of allocated memory: %dbytes\n", max_total); |
130 | printf(" Current amount of allocated memory: %dbytes\n", total); | 131 | printf(" Current amount of allocated memory: %dbytes\n", total); |
131 | } | 132 | } |
133 | #endif | ||
diff --git a/apps/tagdb/malloc.h b/apps/tagdb/malloc.h index c8c885bf6f..c09649bdad 100644 --- a/apps/tagdb/malloc.h +++ b/apps/tagdb/malloc.h | |||
@@ -1,3 +1,4 @@ | |||
1 | #ifdef HAVE_TAGCACHE | ||
1 | #ifndef __MALLOC_H__ | 2 | #ifndef __MALLOC_H__ |
2 | #define __MALLOC_H__ | 3 | #define __MALLOC_H__ |
3 | 4 | ||
@@ -14,3 +15,4 @@ void *do_realloc(void *ptr, size_t size); | |||
14 | void malloc_stats(); | 15 | void malloc_stats(); |
15 | 16 | ||
16 | #endif | 17 | #endif |
18 | #endif | ||
diff --git a/apps/tagdb/parser.c b/apps/tagdb/parser.c index 6eec3bad1c..6e2eeff5b0 100644 --- a/apps/tagdb/parser.c +++ b/apps/tagdb/parser.c | |||
@@ -1,3 +1,4 @@ | |||
1 | #ifdef HAVE_TAGCACHE | ||
1 | #include <stdio.h> | 2 | #include <stdio.h> |
2 | #include <stdint.h> | 3 | #include <stdint.h> |
3 | #include <stdlib.h> | 4 | #include <stdlib.h> |
@@ -215,3 +216,4 @@ int main(int argc, char *argv[]) { | |||
215 | 216 | ||
216 | return 0; | 217 | return 0; |
217 | } | 218 | } |
219 | #endif | ||
diff --git a/apps/tagdb/song.c b/apps/tagdb/song.c index 16ae385eda..f62ecad5d8 100644 --- a/apps/tagdb/song.c +++ b/apps/tagdb/song.c | |||
@@ -1,3 +1,4 @@ | |||
1 | #ifdef HAVE_TAGCACHE | ||
1 | #include "malloc.h" // realloc() and free() | 2 | #include "malloc.h" // realloc() and free() |
2 | #include <string.h> // strncasecmp() | 3 | #include <string.h> // strncasecmp() |
3 | 4 | ||
@@ -448,3 +449,4 @@ int song_size_destruct(struct song_size *s) { | |||
448 | free(s); | 449 | free(s); |
449 | return ERR_NONE; | 450 | return ERR_NONE; |
450 | } | 451 | } |
452 | #endif | ||
diff --git a/apps/tagdb/song.h b/apps/tagdb/song.h index 1be81ccf0a..ac155b42f4 100644 --- a/apps/tagdb/song.h +++ b/apps/tagdb/song.h | |||
@@ -1,3 +1,4 @@ | |||
1 | #ifdef HAVE_TAGCACHE | ||
1 | #ifndef __SONG_H__ | 2 | #ifndef __SONG_H__ |
2 | #define __SONG_H__ | 3 | #define __SONG_H__ |
3 | 4 | ||
@@ -91,3 +92,4 @@ int song_size_destruct(struct song_size *s); | |||
91 | */ | 92 | */ |
92 | 93 | ||
93 | #endif | 94 | #endif |
95 | #endif | ||
diff --git a/apps/tagdb/tag_dummy.c b/apps/tagdb/tag_dummy.c index f0125f32ea..4318724ac4 100644 --- a/apps/tagdb/tag_dummy.c +++ b/apps/tagdb/tag_dummy.c | |||
@@ -1,3 +1,4 @@ | |||
1 | #ifdef HAVE_TAGCACHE | ||
1 | #include "config.h" | 2 | #include "config.h" |
2 | #include "malloc.h" | 3 | #include "malloc.h" |
3 | 4 | ||
@@ -9,3 +10,4 @@ int tag_dummy(char *file, struct tag_info *t) { | |||
9 | strcpy(t->song, file); | 10 | strcpy(t->song, file); |
10 | return ERR_NONE; | 11 | return ERR_NONE; |
11 | } | 12 | } |
13 | #endif | ||
diff --git a/apps/tagdb/tag_dummy.h b/apps/tagdb/tag_dummy.h index 856a0a5a2e..e05595a9a1 100644 --- a/apps/tagdb/tag_dummy.h +++ b/apps/tagdb/tag_dummy.h | |||
@@ -1,3 +1,5 @@ | |||
1 | #ifdef HAVE_TAGCACHE | ||
1 | #include "db.h" | 2 | #include "db.h" |
2 | 3 | ||
3 | int tag_dummy(char *file, struct tag_info *t); | 4 | int tag_dummy(char *file, struct tag_info *t); |
5 | #endif | ||
diff --git a/apps/tagdb/unique.c b/apps/tagdb/unique.c index 471f59e67f..3fd4359aea 100644 --- a/apps/tagdb/unique.c +++ b/apps/tagdb/unique.c | |||
@@ -1,3 +1,4 @@ | |||
1 | #ifdef HAVE_TAGCACHE | ||
1 | #include "unique.h" | 2 | #include "unique.h" |
2 | 3 | ||
3 | #include <string.h> | 4 | #include <string.h> |
@@ -14,3 +15,4 @@ char *create_unique_name(char *buffer, const char *prefix, const char *suffix, i | |||
14 | 15 | ||
15 | return buffer; | 16 | return buffer; |
16 | } | 17 | } |
18 | #endif | ||
diff --git a/apps/tagdb/unique.h b/apps/tagdb/unique.h index 03dc261141..bd5ebd8770 100644 --- a/apps/tagdb/unique.h +++ b/apps/tagdb/unique.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifdef | ||
1 | #ifndef __UNIQUE_H__ | 2 | #ifndef __UNIQUE_H__ |
2 | #define __UNIQUE_H__ | 3 | #define __UNIQUE_H__ |
3 | 4 | ||
4 | char *create_unique_name(char *buffer, const char *prefix, const char *suffix, int digits); | 5 | char *create_unique_name(char *buffer, const char *prefix, const char *suffix, int digits); |
5 | 6 | ||
6 | #endif | 7 | #endif |
8 | #endif | ||