diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/tagcache.c | 14 | ||||
-rw-r--r-- | apps/tagcache.h | 6 |
2 files changed, 15 insertions, 5 deletions
diff --git a/apps/tagcache.c b/apps/tagcache.c index 1f11f9e49f..7034cacab4 100644 --- a/apps/tagcache.c +++ b/apps/tagcache.c | |||
@@ -822,6 +822,8 @@ static long find_tag(int tag, int idx_id, const struct index_entry *idx) | |||
822 | return result; | 822 | return result; |
823 | } | 823 | } |
824 | } | 824 | } |
825 | #else | ||
826 | (void)idx_id; | ||
825 | #endif | 827 | #endif |
826 | 828 | ||
827 | return idx->tag_seek[tag]; | 829 | return idx->tag_seek[tag]; |
@@ -3110,7 +3112,10 @@ static bool commit(void) | |||
3110 | return true; | 3112 | return true; |
3111 | } | 3113 | } |
3112 | 3114 | ||
3115 | #ifndef __PCTOOL__ | ||
3113 | static int tempbuf_handle; | 3116 | static int tempbuf_handle; |
3117 | #endif | ||
3118 | |||
3114 | static void allocate_tempbuf(void) | 3119 | static void allocate_tempbuf(void) |
3115 | { | 3120 | { |
3116 | /* Yeah, malloc would be really nice now :) */ | 3121 | /* Yeah, malloc would be really nice now :) */ |
@@ -4483,8 +4488,11 @@ void tagcache_screensync_enable(bool state) | |||
4483 | tc_stat.syncscreen = state; | 4488 | tc_stat.syncscreen = state; |
4484 | } | 4489 | } |
4485 | 4490 | ||
4486 | 4491 | #ifndef __PCTOOL__ | |
4487 | static void do_tagcache_build(const char *path[]) | 4492 | /* this is called by the database tool to not pull in global_settings */ |
4493 | static | ||
4494 | #endif | ||
4495 | void do_tagcache_build(const char *path[]) | ||
4488 | { | 4496 | { |
4489 | struct tagcache_header header; | 4497 | struct tagcache_header header; |
4490 | bool ret; | 4498 | bool ret; |
@@ -4595,6 +4603,7 @@ static void do_tagcache_build(const char *path[]) | |||
4595 | cpu_boost(false); | 4603 | cpu_boost(false); |
4596 | } | 4604 | } |
4597 | 4605 | ||
4606 | #ifndef __PCTOOL__ | ||
4598 | void tagcache_build(void) | 4607 | void tagcache_build(void) |
4599 | { | 4608 | { |
4600 | char *vect[MAX_STATIC_ROOTS + 1]; /* +1 to ensure NULL sentinel */ | 4609 | char *vect[MAX_STATIC_ROOTS + 1]; /* +1 to ensure NULL sentinel */ |
@@ -4606,6 +4615,7 @@ void tagcache_build(void) | |||
4606 | 4615 | ||
4607 | do_tagcache_build((const char**)vect); | 4616 | do_tagcache_build((const char**)vect); |
4608 | } | 4617 | } |
4618 | #endif | ||
4609 | 4619 | ||
4610 | #ifdef HAVE_TC_RAMCACHE | 4620 | #ifdef HAVE_TC_RAMCACHE |
4611 | static void load_ramcache(void) | 4621 | static void load_ramcache(void) |
diff --git a/apps/tagcache.h b/apps/tagcache.h index c1d0df9bcd..dbe1c92d39 100644 --- a/apps/tagcache.h +++ b/apps/tagcache.h | |||
@@ -203,13 +203,13 @@ struct tagcache_search { | |||
203 | 203 | ||
204 | #ifdef __PCTOOL__ | 204 | #ifdef __PCTOOL__ |
205 | void tagcache_reverse_scan(void); | 205 | void tagcache_reverse_scan(void); |
206 | /* call this directly instead of tagcache_build in order to not pull | ||
207 | * on global_settings */ | ||
208 | void do_tagcache_build(const char *path[]); | ||
206 | #endif | 209 | #endif |
207 | 210 | ||
208 | const char* tagcache_tag_to_str(int tag); | 211 | const char* tagcache_tag_to_str(int tag); |
209 | 212 | ||
210 | #ifdef CPU_SH | ||
211 | bool tagcache_is_numeric_tag(int type); | ||
212 | #endif | ||
213 | bool tagcache_find_index(struct tagcache_search *tcs, const char *filename); | 213 | bool tagcache_find_index(struct tagcache_search *tcs, const char *filename); |
214 | bool tagcache_check_clauses(struct tagcache_search *tcs, | 214 | bool tagcache_check_clauses(struct tagcache_search *tcs, |
215 | struct tagcache_search_clause **clause, int count); | 215 | struct tagcache_search_clause **clause, int count); |