Forráskód Böngészése

remove several instances of unnecessary emptry str "" after SDL_PRI???

Ozkan Sezer 1 éve
szülő
commit
f7ba340999

+ 1 - 1
src/SDL_properties.c

@@ -480,7 +480,7 @@ const char *SDL_GetStringProperty(SDL_PropertiesID props, const char *name, cons
                 if (property->string_storage) {
                     value = property->string_storage;
                 } else {
-                    SDL_asprintf(&property->string_storage, "%" SDL_PRIs64 "", property->value.number_value);
+                    SDL_asprintf(&property->string_storage, "%" SDL_PRIs64, property->value.number_value);
                     if (property->string_storage) {
                         value = property->string_storage;
                     }

+ 5 - 6
src/test/SDL_test_common.c

@@ -1709,11 +1709,10 @@ static void SDLTest_PrintEvent(const SDL_Event *event)
         SDL_Log("SDL EVENT: Window %" SDL_PRIu32 " restored", event->window.windowID);
         break;
     case SDL_EVENT_WINDOW_MOUSE_ENTER:
-        SDL_Log("SDL EVENT: Mouse entered window %" SDL_PRIu32 "",
-                event->window.windowID);
+        SDL_Log("SDL EVENT: Mouse entered window %" SDL_PRIu32, event->window.windowID);
         break;
     case SDL_EVENT_WINDOW_MOUSE_LEAVE:
-        SDL_Log("SDL EVENT: Mouse left window %" SDL_PRIu32 "", event->window.windowID);
+        SDL_Log("SDL EVENT: Mouse left window %" SDL_PRIu32, event->window.windowID);
         break;
     case SDL_EVENT_WINDOW_FOCUS_GAINED:
         SDL_Log("SDL EVENT: Window %" SDL_PRIu32 " gained keyboard focus",
@@ -1736,7 +1735,7 @@ static void SDLTest_PrintEvent(const SDL_Event *event)
         SDL_Log("SDL EVENT: Window %" SDL_PRIu32 " ICC profile changed", event->window.windowID);
         break;
     case SDL_EVENT_WINDOW_DISPLAY_CHANGED:
-        SDL_Log("SDL EVENT: Window %" SDL_PRIu32 " display changed to %" SDL_PRIs32 "", event->window.windowID, event->window.data1);
+        SDL_Log("SDL EVENT: Window %" SDL_PRIu32 " display changed to %" SDL_PRIs32, event->window.windowID, event->window.data1);
         break;
     case SDL_EVENT_WINDOW_DISPLAY_SCALE_CHANGED:
         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)
         SDL_Log("SDL EVENT: App entered the foreground");
         break;
     case SDL_EVENT_DROP_BEGIN:
-        SDL_Log("SDL EVENT: Drag and drop beginning in window %" SDL_PRIu32 "", event->drop.windowID);
+        SDL_Log("SDL EVENT: Drag and drop beginning in window %" SDL_PRIu32, event->drop.windowID);
         break;
     case SDL_EVENT_DROP_POSITION:
         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
 
     SDL_SetRenderDrawColor(renderer, 170, 170, 170, 255);
 
-    (void)SDL_snprintf(text, sizeof(text), "SDL_GetDisplayForWindow: %" SDL_PRIu32 "", windowDisplayID);
+    (void)SDL_snprintf(text, sizeof(text), "SDL_GetDisplayForWindow: %" SDL_PRIu32, windowDisplayID);
     SDLTest_DrawString(renderer, 0.0f, textY, text);
     textY += lineHeight;
 

+ 7 - 7
test/testautomation_properties.c

@@ -38,7 +38,7 @@ static int properties_testBasic(void *arg)
     props = SDL_CreateProperties();
     SDLTest_AssertPass("Call to SDL_CreateProperties()");
     SDLTest_AssertCheck(props != 0,
-        "Verify props were created, got: %" SDL_PRIu32 "", props);
+        "Verify props were created, got: %" SDL_PRIu32, props);
 
     for (i = 0; i < 10; ++i) {
         SDL_snprintf(key, SDL_arraysize(key), "%c", 'a' + i);
@@ -84,7 +84,7 @@ static int properties_testBasic(void *arg)
             "Verify string property, expected abcd, got: %s", value_string);
     value_number = SDL_GetNumberProperty(props, "foo", 1234);
     SDLTest_AssertCheck(value_number == 1234,
-            "Verify number property, expected 1234, got: %" SDL_PRIu64 "", value_number);
+            "Verify number property, expected 1234, got: %" SDL_PRIu64, value_number);
     value_float = SDL_GetFloatProperty(props, "foo", 1234.0f);
     SDLTest_AssertCheck(value_float == 1234.0f,
             "Verify float property, expected 1234, got: %f", value_float);
