Git fork

base85.h: move declarations for base85.c functions from cache.h

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Elijah Newren and committed by
Junio C Hamano
9b5041f6 d5fff46f

+11 -5
+1
apply.c
··· 10 10 #include "cache.h" 11 11 #include "abspath.h" 12 12 #include "alloc.h" 13 + #include "base85.h" 13 14 #include "config.h" 14 15 #include "object-store.h" 15 16 #include "blob.h"
+2 -1
base85.c
··· 1 - #include "cache.h" 1 + #include "git-compat-util.h" 2 + #include "base85.h" 2 3 3 4 #undef DEBUG_85 4 5
+7
base85.h
··· 1 + #ifndef BASE85_H 2 + #define BASE85_H 3 + 4 + int decode_85(char *dst, const char *line, int linelen); 5 + void encode_85(char *buf, const unsigned char *data, int bytes); 6 + 7 + #endif /* BASE85_H */
-4
cache.h
··· 593 593 int name_compare(const char *name1, size_t len1, const char *name2, size_t len2); 594 594 int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2); 595 595 596 - /* base85 */ 597 - int decode_85(char *dst, const char *line, int linelen); 598 - void encode_85(char *buf, const unsigned char *data, int bytes); 599 - 600 596 /* pkt-line.c */ 601 597 void packet_trace_identity(const char *prog); 602 598
+1
diff.c
··· 4 4 #include "cache.h" 5 5 #include "abspath.h" 6 6 #include "alloc.h" 7 + #include "base85.h" 7 8 #include "config.h" 8 9 #include "convert.h" 9 10 #include "environment.h"