popt/Fix-multiple-typos-in-comments.patch
zhangxingrong 12035d81a4 add some upstream patchs
(cherry picked from commit 22ce5d5a6b1a1b65cfcff432fce783673a88ba5f)
2024-08-21 15:37:25 +08:00

64 lines
2.4 KiB
Diff

From 1bd2a0e35478be573cb8848b0f63ef98136a3ad7 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Tue, 3 Jan 2023 00:31:31 +0100
Subject: [PATCH] Fix multiple typos in comments
---
src/popt.c | 8 ++++----
src/system.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/popt.c b/src/popt.c
index 7a555bb4..4759254f 100644
--- a/src/popt.c
+++ b/src/popt.c
@@ -142,7 +142,7 @@ static void invokeCallbacksOPTION(poptContext con,
{ const void *cbData = (cbopt->descrip ? cbopt->descrip : myData);
cbarg.cb(con, POPT_CALLBACK_REASON_OPTION,
myOpt, con->os->nextArg, cbData);
- /* Terminate (unless explcitly continuing). */
+ /* Terminate (unless explicitly continuing). */
if (!CBF_ISSET(cbopt, CONTINUE))
return;
}
@@ -305,7 +305,7 @@ longOptionStrcmp(const struct poptOption * opt,
const char * optLongName = opt->longName;
int rc;
- if (optLongName == NULL || longName == NULL) /* XXX can't heppen */
+ if (optLongName == NULL || longName == NULL) /* XXX can't happen */
return 0;
if (F_ISSET(opt, TOGGLE)) {
@@ -576,7 +576,7 @@ findOption(const struct poptOption * opt,
opt2 = findOption(arg.opt, longName, longNameLen, shortName, callback,
callbackData, argInfo);
if (opt2 == NULL) continue;
- /* Sub-table data will be inheirited if no data yet. */
+ /* Sub-table data will be inherited if no data yet. */
if (callback && *callback
&& callbackData && *callbackData == NULL)
*callbackData = opt->descrip;
@@ -1060,7 +1060,7 @@ static unsigned int poptArgInfo(poptContext con, const struct poptOption * opt)
/* XXX almost good enough but consider --[no]nofoo corner cases. */
if (longName[0] != opt->longName[0] || longName[1] != opt->longName[1])
{
- if (!LF_ISSET(XOR)) { /* XXX dont toggle with XOR */
+ if (!LF_ISSET(XOR)) { /* XXX don't toggle with XOR */
/* Toggle POPT_BIT_SET <=> POPT_BIT_CLR. */
if (LF_ISSET(LOGICALOPS))
argInfo ^= (POPT_ARGFLAG_OR|POPT_ARGFLAG_AND);
diff --git a/src/system.h b/src/system.h
index 5faeabe7..512d685b 100644
--- a/src/system.h
+++ b/src/system.h
@@ -8,7 +8,7 @@
#include <ctype.h>
-/* XXX isspace(3) has i18n encoding signednesss issues on Solaris. */
+/* XXX isspace(3) has i18n encoding signedness issues on Solaris. */
#define _isspaceptr(_chp) isspace((int)(*(unsigned const char *)(_chp)))
#ifdef HAVE_MCHECK_H