[PATCH libX11 1/2] Indention fixes around recent dpy->in_ifevent changes

Ulrich Sibiller uli42 at gmx.de
Wed Nov 30 22:42:02 UTC 2022


Resent due to gmail mangling tabs.. Seems impossible nowadays to send a plaintext mail unmodifed using gmail's web interface...


From 35072d172d0bfecb24fdd8437ecdcd0e391e1f14 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42 at gmx.de>
Date: Wed, 30 Nov 2022 22:18:42 +0100
Subject: [PATCH libX11 1/2] Indention fixes around recent dpy->in_ifevent
 changes

Use the same indention as the surrounding code.

Signed-off-by: Ulrich Sibiller <uli42 at gmx.de>
---
 src/ChkIfEv.c  |  6 +++---
 src/IfEvent.c  |  6 +++---
 src/OpenDis.c  |  2 +-
 src/PeekIfEv.c |  4 ++--
 src/locking.c  | 16 ++++++++--------
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/ChkIfEv.c b/src/ChkIfEv.c
index 1bbcba5b..eba36941 100644
--- a/src/ChkIfEv.c
+++ b/src/ChkIfEv.c
@@ -49,8 +49,8 @@ Bool XCheckIfEvent (
 	unsigned long qe_serial = 0;
 	int n;			/* time through count */

-        dpy->in_ifevent++;
-        LockDisplay(dpy);
+	dpy->in_ifevent++;
+	LockDisplay(dpy);
 	prev = NULL;
 	for (n = 3; --n >= 0;) {
 	    for (qelt = prev ? prev->next : dpy->head;
@@ -80,7 +80,7 @@ Bool XCheckIfEvent (
 		/* another thread has snatched this event */
 		prev = NULL;
 	}
-        dpy->in_ifevent--;
+	dpy->in_ifevent--;
 	UnlockDisplay(dpy);
 	return False;
 }
diff --git a/src/IfEvent.c b/src/IfEvent.c
index 593e7acf..54c37f00 100644
--- a/src/IfEvent.c
+++ b/src/IfEvent.c
@@ -48,8 +48,8 @@ XIfEvent (
 	register _XQEvent *qelt, *prev;
 	unsigned long qe_serial = 0;

-        dpy->in_ifevent++;
-        LockDisplay(dpy);
+	dpy->in_ifevent++;
+	LockDisplay(dpy);
 	prev = NULL;
 	while (1) {
 	    for (qelt = prev ? prev->next : dpy->head;
@@ -60,7 +60,7 @@ XIfEvent (
 		    *event = qelt->event;
 		    _XDeq(dpy, prev, qelt);
 		    _XStoreEventCookie(dpy, event);
-                    dpy->in_ifevent--;
+		    dpy->in_ifevent--;
 		    UnlockDisplay(dpy);
 		    return 0;
 		}
diff --git a/src/OpenDis.c b/src/OpenDis.c
index 17dc4cb2..7c8d4e1a 100644
--- a/src/OpenDis.c
+++ b/src/OpenDis.c
@@ -189,7 +189,7 @@ XOpenDisplay (
 	dpy->xcmisc_opcode	= 0;
 	dpy->xkb_info		= NULL;
 	dpy->exit_handler_data	= NULL;
-        dpy->in_ifevent         = 0;
+	dpy->in_ifevent         = 0;

 /*
  * Setup other information in this display structure.
diff --git a/src/PeekIfEv.c b/src/PeekIfEv.c
index 7e09c00b..68c028b7 100644
--- a/src/PeekIfEv.c
+++ b/src/PeekIfEv.c
@@ -49,7 +49,7 @@ XPeekIfEvent (
 	register _XQEvent *prev, *qelt;
 	unsigned long qe_serial = 0;

-        dpy->in_ifevent++;
+	dpy->in_ifevent++;
 	LockDisplay(dpy);
 	prev = NULL;
 	while (1) {
@@ -64,7 +64,7 @@ XPeekIfEvent (
 			_XStoreEventCookie(dpy, &copy);
 			*event = copy;
 		    }
-                    dpy->in_ifevent--;
+		    dpy->in_ifevent--;
 		    UnlockDisplay(dpy);
 		    return 0;
 		}
diff --git a/src/locking.c b/src/locking.c
index 690b2bf6..c550603e 100644
--- a/src/locking.c
+++ b/src/locking.c
@@ -486,12 +486,12 @@ static void _XIfEventUnlockDisplay(
     )
 {
     if (dpy->in_ifevent == 0) {
-        dpy->lock_fns->lock_display = _XLockDisplay;
-        dpy->lock_fns->unlock_display = _XUnlockDisplay;
-        dpy->lock->internal_lock_display = _XInternalLockDisplay;
-        UnlockDisplay(dpy);
+	dpy->lock_fns->lock_display = _XLockDisplay;
+	dpy->lock_fns->unlock_display = _XUnlockDisplay;
+	dpy->lock->internal_lock_display = _XInternalLockDisplay;
+	UnlockDisplay(dpy);
     } else
-        return;
+	return;
 }

 static void _XLockDisplay(
@@ -521,9 +521,9 @@ static void _XLockDisplay(
     _XIDHandler(dpy);
     _XSeqSyncFunction(dpy);
     if (dpy->in_ifevent) {
-        dpy->lock_fns->lock_display = _XIfEventLockDisplay;
-        dpy->lock_fns->unlock_display = _XIfEventUnlockDisplay;
-        dpy->lock->internal_lock_display = _XIfEventInternalLockDisplay;
+	dpy->lock_fns->lock_display = _XIfEventLockDisplay;
+	dpy->lock_fns->unlock_display = _XIfEventUnlockDisplay;
+	dpy->lock->internal_lock_display = _XIfEventInternalLockDisplay;
     }
 }

--
2.20.1




More information about the xorg-devel mailing list