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