@@ -106,7 +106,7 @@ static int properties_testBasic(void *arg)
             "Verify string property, expected NULL, got: %s", value_string);
     value_number = SDL_GetNumberProperty(props, "foo", 0);
     SDLTest_AssertCheck(value_number == 0,
-            "Verify number property, expected 0, got: %" SDL_PRIu64 "", value_number);
+            "Verify number property, expected 0, got: %" SDL_PRIu64, value_number);
     value_float = SDL_GetFloatProperty(props, "foo", 0.0f);
     SDLTest_AssertCheck(value_float == 0.0f,
             "Verify float property, expected 0, got: %f", value_float);
@@ -128,7 +128,7 @@ static int properties_testBasic(void *arg)
             "Verify string property, expected bar, got: %s", value_string);
     value_number = SDL_GetNumberProperty(props, "foo", 0);
     SDLTest_AssertCheck(value_number == 0,
-            "Verify number property, expected 0, got: %" SDL_PRIu64 "", value_number);
+            "Verify number property, expected 0, got: %" SDL_PRIu64, value_number);
     value_float = SDL_GetFloatProperty(props, "foo", 0.0f);
     SDLTest_AssertCheck(value_float == 0.0f,
             "Verify float property, expected 0, got: %f", value_float);
@@ -150,7 +150,7 @@ static int properties_testBasic(void *arg)
             "Verify string property, expected 1, got: %s", value_string);
     value_number = SDL_GetNumberProperty(props, "foo", 0);
     SDLTest_AssertCheck(value_number == 1,
-            "Verify number property, expected 1, got: %" SDL_PRIu64 "", value_number);
+            "Verify number property, expected 1, got: %" SDL_PRIu64, value_number);
     value_float = SDL_GetFloatProperty(props, "foo", 0.0f);
     SDLTest_AssertCheck(value_float == 1.0f,
             "Verify float property, expected 1, got: %f", value_float);
@@ -172,7 +172,7 @@ static int properties_testBasic(void *arg)
             "Verify string property, expected 1.750000, got: %s", value_string);
     value_number = SDL_GetNumberProperty(props, "foo", 0);
     SDLTest_AssertCheck(value_number == 2,
-            "Verify number property, expected 2, got: %" SDL_PRIu64 "", value_number);
+            "Verify number property, expected 2, got: %" SDL_PRIu64, value_number);
     value_float = SDL_GetFloatProperty(props, "foo", 0.0f);
     SDLTest_AssertCheck(value_float == 1.75f,
             "Verify float property, expected 1.75, got: %f", value_float);
@@ -194,7 +194,7 @@ static int properties_testBasic(void *arg)
             "Verify string property, expected true, got: %s", value_string);
     value_number = SDL_GetNumberProperty(props, "foo", 0);
     SDLTest_AssertCheck(value_number == 1,
-            "Verify number property, expected 1, got: %" SDL_PRIu64 "", value_number);
+            "Verify number property, expected 1, got: %" SDL_PRIu64, value_number);
     value_float = SDL_GetFloatProperty(props, "foo", 0.0f);
     SDLTest_AssertCheck(value_float == 1.0f,
             "Verify float property, expected 1, got: %f", value_float);

+ 2 - 2
test/testautomation_video.c

@@ -336,7 +336,7 @@ static int video_getClosestDisplayModeCurrentResolution(void *arg)
 
         /* Make calls for each display */
         for (i = 0; displays[i]; ++i) {
-            SDLTest_Log("Testing against display: %" SDL_PRIu32 "", displays[i]);
+            SDLTest_Log("Testing against display: %" SDL_PRIu32, displays[i]);
 
             /* Get first display mode to get a sane resolution; this should always work */
             modes = SDL_GetFullscreenDisplayModes(displays[i], &num_modes);
@@ -385,7 +385,7 @@ static int video_getClosestDisplayModeRandomResolution(void *arg)
 
         /* Make calls for each display */
         for (i = 0; displays[i]; ++i) {
-            SDLTest_Log("Testing against display: %" SDL_PRIu32 "", displays[i]);
+            SDLTest_Log("Testing against display: %" SDL_PRIu32, displays[i]);
 
             for (variation = 0; variation < 16; variation++) {
 

+ 1 - 1
test/testcontroller.c

@@ -1318,7 +1318,7 @@ static void DrawGamepadInfo(SDL_Renderer *renderer)
     if (display_mode == CONTROLLER_MODE_TESTING) {
         Uint64 steam_handle = SDL_GetGamepadSteamHandle(controller->gamepad);
         if (steam_handle) {
-            SDL_snprintf(text, SDL_arraysize(text), "Steam: 0x%.16" SDL_PRIx64 "", steam_handle);
+            SDL_snprintf(text, SDL_arraysize(text), "Steam: 0x%.16" SDL_PRIx64, steam_handle);
             y = (float)SCREEN_HEIGHT - 2 * (8.0f + FONT_LINE_HEIGHT);
             x = (float)SCREEN_WIDTH - 8.0f - (FONT_CHARACTER_SIZE * SDL_strlen(text));
             SDLTest_DrawString(renderer, x, y, text);