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

printf fmt warnings that could crash 64-bit

Browse source
This commit is contained in:
Albert Cahalan 2009-11-08 00:02:55 +00:00
parent d28d4322c8
commit 31b51a4034
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -282,12 +282,14 @@ release: releasedir
tar -czvf tuxpaint-$(VER_VERSION).tar.gz tuxpaint-$(VER_VERSION) tar -czvf tuxpaint-$(VER_VERSION).tar.gz tuxpaint-$(VER_VERSION)
# "make olpc" builds the program for an OLPC XO: # "make olpc" builds the program for an OLPC XO:
MAGIC_GOOD:=blur blocks_chalk_drip bricks calligraphy fade_darken\
fill flower foam grass mirror_flip shift smudge snow tint
.PHONY: olpc .PHONY: olpc
olpc: olpc:
@echo @echo
@echo "Building for an OLPC XO" @echo "Building for an OLPC XO"
@echo @echo
make PREFIX:=. OPTFLAGS:='-O2 -fno-tree-pre -march=athlon -mtune=generic -mpreferred-stack-boundary=2 -mmmx -m3dnow -fomit-frame-pointer -falign-functions=0 -falign-jumps=0 -DOLPC_XO -DSUGAR' make PREFIX:=. MAGIC_C:=$(patsubst %,magic/src/%.c,$(MAGIC_GOOD)) OPTFLAGS:='-O2 -fno-tree-pre -march=athlon -mtune=generic -mpreferred-stack-boundary=2 -mmmx -m3dnow -fomit-frame-pointer -falign-functions=0 -falign-jumps=0 -DOLPC_XO -DSUGAR'
# "make nokia770" builds the program for the Nokia 770. # "make nokia770" builds the program for the Nokia 770.
.PHONY: nokia770 .PHONY: nokia770

8
src/tuxpaint.c
View file

@ -13836,7 +13836,7 @@ static int do_save(int tool, int dont_show_success_results)
for(i=0; i < current_node->save_texttool_len; i++) for(i=0; i < current_node->save_texttool_len; i++)
{ {
fprintf(fi, "%lc", current_node->save_texttool_str[i]); fprintf(fi, "%lc", (wint_t)current_node->save_texttool_str[i]);
} }
fprintf(fi, "\n"); fprintf(fi, "\n");
@ -13861,7 +13861,7 @@ static int do_save(int tool, int dont_show_success_results)
fprintf(fi, "\n\n"); fprintf(fi, "\n\n");
} }
current_node = current_node->next_to_up_label_node; current_node = current_node->next_to_up_label_node;
printf("cur %i, red %i\n",current_node, first_label_node_in_redo_stack); //FIXAM printf("cur %p, red %p\n",current_node, first_label_node_in_redo_stack); //FIXAM
} }
fclose(fi); fclose(fi);
free(fname); free(fname);
@ -20993,8 +20993,8 @@ void delete_label_list(struct label_node** ref_head)
while(current != NULL) while(current != NULL)
{ {
printf("%x current\n", current); //FIXAM printf("%p current\n", current); //FIXAM
fflush(stdout); fflush(stdout);
next = current->next_to_up_label_node; next = current->next_to_up_label_node;
free(current); free(current);