From 6115f80dfb76ffbdeeacab5fc33ea4fb5eb677fd Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 7 Jun 2022 21:19:25 -0400 Subject: Remove unnecessary forward-compatibility code --- src/implementation.c | 10 +++------- src/x11.c | 4 ---- test/test_stub_hints.c | 10 ---------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/implementation.c b/src/implementation.c index e7ae5e4..84d9eea 100644 --- a/src/implementation.c +++ b/src/implementation.c @@ -216,18 +216,14 @@ puglSetViewHint(PuglView* view, PuglViewHint hint, int value) } } - if (hint < PUGL_NUM_VIEW_HINTS) { - view->hints[hint] = value; - return PUGL_SUCCESS; - } - - return PUGL_BAD_PARAMETER; + view->hints[hint] = value; + return PUGL_SUCCESS; } int puglGetViewHint(const PuglView* view, PuglViewHint hint) { - return (hint < PUGL_NUM_VIEW_HINTS) ? view->hints[hint] : PUGL_DONT_CARE; + return view->hints[hint]; } const char* diff --git a/src/x11.c b/src/x11.c index 1be6a8e..c7fdad2 100644 --- a/src/x11.c +++ b/src/x11.c @@ -1643,10 +1643,6 @@ puglSetSizeHint(PuglView* const view, const PuglSpan width, const PuglSpan height) { - if ((unsigned)hint > (unsigned)PUGL_MAX_ASPECT) { - return PUGL_BAD_PARAMETER; - } - view->sizeHints[hint].width = width; view->sizeHints[hint].height = height; return updateSizeHints(view); diff --git a/test/test_stub_hints.c b/test/test_stub_hints.c index 12a848b..0ff9e5b 100644 --- a/test/test_stub_hints.c +++ b/test/test_stub_hints.c @@ -36,10 +36,6 @@ main(void) puglSetEventFunc(view, onEvent); puglSetSizeHint(view, PUGL_DEFAULT_SIZE, 512, 512); - // Check invalid cases - assert(puglSetViewHint(view, (PuglViewHint)9999, 0) == PUGL_BAD_PARAMETER); - assert(puglGetViewHint(view, (PuglViewHint)9999) == PUGL_DONT_CARE); - // Set all relevant hints that support it to PUGL_DONT_CARE assert(!puglSetViewHint(view, PUGL_RED_BITS, PUGL_DONT_CARE)); assert(!puglSetViewHint(view, PUGL_GREEN_BITS, PUGL_DONT_CARE)); @@ -59,9 +55,6 @@ main(void) assert(puglSetViewHint(view, PUGL_SWAP_INTERVAL, PUGL_DONT_CARE) == PUGL_BAD_PARAMETER); - // Check failure to set out of range hints - assert(puglSetViewHint(view, (PuglViewHint)999, 1) == PUGL_BAD_PARAMETER); - // Realize view and print all hints for debugging convenience assert(!puglRealize(view)); printViewHints(view); @@ -79,9 +72,6 @@ main(void) assert(puglGetViewHint(view, PUGL_IGNORE_KEY_REPEAT) != PUGL_DONT_CARE); assert(puglGetViewHint(view, PUGL_REFRESH_RATE) != PUGL_DONT_CARE); - // Check failure to get out of range hints - assert(puglGetViewHint(view, (PuglViewHint)999) == PUGL_DONT_CARE); - // Tear down puglFreeView(view); puglFreeWorld(world); -- cgit v1.2.1