mirror of
https://github.com/libsdl-org/SDL.git
synced 2026-03-20 15:51:07 +01:00
Fix warnings: extra semi - spurious (#15014)
This commit is contained in:
@@ -60,7 +60,7 @@ void SDL_ShowFileDialogWithProperties(SDL_FileDialogType type, SDL_DialogFileCal
|
|||||||
SDL_SetError("Unsupported file dialog type: %d", (int) type);
|
SDL_SetError("Unsupported file dialog type: %d", (int) type);
|
||||||
callback(userdata, NULL, -1);
|
callback(userdata, NULL, -1);
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ void SDL_SYS_ShowFileDialogWithProperties(SDL_FileDialogType type, SDL_DialogFil
|
|||||||
SDL_Unsupported();
|
SDL_Unsupported();
|
||||||
callback(userdata, NULL, -1);
|
callback(userdata, NULL, -1);
|
||||||
return;
|
return;
|
||||||
};
|
}
|
||||||
|
|
||||||
if (!Android_JNI_OpenFileDialog(callback, userdata, filters, nfilters, is_save, allow_many)) {
|
if (!Android_JNI_OpenFileDialog(callback, userdata, filters, nfilters, is_save, allow_many)) {
|
||||||
// SDL_SetError is already called when it fails
|
// SDL_SetError is already called when it fails
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ static bool get_x11_window_handle(SDL_PropertiesID props, char *out)
|
|||||||
}
|
}
|
||||||
if (SDL_snprintf(out, X11_HANDLE_MAX_WIDTH, "0x%" SDL_PRIx64, handle) >= X11_HANDLE_MAX_WIDTH) {
|
if (SDL_snprintf(out, X11_HANDLE_MAX_WIDTH, "0x%" SDL_PRIx64, handle) >= X11_HANDLE_MAX_WIDTH) {
|
||||||
return false;
|
return false;
|
||||||
};
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -156,7 +156,7 @@ static zenityArgs *create_zenity_args(SDL_FileDialogType type, SDL_DialogFileCal
|
|||||||
case SDL_FILEDIALOG_OPENFOLDER:
|
case SDL_FILEDIALOG_OPENFOLDER:
|
||||||
argv[argc++] = "--directory";
|
argv[argc++] = "--directory";
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
if (args->filename) {
|
if (args->filename) {
|
||||||
argv[argc++] = "--filename";
|
argv[argc++] = "--filename";
|
||||||
|
|||||||
@@ -1287,5 +1287,5 @@ void SDL_SYS_ShowFileDialogWithProperties(SDL_FileDialogType type, SDL_DialogFil
|
|||||||
case SDL_FILEDIALOG_OPENFOLDER:
|
case SDL_FILEDIALOG_OPENFOLDER:
|
||||||
ShowFolderDialog(callback, userdata, window, default_location, allow_many, title, accept, cancel);
|
ShowFolderDialog(callback, userdata, window, default_location, allow_many, title, accept, cancel);
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -234,7 +234,7 @@ char *SDL_SYS_GetUserFolder(SDL_Folder folder)
|
|||||||
default:
|
default:
|
||||||
SDL_SetError("Invalid SDL_Folder: %d", (int)folder);
|
SDL_SetError("Invalid SDL_Folder: %d", (int)folder);
|
||||||
goto done;
|
goto done;
|
||||||
};
|
}
|
||||||
|
|
||||||
hr = pSHGetKnownFolderPath(&type, 0x00008000 /* KF_FLAG_CREATE */, NULL, &path);
|
hr = pSHGetKnownFolderPath(&type, 0x00008000 /* KF_FLAG_CREATE */, NULL, &path);
|
||||||
if (SUCCEEDED(hr)) {
|
if (SUCCEEDED(hr)) {
|
||||||
@@ -296,7 +296,7 @@ char *SDL_SYS_GetUserFolder(SDL_Folder folder)
|
|||||||
default:
|
default:
|
||||||
SDL_SetError("Unsupported SDL_Folder on Windows before Vista: %d", (int)folder);
|
SDL_SetError("Unsupported SDL_Folder on Windows before Vista: %d", (int)folder);
|
||||||
goto done;
|
goto done;
|
||||||
};
|
}
|
||||||
|
|
||||||
// Create the OS-specific folder if it doesn't already exist
|
// Create the OS-specific folder if it doesn't already exist
|
||||||
type |= CSIDL_FLAG_CREATE;
|
type |= CSIDL_FLAG_CREATE;
|
||||||
|
|||||||
@@ -1066,7 +1066,7 @@ static void pointer_handle_button(void *data, struct wl_pointer *pointer, uint32
|
|||||||
Wayland_UpdateImplicitGrabSerial(seat, serial);
|
Wayland_UpdateImplicitGrabSerial(seat, serial);
|
||||||
}
|
}
|
||||||
|
|
||||||
seat->pointer.pending_frame.timestamp_ns = Wayland_GetPointerTimestamp(seat, time);;
|
seat->pointer.pending_frame.timestamp_ns = Wayland_GetPointerTimestamp(seat, time);
|
||||||
|
|
||||||
if (wl_seat_get_version(seat->wl_seat) >= WL_POINTER_FRAME_SINCE_VERSION) {
|
if (wl_seat_get_version(seat->wl_seat) >= WL_POINTER_FRAME_SINCE_VERSION) {
|
||||||
if (state_w) {
|
if (state_w) {
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ static void X11_PositionMessageBox(SDL_MessageBoxX11 *controls, int *wp, int *hp
|
|||||||
controls->icon->rect.x = 0;
|
controls->icon->rect.x = 0;
|
||||||
} else {
|
} else {
|
||||||
controls->message->rect.x = 0;
|
controls->message->rect.x = 0;
|
||||||
controls->icon->rect.x = controls->message->rect.w + SDL_TOOLKIT_X11_ELEMENT_PADDING_2 * controls->window->iscale;;
|
controls->icon->rect.x = controls->message->rect.w + SDL_TOOLKIT_X11_ELEMENT_PADDING_2 * controls->window->iscale;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (controls->message->rect.h > controls->icon->rect.h) {
|
if (controls->message->rect.h > controls->icon->rect.h) {
|
||||||
|
|||||||
@@ -1655,7 +1655,7 @@ static int surface_testSetGetSurfaceClipRect(void *args)
|
|||||||
}
|
}
|
||||||
SDL_DestroySurface(s);
|
SDL_DestroySurface(s);
|
||||||
return TEST_COMPLETED;
|
return TEST_COMPLETED;
|
||||||
};
|
}
|
||||||
|
|
||||||
static int SDLCALL surface_testFlip(void *arg)
|
static int SDLCALL surface_testFlip(void *arg)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user