unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
* [PATCH] spawn: avoid C++ keyword `try'
@ 2021-11-22 18:16 Eric Wong
  0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2021-11-22 18:16 UTC (permalink / raw)
  To: meta

This is future-proofing in case we build against Xapian directly
in the future, which would require a C++ compiler.
---
 lib/PublicInbox/Spawn.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/PublicInbox/Spawn.pm b/lib/PublicInbox/Spawn.pm
index 6ca1ca2a0be3..e0a51c2167e8 100644
--- a/lib/PublicInbox/Spawn.pm
+++ b/lib/PublicInbox/Spawn.pm
@@ -165,14 +165,14 @@ int pi_fork_exec(SV *redirref, SV *file, SV *cmdref, SV *envref, SV *rlimref,
 	return (int)pid;
 }
 
-static int sleep_wait(unsigned *try, int err)
+static int sleep_wait(unsigned *tries, int err)
 {
 	const struct timespec req = { 0, 100000000 }; /* 100ms */
 	switch (err) {
 	case ENOBUFS: case ENOMEM: case ETOOMANYREFS:
-		if (++*try < 50) {
+		if (++*tries < 50) {
 			fprintf(stderr, "sleeping on sendmsg: %s (#%u)\n",
-				strerror(err), *try);
+				strerror(err), *tries);
 			nanosleep(&req, NULL);
 			return 1;
 		}
@@ -199,7 +199,7 @@ SV *send_cmd4(PerlIO *s, SV *svfds, SV *data, int flags)
 	AV *fds = (AV *)SvRV(svfds);
 	I32 i, nfds = av_len(fds) + 1;
 	int *fdp;
-	unsigned try = 0;
+	unsigned tries = 0;
 
 	if (SvOK(data)) {
 		iov.iov_base = SvPV(data, dlen);
@@ -229,7 +229,7 @@ SV *send_cmd4(PerlIO *s, SV *svfds, SV *data, int flags)
 	}
 	do {
 		sent = sendmsg(PerlIO_fileno(s), &msg, flags);
-	} while (sent < 0 && sleep_wait(&try, errno));
+	} while (sent < 0 && sleep_wait(&tries, errno));
 	return sent >= 0 ? newSViv(sent) : &PL_sv_undef;
 }
 

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-11-22 18:16 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-22 18:16 [PATCH] spawn: avoid C++ keyword `try' Eric Wong

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).