xserver: Branch 'master' - 2 commits

[Keith Packard]

 doc/xml/Xserver-spec.xml |   64 -----------------------------------------------
 include/os.h             |   23 ----------------
 2 files changed, 87 deletions(-)

New commits:
commit 903e0f6f0f0ec54151640fc459ff03dcba0522af
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Nov 27 10:46:44 2010 -0800

    Xserver-spec: Delete DBE Idioms section
    
    The code has been gone for a while
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/doc/xml/Xserver-spec.xml b/doc/xml/Xserver-spec.xml
index 6299282..ae15346 100644
--- a/doc/xml/Xserver-spec.xml
+++ b/doc/xml/Xserver-spec.xml
@@ -1361,70 +1361,6 @@ The sample server implementation for these routines
 is in Xserver/os/util.c.
 </para>
 </section>
-<section>
-  <title>Idiom Support</title>
-<para>
-The DBE specification introduces the notion of idioms, which are
-groups of X requests which can be executed more efficiently when taken
-as a whole compared to being performed individually and sequentially.
-This following server internal support to allows DBE
-implementations, as well as other parts of the server,
-to do idiom processing.
-</para>
-<para>
-<blockquote><programlisting>
-
-	xReqPtr PeekNextRequest(xReqPtr req, ClientPtr client, Bool readmore)
-</programlisting></blockquote>
-If req is NULL, the return value will be a pointer to the start of the
-complete request that follows the one currently being executed for the
-client.  If req is not NULL, the function assumes that req is a
-pointer to a request in the client's request buffer, and the return
-value will be a pointer to the the start of the complete request that
-follows req.  If the complete request is not available, the function
-returns NULL; pointers to partial requests will never be returned.  If
-(and only if) readmore is TRUE, PeekNextRequest should try to read an
-additional request from the client if one is not already available in
-the client's request buffer.  If PeekNextRequest reads more data into
-the request buffer, it should not move or change the existing data.
-</para>
-<para>
-<blockquote><programlisting>
-
-	void SkipRequests(xReqPtr req, ClientPtr client, int numskipped)
-</programlisting></blockquote>
-The requests for the client up to and including the one specified by
-req will be skipped.  numskipped must be the number of requests being
-skipped.  Normal request processing will resume with the request that
-follows req.  The caller must not have modified the contents of the
-request buffer in any way (e.g., by doing byte swapping in place).
-</para>
-<para>
-Additionally, two macros in os.h operate on the xReq
-pointer returned by PeekNextRequest:
-<blockquote><programlisting>
-
-	int ReqLen(xReqPtr req, ClientPtr client)
-</programlisting></blockquote>
-The value of ReqLen is the request length in bytes of the given xReq.
-<blockquote><programlisting>
-
-	otherReqTypePtr CastxReq(xReq *req, otherReqTypePtr)
-</programlisting></blockquote>
-The value of CastxReq is the conversion of the given request pointer
-to an otherReqTypePtr (which should be a pointer to a protocol
-structure type).  Only those fields which come after the length field
-of otherReqType may be accessed via the returned pointer.
-</para>
-<para>
-Thus the first two fields of a request, reqType and data, can be
-accessed directly using the xReq * returned by PeekNextRequest.  The
-next field, the length, can be accessed with ReqLen.  Fields beyond
-that can be accessed with CastxReq.  This complexity was necessary
-because of the reencoding of core protocol that can happen due to the
-BigRequests extension.
-</para>
-</section>
 </section>
 
 <section>
commit f4ba75a494cf9f4f5b0a979e9ceb519f4a6fcacc
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Nov 27 10:46:43 2010 -0800

    Remove unused ReqLen & CastxReq macros
    
    According to Xserver-spec, they were part of the now-deleted DBE "Idioms"
    code.   The last callers of them were removed in commits fe616f9230b6 &
    3d642905477f.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/include/os.h b/include/os.h
index efa202c..e882a0c 100644
--- a/include/os.h
+++ b/include/os.h
@@ -441,29 +441,6 @@ extern _X_EXPORT int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*
 
 extern _X_EXPORT void ddxUseMsg(void);
 
-/* int ReqLen(xReq *req, ClientPtr client)
- * Given a pointer to a *complete* request, return its length in bytes.
- * Note that if the request is a big request (as defined in the Big
- * Requests extension), the macro lies by returning 4 less than the
- * length that it actually occupies in the request buffer.  This is so you
- * can blindly compare the length with the various sz_<request> constants
- * in Xproto.h without having to know/care about big requests.
- */
-#define ReqLen(_pxReq, _client) \
- ((_pxReq->length ? \
-     (_client->swapped ? lswaps(_pxReq->length) : _pxReq->length) \
-  : ((_client->swapped ? \
-	lswapl(((CARD32*)_pxReq)[1]) : ((CARD32*)_pxReq)[1])-1) \
-  ) << 2)
-
-/* otherReqTypePtr CastxReq(xReq *req, otherReqTypePtr)
- * Cast the given request to one of type otherReqTypePtr to access
- * fields beyond the length field.
- */
-#define CastxReq(_pxReq, otherReqTypePtr) \
-    (_pxReq->length ? (otherReqTypePtr)_pxReq \
-		    : (otherReqTypePtr)(((CARD32*)_pxReq)+1))
-
 /* stuff for ReplyCallback */
 extern _X_EXPORT CallbackListPtr ReplyCallback;
 typedef struct {