notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove some unused funcs & declarations

Browse source 
Removing more unused functions, and moving a declaration in fonts.h
to fonts.c, since it's not used externally (reliable_read()).
This commit is contained in:
Bill Kendrick 2017-10-15 14:37:42 -07:00
parent 502edda2b1
commit b693003b14
3 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/fonts.c
View file

@ -1,7 +1,7 @@
/* /*
fonts.c fonts.c
Copyright (c) 2009-2014 Copyright (c) 2009-2017
http://www.tuxpaint.org/ http://www.tuxpaint.org/
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
@ -157,6 +157,10 @@ unsigned text_size = 4; // initial text size
int button_label_y_nudge; int button_label_y_nudge;
#ifdef FORKED_FONTS
static void reliable_read(int fd, void *buf, size_t count);
#endif
#ifndef NO_SDLPANGO #ifndef NO_SDLPANGO
static TuxPaint_Font *try_alternate_font(int size) static TuxPaint_Font *try_alternate_font(int size)

3
src/fonts.h
View file

@ -1,7 +1,7 @@
/* /*
fonts.h fonts.h
Copyright (c) 2009-2014 Copyright (c) 2009-2017
http://www.tuxpaint.org/ http://www.tuxpaint.org/
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
@ -115,7 +115,6 @@ int TuxPaint_Font_FontHeight(TuxPaint_Font * tpf);
#ifdef FORKED_FONTS #ifdef FORKED_FONTS
void reliable_write(int fd, const void *buf, size_t count); void reliable_write(int fd, const void *buf, size_t count);
static void reliable_read(int fd, void *buf, size_t count);
void run_font_scanner(SDL_Surface * screen, const char *restrict const locale); void run_font_scanner(SDL_Surface * screen, const char *restrict const locale);
void receive_some_font_info(SDL_Surface * screen); void receive_some_font_info(SDL_Surface * screen);
#endif #endif

13
src/tuxpaint.c
View file

@ -648,18 +648,6 @@ static void debug(const char *const str)
#endif #endif
} }
static const char *getfilename(const char *path)
{
char *p;
if ((p = strrchr(path, '\\')) != NULL)
return p + 1;
if ((p = strrchr(path, '/')) != NULL)
return p + 1;
return path;
}
/* sizing */ /* sizing */
/* The old Tux Paint: /* The old Tux Paint:
@ -1876,7 +1864,6 @@ static void draw_image_title(int t, SDL_Rect dest);
static void handle_keymouse(SDLKey key, Uint8 updown, int steps, SDL_Rect * area1, SDL_Rect * area2); static void handle_keymouse(SDLKey key, Uint8 updown, int steps, SDL_Rect * area1, SDL_Rect * area2);
static void handle_keymouse_buttons(SDLKey key, int *whicht, int *whichc, SDL_Rect real_r_tools); static void handle_keymouse_buttons(SDLKey key, int *whicht, int *whichc, SDL_Rect real_r_tools);
static void handle_active(SDL_Event * event); static void handle_active(SDL_Event * event);
static char *remove_slash(char *path);
/*static char *replace_tilde(const char* const path);*/ /*static char *replace_tilde(const char* const path);*/
#ifdef NO_SDLPANGO #ifdef NO_SDLPANGO