Skip to content

Commit 9b5041f

Browse files
newrengitster
authored andcommitted
base85.h: move declarations for base85.c functions from cache.h
Signed-off-by: Elijah Newren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d5fff46 commit 9b5041f

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

apply.c

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "cache.h"
1111
#include "abspath.h"
1212
#include "alloc.h"
13+
#include "base85.h"
1314
#include "config.h"
1415
#include "object-store.h"
1516
#include "blob.h"

base85.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#include "cache.h"
1+
#include "git-compat-util.h"
2+
#include "base85.h"
23

34
#undef DEBUG_85
45

base85.h

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
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 */

cache.h

-4
Original file line numberDiff line numberDiff line change
@@ -593,10 +593,6 @@ int df_name_compare(const char *name1, size_t len1, int mode1,
593593
int name_compare(const char *name1, size_t len1, const char *name2, size_t len2);
594594
int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2);
595595

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-
600596
/* pkt-line.c */
601597
void packet_trace_identity(const char *prog);
602598

diff.c

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include "cache.h"
55
#include "abspath.h"
66
#include "alloc.h"
7+
#include "base85.h"
78
#include "config.h"
89
#include "convert.h"
910
#include "environment.h"

0 commit comments

Comments
 (0)