diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-14 16:48:49 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-14 16:48:49 +0000 |
| commit | 88eb8a804d05b72091309323ad2df962a1ed7b8d (patch) | |
| tree | c2d635c192bbce5a1b8d5a684b0eb451a9430378 /src/XRecord.c | |
| parent | 65a2b6d50473730673749ad2facc248ea41af00a (diff) | |
XFree86 4.3.0.1xf86-4_3_0_1PRE_xf86-4_3_0_1
Diffstat (limited to 'src/XRecord.c')
| -rw-r--r-- | src/XRecord.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/XRecord.c b/src/XRecord.c index 8c32491..138ff61 100644 --- a/src/XRecord.c +++ b/src/XRecord.c @@ -50,16 +50,17 @@ from The Open Group. /* * By Stephen Gildea, X Consortium, and Martha Zimet, NCD. */ +/* $XFree86: xc/lib/Xtst/XRecord.c,v 1.6 2002/10/16 00:37:33 dawes Exp $ */ #include <stdio.h> #include <assert.h> #define NEED_EVENTS #define NEED_REPLIES #include <X11/Xlibint.h> -#include "Xext.h" +#include <X11/extensions/Xext.h> #include <X11/Xtrans.h> -#include "extutil.h" -#include "recordstr.h" +#include <X11/extensions/extutil.h> +#include <X11/extensions/recordstr.h> extern unsigned long _XSetLastRequestRead(); @@ -739,7 +740,7 @@ parse_reply_call_callback(dpy, info, rep, reply, callback, closure) XPointer closure; { int current_index; - int datum_bytes; + int datum_bytes = 0; XRecordInterceptData *data; /* call the callback for each protocol element in the reply */ @@ -821,7 +822,7 @@ parse_reply_call_callback(dpy, info, rep, reply, callback, closure) if (current_index + datum_bytes > rep->length << 2) fprintf(stderr, "XRecord: %lu-byte reply claims %d-byte element (seq %lu)\n", - rep->length << 2, current_index + datum_bytes, + (long)rep->length << 2, current_index + datum_bytes, dpy->last_request_read); /* * This assignment (and indeed the whole buffer sharing @@ -928,7 +929,6 @@ record_async_handler(dpy, rep, buf, len, adata) register record_async_state *state = (record_async_state *)adata; struct reply_buffer *reply; enum parser_return status; - extern void _XGetAsyncData(); if (dpy->last_request_read != state->enable_seq) { @@ -957,7 +957,7 @@ record_async_handler(dpy, rep, buf, len, adata) return False; } - _XGetAsyncData(dpy, reply->buf, buf, len, + _XGetAsyncData(dpy, (char *)reply->buf, buf, len, SIZEOF(xRecordEnableContextReply), rep->generic.length << 2, 0); } else { |