Skip to content

Commit f7ba340

Browse files
sezerosezero
committed
remove several instances of unnecessary emptry str "" after SDL_PRI???
1 parent c540c77 commit f7ba340

File tree

5 files changed

+16
-17
lines changed

5 files changed

+16
-17
lines changed

‎src/SDL_properties.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ const char *SDL_GetStringProperty(SDL_PropertiesID props, const char *name, cons
480480
if (property->string_storage) {
481481
value = property->string_storage;
482482
} else {
483-
SDL_asprintf(&property->string_storage, "%" SDL_PRIs64 "", property->value.number_value);
483+
SDL_asprintf(&property->string_storage, "%" SDL_PRIs64, property->value.number_value);
484484
if (property->string_storage) {
485485
value = property->string_storage;
486486
}

‎src/test/SDL_test_common.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1709,11 +1709,10 @@ static void SDLTest_PrintEvent(const SDL_Event *event)
17091709
SDL_Log("SDL EVENT: Window %" SDL_PRIu32 " restored", event->window.windowID);
17101710
break;
17111711
case SDL_EVENT_WINDOW_MOUSE_ENTER:
1712-
SDL_Log("SDL EVENT: Mouse entered window %" SDL_PRIu32 "",
1713-
event->window.windowID);
1712+
SDL_Log("SDL EVENT: Mouse entered window %" SDL_PRIu32, event->window.windowID);
17141713
break;
17151714
case SDL_EVENT_WINDOW_MOUSE_LEAVE:
1716-
SDL_Log("SDL EVENT: Mouse left window %" SDL_PRIu32 "", event->window.windowID);
1715+
SDL_Log("SDL EVENT: Mouse left window %" SDL_PRIu32, event->window.windowID);
17171716
break;
17181717
case SDL_EVENT_WINDOW_FOCUS_GAINED:
17191718
SDL_Log("SDL EVENT: Window %" SDL_PRIu32 " gained keyboard focus",
@@ -1736,7 +1735,7 @@ static void SDLTest_PrintEvent(const SDL_Event *event)
17361735
SDL_Log("SDL EVENT: Window %" SDL_PRIu32 " ICC profile changed", event->window.windowID);
17371736
break;
17381737
case SDL_EVENT_WINDOW_DISPLAY_CHANGED:
1739-
SDL_Log("SDL EVENT: Window %" SDL_PRIu32 " display changed to %" SDL_PRIs32 "", event->window.windowID, event->window.data1);
1738+
SDL_Log("SDL EVENT: Window %" SDL_PRIu32 " display changed to %" SDL_PRIs32, event->window.windowID, event->window.data1);
17401739
break;
17411740
case SDL_EVENT_WINDOW_DISPLAY_SCALE_CHANGED:
17421741
SDL_Log("SDL EVENT: Window %" SDL_PRIu32 " display scale changed to %d%%", event->window.windowID, (int)(SDL_GetWindowDisplayScale(SDL_GetWindowFromID(event->window.windowID)) * 100.0f));
@@ -1926,7 +1925,7 @@ static void SDLTest_PrintEvent(const SDL_Event *event)
19261925
SDL_Log("SDL EVENT: App entered the foreground");
19271926
break;
19281927
case SDL_EVENT_DROP_BEGIN:
1929-
SDL_Log("SDL EVENT: Drag and drop beginning in window %" SDL_PRIu32 "", event->drop.windowID);
1928+
SDL_Log("SDL EVENT: Drag and drop beginning in window %" SDL_PRIu32, event->drop.windowID);
19301929
break;
19311930
case SDL_EVENT_DROP_POSITION:
19321931
SDL_Log("SDL EVENT: Drag and drop moving in window %" SDL_PRIu32 ": %g,%g", event->drop.windowID, event->drop.x, event->drop.y);
@@ -2691,7 +2690,7 @@ void SDLTest_CommonDrawWindowInfo(SDL_Renderer *renderer, SDL_Window *window, fl
26912690

26922691
SDL_SetRenderDrawColor(renderer, 170, 170, 170, 255);
26932692

2694-
(void)SDL_snprintf(text, sizeof(text), "SDL_GetDisplayForWindow: %" SDL_PRIu32 "", windowDisplayID);
2693+
(void)SDL_snprintf(text, sizeof(text), "SDL_GetDisplayForWindow: %" SDL_PRIu32, windowDisplayID);
26952694
SDLTest_DrawString(renderer, 0.0f, textY, text);
26962695
textY += lineHeight;
26972696

‎test/testautomation_properties.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ static int properties_testBasic(void *arg)
3838
props = SDL_CreateProperties();
3939
SDLTest_AssertPass("Call to SDL_CreateProperties()");
4040
SDLTest_AssertCheck(props != 0,
41-
"Verify props were created, got: %" SDL_PRIu32 "", props);
41+
"Verify props were created, got: %" SDL_PRIu32, props);
4242

4343
for (i = 0; i < 10; ++i) {
4444
SDL_snprintf(key, SDL_arraysize(key), "%c", 'a' + i);
@@ -84,7 +84,7 @@ static int properties_testBasic(void *arg)
8484
"Verify string property, expected abcd, got: %s", value_string);
8585
value_number = SDL_GetNumberProperty(props, "foo", 1234);
8686
SDLTest_AssertCheck(value_number == 1234,
87-
"Verify number property, expected 1234, got: %" SDL_PRIu64 "", value_number);
87+
"Verify number property, expected 1234, got: %" SDL_PRIu64, value_number);
8888
value_float = SDL_GetFloatProperty(props, "foo", 1234.0f);
8989
SDLTest_AssertCheck(value_float == 1234.0f,
9090
"Verify float property, expected 1234, got: %f", value_float);
@@ -106,7 +106,7 @@ static int properties_testBasic(void *arg)
106106
"Verify string property, expected NULL, got: %s", value_string);
107107
value_number = SDL_GetNumberProperty(props, "foo", 0);
108108
SDLTest_AssertCheck(value_number == 0,
109-
"Verify number property, expected 0, got: %" SDL_PRIu64 "", value_number);
109+
"Verify number property, expected 0, got: %" SDL_PRIu64, value_number);
110110
value_float = SDL_GetFloatProperty(props, "foo", 0.0f);
111111
SDLTest_AssertCheck(value_float == 0.0f,
112112
"Verify float property, expected 0, got: %f", value_float);
@@ -128,7 +128,7 @@ static int properties_testBasic(void *arg)
128128
"Verify string property, expected bar, got: %s", value_string);
129129
value_number = SDL_GetNumberProperty(props, "foo", 0);
130130
SDLTest_AssertCheck(value_number == 0,
131-
"Verify number property, expected 0, got: %" SDL_PRIu64 "", value_number);
131+
"Verify number property, expected 0, got: %" SDL_PRIu64, value_number);
132132
value_float = SDL_GetFloatProperty(props, "foo", 0.0f);
133133
SDLTest_AssertCheck(value_float == 0.0f,
134134
"Verify float property, expected 0, got: %f", value_float);
@@ -150,7 +150,7 @@ static int properties_testBasic(void *arg)
150150
"Verify string property, expected 1, got: %s", value_string);
151151
value_number = SDL_GetNumberProperty(props, "foo", 0);
152152
SDLTest_AssertCheck(value_number == 1,
153-
"Verify number property, expected 1, got: %" SDL_PRIu64 "", value_number);
153+
"Verify number property, expected 1, got: %" SDL_PRIu64, value_number);
154154
value_float = SDL_GetFloatProperty(props, "foo", 0.0f);
155155
SDLTest_AssertCheck(value_float == 1.0f,
156156
"Verify float property, expected 1, got: %f", value_float);
@@ -172,7 +172,7 @@ static int properties_testBasic(void *arg)
172172
"Verify string property, expected 1.750000, got: %s", value_string);
173173
value_number = SDL_GetNumberProperty(props, "foo", 0);
174174
SDLTest_AssertCheck(value_number == 2,
175-
"Verify number property, expected 2, got: %" SDL_PRIu64 "", value_number);
175+
"Verify number property, expected 2, got: %" SDL_PRIu64, value_number);
176176
value_float = SDL_GetFloatProperty(props, "foo", 0.0f);
177177
SDLTest_AssertCheck(value_float == 1.75f,
178178
"Verify float property, expected 1.75, got: %f", value_float);
@@ -194,7 +194,7 @@ static int properties_testBasic(void *arg)
194194
"Verify string property, expected true, got: %s", value_string);
195195
value_number = SDL_GetNumberProperty(props, "foo", 0);
196196
SDLTest_AssertCheck(value_number == 1,
197-
"Verify number property, expected 1, got: %" SDL_PRIu64 "", value_number);
197+
"Verify number property, expected 1, got: %" SDL_PRIu64, value_number);
198198
value_float = SDL_GetFloatProperty(props, "foo", 0.0f);
199199
SDLTest_AssertCheck(value_float == 1.0f,
200200
"Verify float property, expected 1, got: %f", value_float);

