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

More compiler warnings

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2017-12-19 02:41:56 +01:00
commit c6b6958cf3
3 changed files with 44 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/fonts.c
View file

@ -162,6 +162,9 @@ static void reliable_read(int fd, void *buf, size_t count);
#endif #endif
/* This doesn't actually ever get used; see load_locale_font()
-bjk 2017.10.15 */
/*
#ifndef NO_SDLPANGO #ifndef NO_SDLPANGO
static TuxPaint_Font *try_alternate_font(int size) static TuxPaint_Font *try_alternate_font(int size)
{ {
@ -180,6 +183,7 @@ static TuxPaint_Font *try_alternate_font(int size)
return NULL; return NULL;
} }
#endif #endif
*/
#ifdef NO_SDLPANGO #ifdef NO_SDLPANGO
TuxPaint_Font *load_locale_font(TuxPaint_Font * fallback, int size) TuxPaint_Font *load_locale_font(TuxPaint_Font * fallback, int size)
@ -218,6 +222,10 @@ TuxPaint_Font *load_locale_font(TuxPaint_Font * fallback, int size)
} }
#endif #endif
/* Not sure why this is like this; we're in a function that's not
even defined, unless NO_SDLPANGO is set, so this can't happen
-bjk 2017.10.15 */
/*
#ifndef NO_SDLPANGO #ifndef NO_SDLPANGO
if (!ret) if (!ret)
{ {
@ -233,6 +241,7 @@ TuxPaint_Font *load_locale_font(TuxPaint_Font * fallback, int size)
} }
} }
#endif #endif
*/
return ret ? ret : fallback; return ret ? ret : fallback;
} }
} }
@ -1055,7 +1064,11 @@ void run_font_scanner(SDL_Surface * screen, SDL_Texture * texture, SDL_Renderer
return; return;
} }
#ifndef __HAIKU__ #ifndef __HAIKU__
nice(42); // be nice, letting the main thread get the CPU /* be nice, letting the main thread get the CPU */
if (nice(42) == -1)
{
fprintf(stderr, "Font scanner thread can't nice() itself\n");
}
#endif #endif
sched_yield(); // try to let the parent run right now sched_yield(); // try to let the parent run right now
prctl(PR_SET_PDEATHSIG, 9); // get killed if parent exits prctl(PR_SET_PDEATHSIG, 9); // get killed if parent exits

10
src/im.c
View file

@ -570,7 +570,7 @@ static int charmap_load(CHARMAP * cm, const char *path)
} }
else if (buf[0] == '#') else if (buf[0] == '#')
{ /* Comment */ { /* Comment */
fscanf(is, "%*[^\n]"); scanned = fscanf(is, "%*[^\n]");
continue; continue;
} }
else else
@ -1006,7 +1006,7 @@ static int im_event_zh_tw(IM_DATA * im, SDL_Event event)
/* Left-Alt & Right-Alt mapped to mode-switch */ /* Left-Alt & Right-Alt mapped to mode-switch */
case SDLK_RALT: case SDLK_RALT:
case SDLK_LALT: case SDLK_LALT:
cm.section = (++cm.section % SEC_TOTAL); /* Change section */ cm.section = ((cm.section + 1) % SEC_TOTAL); /* Change section */
im_softreset(im); /* Soft reset */ im_softreset(im); /* Soft reset */
/* Set tip text */ /* Set tip text */
@ -1229,7 +1229,7 @@ static int im_event_th(IM_DATA * im, SDL_Event event)
/* Right-Alt mapped to mode-switch */ /* Right-Alt mapped to mode-switch */
case SDLK_RALT: case SDLK_RALT:
cm.section = (++cm.section % SEC_TOTAL); /* Change section */ cm.section = ((cm.section + 1) % SEC_TOTAL); /* Change section */
im_softreset(im); /* Soft reset */ im_softreset(im); /* Soft reset */
/* Set tip text */ /* Set tip text */
@ -1449,7 +1449,7 @@ static int im_event_ja(IM_DATA * im, SDL_Event event)
/* Right-Alt mapped to mode-switch */ /* Right-Alt mapped to mode-switch */
case SDLK_RALT: case SDLK_RALT:
cm.section = (++cm.section % SEC_TOTAL); /* Change section */ cm.section = ((cm.section + 1) % SEC_TOTAL); /* Change section */
im_softreset(im); /* Soft reset */ im_softreset(im); /* Soft reset */
/* Set tip text */ /* Set tip text */
@ -1699,7 +1699,7 @@ static int im_event_ko(IM_DATA * im, SDL_Event event)
/* Right-Alt mapped to mode-switch */ /* Right-Alt mapped to mode-switch */
case SDLK_LALT: case SDLK_LALT:
case SDLK_RALT: case SDLK_RALT:
cm.section = (++cm.section % SEC_TOTAL); /* Change section */ cm.section = ((cm.section + 1) % SEC_TOTAL); /* Change section */
im_softreset(im); /* Soft reset */ im_softreset(im); /* Soft reset */
/* Set tip text */ /* Set tip text */

