From 2466934534925ab5bd0ed0da2ca9d6994d7482b6 Mon Sep 17 00:00:00 2001 From: Bart Oldeman Date: Tue, 15 May 2007 00:05:41 +0000 Subject: [PATCH] Fix OW 1.6 warnings about functions redeclared as 'static'. git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@1308 6ac86273-5f31-0410-b378-82cca8765d1b --- kernel/fatfs.c | 10 +++++----- kernel/proto.h | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/kernel/fatfs.c b/kernel/fatfs.c index 589a4ec..c1ffce6 100644 --- a/kernel/fatfs.c +++ b/kernel/fatfs.c @@ -42,18 +42,18 @@ COUNT xlt_fnp(f_node_ptr); STATIC void save_far_f_node(f_node_ptr fnp); STATIC f_node_ptr get_near_f_node(void); STATIC f_node_ptr split_path(char *, char *); -BOOL find_fname(f_node_ptr, char *, int); +STATIC BOOL find_fname(f_node_ptr, char *, int); /* /// Added - Ron Cemer */ STATIC void merge_file_changes(f_node_ptr fnp, int collect); /* /// Added - Ron Cemer */ STATIC int is_same_file(f_node_ptr fnp1, f_node_ptr fnp2); /* /// Added - Ron Cemer */ STATIC void copy_file_changes(f_node_ptr src, f_node_ptr dst); -BOOL find_free(f_node_ptr); +STATIC BOOL find_free(f_node_ptr); STATIC int alloc_find_free(f_node_ptr fnp, char *path, char *fcbname); -VOID wipe_out(f_node_ptr); -CLUSTER extend(f_node_ptr); -COUNT extend_dir(f_node_ptr); +STATIC VOID wipe_out(f_node_ptr); +STATIC CLUSTER extend(f_node_ptr); +STATIC COUNT extend_dir(f_node_ptr); CLUSTER first_fat(f_node_ptr); COUNT map_cluster(f_node_ptr, COUNT); STATIC VOID shrink_file(f_node_ptr fnp); diff --git a/kernel/proto.h b/kernel/proto.h index f966d29..639865e 100644 --- a/kernel/proto.h +++ b/kernel/proto.h @@ -60,7 +60,6 @@ void handle_break(struct dhdr FAR **pdev, int sft_out); struct dhdr FAR *sft_to_dev(sft FAR *sft); long BinaryCharIO(struct dhdr FAR **pdev, size_t n, void FAR * bp, unsigned command); -int echo_char(int c, int sft_idx); int ndread(struct dhdr FAR **pdev); int StdinBusy(void); void con_flush(struct dhdr FAR **pdev); @@ -342,7 +341,6 @@ int /*ASMCFUNC*/ ASMPASCAL fmemcmp(const void FAR *m1, const void FAR *m2, size_ /* sysclk.c */ COUNT BcdToByte(COUNT x); COUNT BcdToWord(BYTE * x, UWORD * mon, UWORD * day, UWORD * yr); -COUNT ByteToBcd(COUNT x); LONG WordToBcd(BYTE * x, UWORD * mon, UWORD * day, UWORD * yr); /* syspack.c */