Another couple of missing static definitions.
This commit is contained in:
parent
f949d14f0b
commit
763aff61a0
|
@ -68,7 +68,7 @@ static const char* errorEmpty = "No fonts found.\n";
|
||||||
|
|
||||||
/* info */
|
/* info */
|
||||||
|
|
||||||
void usage(void)
|
static void usage(void)
|
||||||
{
|
{
|
||||||
printf("Usage: fnt2bdf [-t] [-c charset] [-o basename] [input file]\n");
|
printf("Usage: fnt2bdf [-t] [-c charset] [-o basename] [input file]\n");
|
||||||
printf(" -c charset\tcharset name for OEM_CHARSET fonts\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 */
|
/* 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;
|
int ret_val = 0;
|
||||||
|
|
||||||
|
@ -109,7 +109,7 @@ int ret_val = 0;
|
||||||
return ret_val;
|
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);
|
long l_nameoffset = return_data_value(dfLong, &cpe_font_struct->hdr.fi.dfFace);
|
||||||
char* lpChar;
|
char* lpChar;
|
||||||
|
@ -142,7 +142,7 @@ char* lpChar;
|
||||||
|
|
||||||
/* parse FONT resource and write .bdf file */
|
/* 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;
|
fnt_fontS cpe_font_struct;
|
||||||
int ic=0, t;
|
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;
|
int i;
|
||||||
|
|
||||||
|
@ -482,7 +482,7 @@ void parse_options(int argc, char **argv)
|
||||||
|
|
||||||
/* read file data and return file type */
|
/* 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_DOS_HEADER mz_header;
|
||||||
IMAGE_OS2_HEADER ne_header;
|
IMAGE_OS2_HEADER ne_header;
|
||||||
|
|
|
@ -106,7 +106,7 @@ unsigned long Offset(void* ptr)
|
||||||
return (char*)ptr - (char*)PE_base;
|
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;
|
IMAGE_SECTION_HEADER* sectHead;
|
||||||
int i;
|
int i;
|
||||||
|
@ -1040,7 +1040,7 @@ static enum FileSig check_headers(void)
|
||||||
return sig;
|
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;
|
int fd;
|
||||||
enum FileSig effective_sig;
|
enum FileSig effective_sig;
|
||||||
|
|
|
@ -177,7 +177,7 @@ static void exit_on_signal( int sig )
|
||||||
exit(1); /* this will call the atexit functions */
|
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;
|
int fd;
|
||||||
sigset_t old_set;
|
sigset_t old_set;
|
||||||
|
|
|
@ -78,7 +78,7 @@ const char *get_typename(const resource_t* r)
|
||||||
* Remarks : No codepage translation is done.
|
* 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;
|
char *cptr = cs;
|
||||||
const short *wsMax = ws + maxlen - 1;
|
const short *wsMax = ws + maxlen - 1;
|
||||||
|
@ -102,7 +102,7 @@ char *strncpyWtoA(char *cs, const short *ws, int maxlen)
|
||||||
* Remarks :
|
* Remarks :
|
||||||
*****************************************************************************
|
*****************************************************************************
|
||||||
*/
|
*/
|
||||||
void print_string(const string_t *str)
|
static void print_string(const string_t *str)
|
||||||
{
|
{
|
||||||
char buffer[512];
|
char buffer[512];
|
||||||
if(!str)
|
if(!str)
|
||||||
|
|
|
@ -141,7 +141,7 @@ void put_dword(res_t *res, unsigned d)
|
||||||
res->size += sizeof(DWORD);
|
res->size += sizeof(DWORD);
|
||||||
}
|
}
|
||||||
|
|
||||||
void put_pad(res_t *res)
|
static void put_pad(res_t *res)
|
||||||
{
|
{
|
||||||
while(res->size & 0x3)
|
while(res->size & 0x3)
|
||||||
put_byte(res, 0);
|
put_byte(res, 0);
|
||||||
|
@ -163,7 +163,7 @@ void put_pad(res_t *res)
|
||||||
* Remarks :
|
* Remarks :
|
||||||
*****************************************************************************
|
*****************************************************************************
|
||||||
*/
|
*/
|
||||||
void set_word(res_t *res, int ofs, unsigned w)
|
static void set_word(res_t *res, int ofs, unsigned w)
|
||||||
{
|
{
|
||||||
switch(byteorder)
|
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)
|
switch(byteorder)
|
||||||
{
|
{
|
||||||
|
@ -226,7 +226,7 @@ void set_dword(res_t *res, int ofs, unsigned d)
|
||||||
* Remarks :
|
* Remarks :
|
||||||
*****************************************************************************
|
*****************************************************************************
|
||||||
*/
|
*/
|
||||||
WORD get_word(res_t *res, int ofs)
|
static WORD get_word(res_t *res, int ofs)
|
||||||
{
|
{
|
||||||
switch(byteorder)
|
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)
|
switch(byteorder)
|
||||||
{
|
{
|
||||||
|
@ -428,7 +428,7 @@ static void put_lvc(res_t *res, lvc_t *lvc)
|
||||||
* Remarks :
|
* 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;
|
int wsize = raw->size - offset;
|
||||||
if(res->allocsize - res->size < wsize)
|
if(res->allocsize - res->size < wsize)
|
||||||
|
@ -456,7 +456,7 @@ void put_raw_data(res_t *res, raw_data_t *raw, int offset)
|
||||||
* Remarks :
|
* Remarks :
|
||||||
*****************************************************************************
|
*****************************************************************************
|
||||||
*/
|
*/
|
||||||
int put_res_header(res_t *res, int type, name_id_t *ntype, name_id_t *name,
|
static int put_res_header(res_t *res, int type, name_id_t *ntype, name_id_t *name,
|
||||||
DWORD memopt, lvc_t *lvc)
|
DWORD memopt, lvc_t *lvc)
|
||||||
{
|
{
|
||||||
if(win32)
|
if(win32)
|
||||||
|
|
|
@ -77,7 +77,7 @@ struct resheader32 {
|
||||||
* Remarks :
|
* 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;
|
unsigned int r;
|
||||||
int pos = ftell(fp);
|
int pos = ftell(fp);
|
||||||
|
@ -100,7 +100,7 @@ int read_data(FILE *fp, size_t size, void *buf)
|
||||||
* Remarks :
|
* 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)
|
if(nid->type == name_str)
|
||||||
return res_usr;
|
return res_usr;
|
||||||
|
|
Loading…
Reference in New Issue