44
src/tuxpaint.c
View file

@ -113,6 +113,7 @@
static unsigned draw_colors(unsigned action); static unsigned draw_colors(unsigned action);
/* hide all scale-related values here */ /* hide all scale-related values here */
typedef struct scaleparams typedef struct scaleparams
{ {
@ -569,6 +570,10 @@ static void mtw(wchar_t * wtok, char *tok)
#endif #endif
#endif #endif
int TP_EventFilter(const SDL_Event * event);
/* #define fmemopen_alternative */ /* Uncomment this to test the fmemopen alternative in systems were fmemopen exists */ /* #define fmemopen_alternative */ /* Uncomment this to test the fmemopen alternative in systems were fmemopen exists */
#if defined (WIN32) || defined (__APPLE__) || defined(__NetBSD__) || defined(__sun) || defined(__ANDROID__) /* MINGW/MSYS, NetBSD, and MacOSX need it, at least for now */ #if defined (WIN32) || defined (__APPLE__) || defined(__NetBSD__) || defined(__sun) || defined(__ANDROID__) /* MINGW/MSYS, NetBSD, and MacOSX need it, at least for now */
@ -1852,7 +1857,6 @@ static void rect_xor(int x1, int y1, int x2, int y2);
static void draw_blinking_cursor(void); static void draw_blinking_cursor(void);
static void hide_blinking_cursor(void); static void hide_blinking_cursor(void);
static void reset_brush_counter_and_frame(void);
static void reset_brush_counter(void); static void reset_brush_counter(void);
#ifdef LOW_QUALITY_STAMP_OUTLINE #ifdef LOW_QUALITY_STAMP_OUTLINE
@ -5737,12 +5741,6 @@ static void brush_draw(int x1, int y1, int x2, int y2, int update)
} }
} }
void reset_brush_counter_and_frame(void)
{
brush_counter = 999;
brush_frame = 0;
}
void reset_brush_counter(void) void reset_brush_counter(void)
{ {
brush_counter = 999; brush_counter = 999;
@ -13209,7 +13207,10 @@ static void do_png_embed_data(png_structp png_ptr)
unsigned char *chunk_data; unsigned char *chunk_data;
Bytef *compressed_data; Bytef *compressed_data;
char *ldata, *fname; #ifdef fmemopen_alternative
char *fname;
#endif
char *ldata;
FILE *lfi; FILE *lfi;
int list_ctr = 0; int list_ctr = 0;
Uint32 pix; Uint32 pix;
@ -20990,8 +20991,9 @@ static void load_info_about_label_surface(FILE * lfi)
float new_to_old_ratio; float new_to_old_ratio;
int old_pos; int old_pos;
int new_pos; int new_pos;
int x, y, pix_size; int x, y;
int tmp_fscanf_return; int tmp_fscanf_return;
char * tmp_fgets_return;
Uint8 a; Uint8 a;
/* Clear label surface */ /* Clear label surface */
@ -21006,13 +21008,12 @@ static void load_info_about_label_surface(FILE * lfi)
have_to_rec_label_node = FALSE; have_to_rec_label_node = FALSE;
// lfi = fopen(lfname, "r");
if (lfi == NULL) if (lfi == NULL)
return; return;
tmp_fscanf_return = fscanf(lfi, "%d\n", &list_ctr); tmp_fscanf_return = fscanf(lfi, "%d\n", &list_ctr);
tmp_fscanf_return = fscanf(lfi, "%d\n", &tmp_scale_w); tmp_fscanf_return = fscanf(lfi, "%d\n", &tmp_scale_w);
tmp_fscanf_return = fscanf(lfi, "%d\n\n", &tmp_scale_h); tmp_fscanf_return = fscanf(lfi, "%d\n\n", &tmp_scale_h);
(void)tmp_fscanf_return;
old_width = tmp_scale_w; old_width = tmp_scale_w;
old_height = tmp_scale_h; old_height = tmp_scale_h;
@ -21098,7 +21099,8 @@ static void load_info_about_label_surface(FILE * lfi)
new_node->save_cur_font = 0; new_node->save_cur_font = 0;
new_node->save_font_type = malloc(64); new_node->save_font_type = malloc(64);
tmp_fscanf_return = fgets(new_node->save_font_type, 64, lfi); tmp_fgets_return = fgets(new_node->save_font_type, 64, lfi);
(void)tmp_fgets_return;
tmp_fscanf_return = fscanf(lfi, "%d\n", &new_node->save_text_state); tmp_fscanf_return = fscanf(lfi, "%d\n", &new_node->save_text_state);
tmp_fscanf_return = fscanf(lfi, "%u\n", &new_node->save_text_size); tmp_fscanf_return = fscanf(lfi, "%u\n", &new_node->save_text_size);
@ -21673,7 +21675,7 @@ void load_embedded_data(char *fname, SDL_Surface * org_surf)
blured when scaled one)*/ blured when scaled one)*/
for (u = 0; u < num_unknowns; u++) for (u = 0; u < num_unknowns; u++)
{ {
printf("%s, %d\n", unknowns[u].name, unknowns[u].size); printf("%s, %d\n", unknowns[u].name, (int) unknowns[u].size);
if (chunk_is_valid("tpDT", unknowns[u])) if (chunk_is_valid("tpDT", unknowns[u]))
{ {
@ -21696,6 +21698,7 @@ void load_embedded_data(char *fname, SDL_Surface * org_surf)
CHAR_PTR_TMP = fgets(control, 49, fi); CHAR_PTR_TMP = fgets(control, 49, fi);
CHAR_PTR_TMP = fgets(control, 49, fi); CHAR_PTR_TMP = fgets(control, 49, fi);
CHAR_PTR_TMP = fgets(control, 49, fi); CHAR_PTR_TMP = fgets(control, 49, fi);
(void)CHAR_PTR_TMP;
free(control); free(control);
/* fi will be closed in load_starter_id() */ /* fi will be closed in load_starter_id() */
@ -22618,7 +22621,6 @@ application support folder */
} }
if (tmpcfg.joystick_buttons_ignore) if (tmpcfg.joystick_buttons_ignore)
{ {
int i;
char *token; char *token;
token = strtok(tmpcfg.joystick_buttons_ignore, ","); token = strtok(tmpcfg.joystick_buttons_ignore, ",");
@ -22627,7 +22629,7 @@ application support folder */
if (strtof(token, NULL) < 0 || strtof(token, NULL) > 254) if (strtof(token, NULL) < 0 || strtof(token, NULL) > 254)
{ {
/* FIXME: Find better exit code */ /* FIXME: Find better exit code */
printf("Joystick buttons must be between 0 and 254", tmpcfg.joystick_button_print); printf("Joystick buttons must be between 0 and 254 (don't like %s)", tmpcfg.joystick_buttons_ignore);
exit(1); exit(1);
} }
joystick_buttons_ignore[joystick_buttons_ignore_len++] = strtof(token, NULL); joystick_buttons_ignore[joystick_buttons_ignore_len++] = strtof(token, NULL);
@ -24181,14 +24183,16 @@ static void claim_to_be_ready(void)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int i; #ifdef DEBUG
CLOCK_TYPE time1; CLOCK_TYPE time1;
CLOCK_TYPE time2; CLOCK_TYPE time2;
CLOCK_TYPE time3; #endif
(void)argc; (void)argc;
#ifdef DEBUG
CLOCK_ASM(time1); CLOCK_ASM(time1);
#endif
/* do not add code (slowness) here unless required for scanning fonts */ /* do not add code (slowness) here unless required for scanning fonts */
progname = argv[0]; progname = argv[0];
@ -24209,7 +24213,10 @@ int main(int argc, char *argv[])
chdir_to_binary(argv[0]); chdir_to_binary(argv[0]);
setup_config(argv); setup_config(argv);
#ifdef DEBUG
CLOCK_ASM(time2); CLOCK_ASM(time2);
#endif
#ifdef FORKED_FONTS #ifdef FORKED_FONTS
/* must start ASAP, but depends on locale which in turn needs the config */ /* must start ASAP, but depends on locale which in turn needs the config */
#ifdef NO_SDLPANGO #ifdef NO_SDLPANGO
@ -24245,8 +24252,6 @@ int main(int argc, char *argv[])
/* Set up! */ /* Set up! */
setup(); setup();
CLOCK_ASM(time3);
#ifdef DEBUG #ifdef DEBUG
printf("Seconds in early start-up: %.3f\n", (double)(time2 - time1) / CLOCK_SPEED); printf("Seconds in early start-up: %.3f\n", (double)(time2 - time1) / CLOCK_SPEED);
printf("Seconds in late start-up: %.3f\n", (double)(time2 - time1) / CLOCK_SPEED); printf("Seconds in late start-up: %.3f\n", (double)(time2 - time1) / CLOCK_SPEED);
@ -24420,6 +24425,7 @@ static int trash(char *path)
/* FIXME: Is this sufficient to find 'dbus-send' (rely on system to use $PATH?) -bjk 2011.04.18 */ /* FIXME: Is this sufficient to find 'dbus-send' (rely on system to use $PATH?) -bjk 2011.04.18 */
tmp = system("dbus-send / org.kde.KDirNotify.FilesAdded string:trash:/"); tmp = system("dbus-send / org.kde.KDirNotify.FilesAdded string:trash:/");
(void)tmp;
/* Note: GNOME figures out when things change because it asks the Kernel /* Note: GNOME figures out when things change because it asks the Kernel