From 410d2005f5a1f11e8204d9bc3432e0b145ae3161 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 30 Apr 2022 14:08:43 -0700 Subject: Fix spelling/wording issues Found by using: codespell --builtin clear,rare,usage,informal,code,names Signed-off-by: Alan Coopersmith --- README.md | 2 +- configure.ac | 2 +- include/X11/ICE/ICEconn.h | 2 +- include/X11/ICE/ICEmsg.h | 2 +- include/X11/ICE/ICEutil.h | 2 +- specs/ice.xml | 2 +- src/ICElibint.h | 2 +- src/connect.c | 6 +++--- src/iceauth.c | 4 ++-- src/process.c | 8 ++++---- src/protosetup.c | 2 +- src/shutdown.c | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 0d0e489..8cf692d 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Xorg mailing list: https://lists.x.org/mailman/listinfo/xorg -The master development code repository can be found at: +The primary development code repository can be found at: https://gitlab.freedesktop.org/xorg/lib/libICE diff --git a/configure.ac b/configure.ac index 1d22b52..9d89409 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ XORG_WITH_FOP XORG_WITH_XSLTPROC XORG_CHECK_SGML_DOCTOOLS(1.8) -# Obtain compiler/linker options for depedencies +# Obtain compiler/linker options for dependencies PKG_CHECK_MODULES(ICE, xproto xtrans) # Transport selection macro from xtrans.m4 diff --git a/include/X11/ICE/ICEconn.h b/include/X11/ICE/ICEconn.h index e5d493a..0189427 100644 --- a/include/X11/ICE/ICEconn.h +++ b/include/X11/ICE/ICEconn.h @@ -171,7 +171,7 @@ struct _IceConn { * Before we read a message, the major opcode of the message must be * mapped to our corresponding major opcode (the two clients can use * different opcodes for the same protocol). In order to save space, - * we keep track of the mininum and maximum major opcodes used by the + * we keep track of the minimum and maximum major opcodes used by the * other client. To get the information on how to process this message, * we do the following... * diff --git a/include/X11/ICE/ICEmsg.h b/include/X11/ICE/ICEmsg.h index 9884466..17e36a6 100644 --- a/include/X11/ICE/ICEmsg.h +++ b/include/X11/ICE/ICEmsg.h @@ -278,7 +278,7 @@ extern IcePaAuthStatus _IcePaMagicCookie1Proc ( /* * Read pad bytes (for 32 or 64 bit alignment). - * A maxium of 7 pad bytes can be specified. + * A maximum of 7 pad bytes can be specified. */ #define IceReadPad(_iceConn, _bytes) \ diff --git a/include/X11/ICE/ICEutil.h b/include/X11/ICE/ICEutil.h index dbf1490..92e8a43 100644 --- a/include/X11/ICE/ICEutil.h +++ b/include/X11/ICE/ICEutil.h @@ -68,7 +68,7 @@ typedef struct { */ #define IceAuthLockSuccess 0 /* lock succeeded */ -#define IceAuthLockError 1 /* lock unexpectely failed, check errno */ +#define IceAuthLockError 1 /* lock unexpectedly failed, check errno */ #define IceAuthLockTimeout 2 /* lock failed, timeouts expired */ diff --git a/specs/ice.xml b/specs/ice.xml index 44b7c79..3f897f6 100644 --- a/specs/ice.xml +++ b/specs/ice.xml @@ -94,7 +94,7 @@ allow them to share the same transport layer connection. Through some mechanism outside ICE, two parties make themselves known to each other and agree that they would like to communicate using an ICE -subprotocol. ICE assumes that this negotation includes some notion by which +subprotocol. ICE assumes that this negotiation includes some notion by which the parties will decide which is the originating party and which is the answering party. The negotiation will also need to provide the originating party with a name or address of the answering party. Examples diff --git a/src/ICElibint.h b/src/ICElibint.h index 9a5a41a..b64795f 100644 --- a/src/ICElibint.h +++ b/src/ICElibint.h @@ -102,7 +102,7 @@ Author: Ralph Mor, X Consortium /* - * Maxium number of ICE authentication methods allowed, and maxiumum + * Maximum number of ICE authentication methods allowed, and maximum * number of authentication data entries allowed to be set in the * IceSetPaAuthData function. * diff --git a/src/connect.c b/src/connect.c index 821b727..b39ca3c 100644 --- a/src/connect.c +++ b/src/connect.c @@ -87,7 +87,7 @@ IceOpenConnection ( * * If 'majorOpcodeCheck' is non-zero, it will contain a protocol major * opcode that we should make sure is not already active on the ICE - * connection. Some clients will want two seperate connections for the + * connection. Some clients will want two separate connections for the * same protocol to the same destination client. */ @@ -282,7 +282,7 @@ IceOpenConnection ( { _IceFreeConnection (iceConn); if (errorStringRet && errorLength > 0) { - strncpy (errorStringRet, "IO error occured opening connection", + strncpy (errorStringRet, "IO error occurred opening connection", errorLength); errorStringRet[errorLength - 1] = '\0'; } @@ -386,7 +386,7 @@ IceOpenConnection ( if (ioErrorOccured) { if (errorStringRet && errorLength > 0) { - strncpy (errorStringRet, "IO error occured opening connection", + strncpy (errorStringRet, "IO error occurred opening connection", errorLength); errorStringRet[errorLength - 1] = '\0'; } diff --git a/src/iceauth.c b/src/iceauth.c index 147efc7..807e5d7 100644 --- a/src/iceauth.c +++ b/src/iceauth.c @@ -151,7 +151,7 @@ _IcePoMagicCookie1Proc ( { /* * This is the first time we're being called. Search the - * authentication data for the first occurence of + * authentication data for the first occurrence of * MIT-MAGIC-COOKIE-1 that matches iceConn->connection_string. */ @@ -229,7 +229,7 @@ _IcePaMagicCookie1Proc ( else { /* - * Search the authentication data for the first occurence of + * Search the authentication data for the first occurrence of * MIT-MAGIC-COOKIE-1 that matches iceConn->connection_string. */ diff --git a/src/process.c b/src/process.c index 89ebbea..3cfc288 100644 --- a/src/process.c +++ b/src/process.c @@ -148,7 +148,7 @@ asprintf(char ** ret, const char *format, ...) * for a reply, and while calling IceProcessMessages, a callback can be * invoked which will wait for another reply). We take advantage of the * fact that for a given protocol, we are guaranteed that messages are - * processed in the order we sent them. So, everytime we have a new + * processed in the order we sent them. So, every time we have a new * replyWait, we add it to the END of the 'saved_reply_waits' list. When * we read a message and want to see if it matches a replyWait, we use the * FIRST replyWait in the list with the major opcode of the message. If the @@ -160,7 +160,7 @@ asprintf(char ** ret, const char *format, ...) * The return value of IceProcessMessages is one of the following: * * IceProcessMessagesSuccess - the message was processed successfully. - * IceProcessMessagesIOError - an IO error occured. The caller should + * IceProcessMessagesIOError - an IO error occurred. The caller should * invoked IceCloseConnection. * IceProcessMessagesConnectionClosed - the connection was closed as a * result of shutdown negotiation. @@ -207,7 +207,7 @@ IceProcessMessages ( if (!iceConn->io_ok) { /* - * An unexpected IO error occured. The caller of IceProcessMessages + * An unexpected IO error occurred. The caller of IceProcessMessages * should call IceCloseConnection which will cause the watch procedures * to be invoked and the ICE connection to be freed. */ @@ -1869,7 +1869,7 @@ ProcessProtocolSetup ( { /* * If we sent a WantToClose message, but just got a ProtocolSetup, - * we must cancel our WantToClose. It is the responsiblity of the + * we must cancel our WantToClose. It is the responsibility of the * other client to send a WantToClose later on. */ diff --git a/src/protosetup.c b/src/protosetup.c index 8eaa9d6..ad9ba88 100644 --- a/src/protosetup.c +++ b/src/protosetup.c @@ -206,7 +206,7 @@ IceProtocolSetup ( { if (errorStringRet && errorLength > 0) { strncpy (errorStringRet, - "IO error occured doing Protocol Setup on connection", + "IO error occurred doing Protocol Setup on connection", errorLength); errorStringRet[errorLength - 1] = '\0'; } diff --git a/src/shutdown.c b/src/shutdown.c index f27c876..5e63266 100644 --- a/src/shutdown.c +++ b/src/shutdown.c @@ -136,7 +136,7 @@ IceCloseConnection ( IO free- dispatch protocol shutdown error asap bit level refcount negotiation ACTION - occured set reached 0 reached 0 + occurred set reached 0 reached 0 0 0 0 0 0 N 0 0 0 0 1 N -- cgit v1.2.1