fdo-mirrors/xorg-libxcb-errors
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libxcb-errors.git synced 2025-12-20 15:10:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't check codes to be in range, but find "best match"

Browse source 
If some new events are added to an extension, older implementations register a
smaller portion of the event number space than this library possible knows. So
we cannot just look for some extension that has some code "in range", but we
need to find the best one (with the largest base).

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2015-04-04 10:59:12 +02:00
parent 9f93cefb40
commit 4ed12c46de
1 changed files with 38 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/xcb_errors.c
View file

@ -28,8 +28,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#define IS_IN_RANGE(value, begin, length) ((value) >= (begin) && (value) < (begin) + (length))
struct extension_info_t { struct extension_info_t {
struct extension_info_t *next; struct extension_info_t *next;
struct static_extension_info_t static_info; struct static_extension_info_t static_info;
@ -151,29 +149,55 @@ const char *xcb_errors_get_name_for_minor_code(xcb_errors_context_t *ctx,
const char *xcb_errors_get_name_for_event(xcb_errors_context_t *ctx, const char *xcb_errors_get_name_for_event(xcb_errors_context_t *ctx,
uint8_t event_code) uint8_t event_code)
{ {
struct extension_info_t *info = ctx->extensions; struct extension_info_t *best = NULL;
struct extension_info_t *next = ctx->extensions;
while (info && (info->first_event == 0 /* Find the extension with the largest first_event <= event_code. Thanks
|| !IS_IN_RANGE(event_code, info->first_event, info->static_info.num_events))) * to this we do the right thing if the server only supports an older
info = info->next; * version of some extension which had less events.
*/
while (next) {
struct extension_info_t *current = next;
next = next->next;
if (info == NULL) if (current->first_event > event_code)
continue;
if (best != NULL && best->first_event > current->first_event)
continue;
best = current;
}
if (best == NULL || best->first_event == 0)
/* Nothing found */
return get_strings_entry(xproto_info.strings_events, event_code); return get_strings_entry(xproto_info.strings_events, event_code);
return get_strings_entry(info->static_info.strings_events, event_code - info->first_event); return get_strings_entry(best->static_info.strings_events, event_code - best->first_event);
} }
const char *xcb_errors_get_name_for_error(xcb_errors_context_t *ctx, const char *xcb_errors_get_name_for_error(xcb_errors_context_t *ctx,
uint8_t error_code) uint8_t error_code)
{ {
struct extension_info_t *info = ctx->extensions; struct extension_info_t *best = NULL;
struct extension_info_t *next = ctx->extensions;
while (info && (info->first_error == 0 /* Find the extension with the largest first_error <= error_code. Thanks
|| !IS_IN_RANGE(error_code, info->first_error, info->static_info.num_errors))) * to this we do the right thing if the server only supports an older
info = info->next; * version of some extension which had less events.
*/
while (next) {
struct extension_info_t *current = next;
next = next->next;
if (info == NULL) if (current->first_error > error_code)
continue;
if (best != NULL && best->first_error > current->first_error)
continue;
best = current;
}
if (best == NULL || best->first_error == 0)
/* Nothing found */
return get_strings_entry(xproto_info.strings_errors, error_code); return get_strings_entry(xproto_info.strings_errors, error_code);
return get_strings_entry(info->static_info.strings_errors, error_code - info->first_error); return get_strings_entry(best->static_info.strings_errors, error_code - best->first_error);
} }