From 763aff61a00df673bbd1c885aa1c6301e98e953e Mon Sep 17 00:00:00 2001 From: Eric Pouech Date: Mon, 6 Dec 2004 16:44:32 +0000 Subject: [PATCH] Another couple of missing static definitions. --- tools/fnt2bdf.c | 12 ++++++------ tools/winedump/pe.c | 4 ++-- tools/winegcc/winegcc.c | 2 +- tools/wrc/dumpres.c | 4 ++-- tools/wrc/genres.c | 16 ++++++++-------- tools/wrc/readres.c | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tools/fnt2bdf.c b/tools/fnt2bdf.c index 4a6bd16ae3d..e03f556d50c 100644 --- a/tools/fnt2bdf.c +++ b/tools/fnt2bdf.c @@ -68,7 +68,7 @@ static const char* errorEmpty = "No fonts found.\n"; /* info */ -void usage(void) +static void usage(void) { printf("Usage: fnt2bdf [-t] [-c charset] [-o basename] [input file]\n"); printf(" -c charset\tcharset name for OEM_CHARSET fonts\n"); @@ -81,7 +81,7 @@ void usage(void) /* convert little-endian value to the local format */ -int return_data_value(enum data_types dtype, void * pChr) +static int return_data_value(enum data_types dtype, void * pChr) { int ret_val = 0; @@ -109,7 +109,7 @@ int ret_val = 0; return ret_val; } -int make_bdf_filename(char* name, fnt_fontS* cpe_font_struct, unsigned char* file_buffer) +static int make_bdf_filename(char* name, fnt_fontS* cpe_font_struct, unsigned char* file_buffer) { long l_nameoffset = return_data_value(dfLong, &cpe_font_struct->hdr.fi.dfFace); char* lpChar; @@ -142,7 +142,7 @@ char* lpChar; /* parse FONT resource and write .bdf file */ -int parse_fnt_data(unsigned char* file_buffer, int length) +static int parse_fnt_data(unsigned char* file_buffer, int length) { fnt_fontS cpe_font_struct; int ic=0, t; @@ -433,7 +433,7 @@ int l_ascent = return_data_value(dfShort, &cpe_font_struct->hdr.fi.dfAscent); -void parse_options(int argc, char **argv) +static void parse_options(int argc, char **argv) { int i; @@ -482,7 +482,7 @@ void parse_options(int argc, char **argv) /* read file data and return file type */ -int get_resource_table(int fd, unsigned char** lpdata, int fsize) +static int get_resource_table(int fd, unsigned char** lpdata, int fsize) { IMAGE_DOS_HEADER mz_header; IMAGE_OS2_HEADER ne_header; diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 1e02da62914..bec4c5de8ad 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -106,7 +106,7 @@ unsigned long Offset(void* ptr) return (char*)ptr - (char*)PE_base; } -void* RVA(unsigned long rva, unsigned long len) +static void* RVA(unsigned long rva, unsigned long len) { IMAGE_SECTION_HEADER* sectHead; int i; @@ -1040,7 +1040,7 @@ static enum FileSig check_headers(void) return sig; } -int pe_analysis(const char* name, void (*fn)(enum FileSig), enum FileSig wanted_sig) +static int pe_analysis(const char* name, void (*fn)(enum FileSig), enum FileSig wanted_sig) { int fd; enum FileSig effective_sig; diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index ddab65c4345..5d0b854cd66 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -177,7 +177,7 @@ static void exit_on_signal( int sig ) exit(1); /* this will call the atexit functions */ } -char* get_temp_file(const char* prefix, const char* suffix) +static char* get_temp_file(const char* prefix, const char* suffix) { int fd; sigset_t old_set; diff --git a/tools/wrc/dumpres.c b/tools/wrc/dumpres.c index 2fd7f7ff4fe..53cc64eba3b 100644 --- a/tools/wrc/dumpres.c +++ b/tools/wrc/dumpres.c @@ -78,7 +78,7 @@ const char *get_typename(const resource_t* r) * Remarks : No codepage translation is done. ***************************************************************************** */ -char *strncpyWtoA(char *cs, const short *ws, int maxlen) +static char *strncpyWtoA(char *cs, const short *ws, int maxlen) { char *cptr = cs; const short *wsMax = ws + maxlen - 1; @@ -102,7 +102,7 @@ char *strncpyWtoA(char *cs, const short *ws, int maxlen) * Remarks : ***************************************************************************** */ -void print_string(const string_t *str) +static void print_string(const string_t *str) { char buffer[512]; if(!str) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 5aff6953295..2d9c175405b 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -141,7 +141,7 @@ void put_dword(res_t *res, unsigned d) res->size += sizeof(DWORD); } -void put_pad(res_t *res) +static void put_pad(res_t *res) { while(res->size & 0x3) put_byte(res, 0); @@ -163,7 +163,7 @@ void put_pad(res_t *res) * Remarks : ***************************************************************************** */ -void set_word(res_t *res, int ofs, unsigned w) +static void set_word(res_t *res, int ofs, unsigned w) { switch(byteorder) { @@ -185,7 +185,7 @@ void set_word(res_t *res, int ofs, unsigned w) } } -void set_dword(res_t *res, int ofs, unsigned d) +static void set_dword(res_t *res, int ofs, unsigned d) { switch(byteorder) { @@ -226,7 +226,7 @@ void set_dword(res_t *res, int ofs, unsigned d) * Remarks : ***************************************************************************** */ -WORD get_word(res_t *res, int ofs) +static WORD get_word(res_t *res, int ofs) { switch(byteorder) { @@ -246,7 +246,7 @@ WORD get_word(res_t *res, int ofs) } } -DWORD get_dword(res_t *res, int ofs) +static DWORD get_dword(res_t *res, int ofs) { switch(byteorder) { @@ -428,7 +428,7 @@ static void put_lvc(res_t *res, lvc_t *lvc) * Remarks : ***************************************************************************** */ -void put_raw_data(res_t *res, raw_data_t *raw, int offset) +static void put_raw_data(res_t *res, raw_data_t *raw, int offset) { int wsize = raw->size - offset; if(res->allocsize - res->size < wsize) @@ -456,8 +456,8 @@ void put_raw_data(res_t *res, raw_data_t *raw, int offset) * Remarks : ***************************************************************************** */ -int put_res_header(res_t *res, int type, name_id_t *ntype, name_id_t *name, - DWORD memopt, lvc_t *lvc) +static int put_res_header(res_t *res, int type, name_id_t *ntype, name_id_t *name, + DWORD memopt, lvc_t *lvc) { if(win32) { diff --git a/tools/wrc/readres.c b/tools/wrc/readres.c index 40ddb7be2c5..6a7d19fd8aa 100644 --- a/tools/wrc/readres.c +++ b/tools/wrc/readres.c @@ -77,7 +77,7 @@ struct resheader32 { * Remarks : ***************************************************************************** */ -int read_data(FILE *fp, size_t size, void *buf) +static int read_data(FILE *fp, size_t size, void *buf) { unsigned int r; int pos = ftell(fp); @@ -100,7 +100,7 @@ int read_data(FILE *fp, size_t size, void *buf) * Remarks : ***************************************************************************** */ -enum res_e res_type_from_id(const name_id_t *nid) +static enum res_e res_type_from_id(const name_id_t *nid) { if(nid->type == name_str) return res_usr;