‎test/testautomation_video.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ static int video_getClosestDisplayModeCurrentResolution(void *arg)
336336

337337
/* Make calls for each display */
338338
for (i = 0; displays[i]; ++i) {
339-
SDLTest_Log("Testing against display: %" SDL_PRIu32 "", displays[i]);
339+
SDLTest_Log("Testing against display: %" SDL_PRIu32, displays[i]);
340340

341341
/* Get first display mode to get a sane resolution; this should always work */
342342
modes = SDL_GetFullscreenDisplayModes(displays[i], &num_modes);
@@ -385,7 +385,7 @@ static int video_getClosestDisplayModeRandomResolution(void *arg)
385385

386386
/* Make calls for each display */
387387
for (i = 0; displays[i]; ++i) {
388-
SDLTest_Log("Testing against display: %" SDL_PRIu32 "", displays[i]);
388+
SDLTest_Log("Testing against display: %" SDL_PRIu32, displays[i]);
389389

390390
for (variation = 0; variation < 16; variation++) {
391391

‎test/testcontroller.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,7 @@ static void DrawGamepadInfo(SDL_Renderer *renderer)
13181318
if (display_mode == CONTROLLER_MODE_TESTING) {
13191319
Uint64 steam_handle = SDL_GetGamepadSteamHandle(controller->gamepad);
13201320
if (steam_handle) {
1321-
SDL_snprintf(text, SDL_arraysize(text), "Steam: 0x%.16" SDL_PRIx64 "", steam_handle);
1321+
SDL_snprintf(text, SDL_arraysize(text), "Steam: 0x%.16" SDL_PRIx64, steam_handle);
13221322
y = (float)SCREEN_HEIGHT - 2 * (8.0f + FONT_LINE_HEIGHT);
13231323
x = (float)SCREEN_WIDTH - 8.0f - (FONT_CHARACTER_SIZE * SDL_strlen(text));
13241324
SDLTest_DrawString(renderer, x, y, text);

0 commit comments

Comments
 (0)