]>
Commit | Line | Data |
---|---|---|
1 | --- allegro-4.4.2/src/unix/umodules.c.orig 2011-05-13 10:11:33.000000000 +0200 | |
2 | +++ allegro-4.4.2/src/unix/umodules.c 2013-03-31 15:38:10.240570677 +0200 | |
3 | @@ -126,11 +126,11 @@ | |
4 | continue; | |
5 | ||
6 | if (!fullpath_slash) { | |
7 | - snprintf(fullpath, sizeof fullpath, filename); | |
8 | + snprintf(fullpath, sizeof fullpath, "%s", filename); | |
9 | fullpath[(sizeof fullpath) - 1] = 0; | |
10 | } | |
11 | else { | |
12 | - snprintf(fullpath_slash+1, (sizeof fullpath) - (fullpath_slash - fullpath) - 1, filename); | |
13 | + snprintf(fullpath_slash+1, (sizeof fullpath) - (fullpath_slash - fullpath) - 1, "%s", filename); | |
14 | fullpath[(sizeof fullpath) - 1] = 0; | |
15 | } | |
16 | ||
17 | --- allegro-4.4.2/src/linux/ljoy.c.orig 2010-02-20 06:18:16.000000000 +0100 | |
18 | +++ allegro-4.4.2/src/linux/ljoy.c 2013-03-31 16:10:01.382066535 +0200 | |
19 | @@ -93,7 +93,7 @@ | |
20 | ||
21 | if (ioctl(joy_fd[i], JSIOCGVERSION, &raw_version) < 0) { | |
22 | /* NOTE: IOCTL fails if the joystick API is version 0.x */ | |
23 | - uszprintf(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("Your Linux joystick API is version 0.x which is unsupported.")); | |
24 | + uszprintf(allegro_error, ALLEGRO_ERROR_SIZE, "%s", get_config_text("Your Linux joystick API is version 0.x which is unsupported.")); | |
25 | return -1; | |
26 | } | |
27 | ||
28 | --- allegro-4.4.2/examples/exkeys.c.orig 2008-01-10 20:46:00.000000000 +0100 | |
29 | +++ allegro-4.4.2/examples/exkeys.c 2013-03-31 17:08:24.133321018 +0200 | |
30 | @@ -193,7 +193,7 @@ | |
31 | if (key_shifts & KB_NUMLOCK_FLAG) strcat(buf, " num"); | |
32 | if (key_shifts & KB_SCROLOCK_FLAG) strcat(buf, " scrl"); | |
33 | scroll(); | |
34 | - textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), buf); | |
35 | + textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), "%s", buf); | |
36 | } while (k != 27); | |
37 | ||
38 | /* various scan codes are defined in allegro.h as KEY_* constants */ | |
39 | @@ -234,7 +234,7 @@ | |
40 | if (key[KEY_8]) buf[8] = '8'; else buf[8] = ' '; | |
41 | if (key[KEY_9]) buf[9] = '9'; else buf[9] = ' '; | |
42 | buf[10] = 0; | |
43 | - textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), buf); | |
44 | + textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), "%s", buf); | |
45 | rest(1); | |
46 | } while (!keypressed() || (readkey() >> 8) != KEY_ESC); | |
47 | ||
48 | --- allegro-4.4.2/examples/extrans2.c.orig 2008-01-30 11:56:50.000000000 +0100 | |
49 | +++ allegro-4.4.2/examples/extrans2.c 2013-03-31 17:12:57.722608195 +0200 | |
50 | @@ -211,7 +211,7 @@ | |
51 | } else { | |
52 | msg = "no flipping"; | |
53 | } | |
54 | - textprintf_ex(buffer, font, 1, 1, makecol(255, 255, 255), -1, msg); | |
55 | + textprintf_ex(buffer, font, 1, 1, makecol(255, 255, 255), -1, "%s", msg); | |
56 | ||
57 | /* finally blit the back buffer on the screen */ | |
58 | blit(buffer, screen, 0, 0, 0, 0, buffer->w, buffer->h); | |
59 | --- allegro-4.4.2/tools/pack.c.orig 2006-05-20 16:49:58.000000000 +0200 | |
60 | +++ allegro-4.4.2/tools/pack.c 2013-03-31 17:43:56.811562844 +0200 | |
61 | @@ -42,7 +42,7 @@ | |
62 | printf(": %s", s1); | |
63 | ||
64 | if (s2) | |
65 | - printf(s2); | |
66 | + fputs(s2, stdout); | |
67 | ||
68 | printf("\n"); | |
69 | ||
70 | --- allegro-4.4.2/setup/setup.c.orig 2010-05-23 18:05:33.000000000 +0200 | |
71 | +++ allegro-4.4.2/setup/setup.c 2013-03-31 18:03:16.278298378 +0200 | |
72 | @@ -1163,7 +1163,7 @@ | |
73 | textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, uconvert_ascii("%s (%d/%d)", tmp), | |
74 | joystick_driver->name, i+1, num_joysticks); | |
75 | else | |
76 | - textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, joystick_driver->name); | |
77 | + textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, "%s", joystick_driver->name); | |
78 | c++; | |
79 | } | |
80 | ||
81 | @@ -2879,7 +2879,7 @@ | |
82 | alert(uconvert_ascii("Error loading " SETUP_DATA_FILE, tmp1), NULL, NULL, uconvert_ascii("OK", tmp2), NULL, 13, 0); | |
83 | #else | |
84 | set_gfx_mode(GFX_TEXT, 0, 0, 0, 0); | |
85 | - allegro_message(uconvert_ascii("Error loading " SETUP_DATA_FILE "\n", tmp1)); | |
86 | + allegro_message("%s", uconvert_ascii("Error loading " SETUP_DATA_FILE "\n", tmp1)); | |
87 | #endif | |
88 | return 1; | |
89 | } | |
90 | --- allegro-4.4.2/tests/play.c.orig 2005-03-19 12:15:07.000000000 +0100 | |
91 | +++ allegro-4.4.2/tests/play.c 2013-03-31 18:04:24.698120328 +0200 | |
92 | @@ -74,7 +74,7 @@ | |
93 | ||
94 | strcat(msg, "\nIf you don't specify the card, Allegro will auto-detect (ie. guess :-)\n"); | |
95 | ||
96 | - allegro_message(msg); | |
97 | + allegro_message("%s", msg); | |
98 | free(msg); | |
99 | } | |
100 |