Standardize spelling of "nonblocking"

petere · petere · commit acd5803053eb · 2013-04-18T23:35:19.000-04:00
Only adjusted the user-exposed messages and documentation,  not all
source code comments.
diff --git a/doc/src/sgml/indexam.sgml b/doc/src/sgml/indexam.sgml
@@ -746,7 +746,7 @@ amrestrpos (IndexScanDesc scan);
   <para>
    When the <structfield>ampredlocks</> flag is not set, any scan using that
    index access method within a serializable transaction will acquire a
-   non-blocking predicate lock on the full index.  This will generate a
+   nonblocking predicate lock on the full index.  This will generate a
    read-write conflict with the insert of any tuple into that index by a
    concurrent serializable transaction.  If certain patterns of read-write
    conflicts are detected among a set of concurrent serializable
diff --git a/doc/src/sgml/mvcc.sgml b/doc/src/sgml/mvcc.sgml
@@ -1366,7 +1366,7 @@ SELECT pg_advisory_lock(q.id) FROM
    <para>
     As mentioned in <xref linkend="xact-serializable">, Serializable
     transactions are just Repeatable Read transactions which add
-    non-blocking monitoring for dangerous patterns of read/write conflicts.
+    nonblocking monitoring for dangerous patterns of read/write conflicts.
     When a pattern is detected which could cause a cycle in the apparent
     order of execution, one of the transactions involved is rolled back to
     break the cycle.
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
@@ -808,7 +808,7 @@ pq_set_nonblocking(bool nonblocking)
 	{
 		if (!pg_set_noblock(MyProcPort->sock))
 			ereport(COMMERROR,
-				  (errmsg("could not set socket to non-blocking mode: %m")));
+				  (errmsg("could not set socket to nonblocking mode: %m")));
 	}
 	else
 	{
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -6261,7 +6261,7 @@ InitPostmasterDeathWatchHandle(void)
 	if (fcntl(postmaster_alive_fds[POSTMASTER_FD_WATCH], F_SETFL, O_NONBLOCK))
 		ereport(FATAL,
 				(errcode_for_socket_access(),
-				 errmsg_internal("could not set postmaster death monitoring pipe to non-blocking mode: %m")));
+				 errmsg_internal("could not set postmaster death monitoring pipe to nonblocking mode: %m")));
 #else
 
 	/*
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
@@ -285,7 +285,7 @@ pg_krb5_sendauth(PGconn *conn)
 		char		sebuf[256];
 
 		printfPQExpBuffer(&conn->errorMessage,
-		libpq_gettext("could not restore non-blocking mode on socket: %s\n"),
+		libpq_gettext("could not restore nonblocking mode on socket: %s\n"),
 						  pqStrerror(errno, sebuf, sizeof(sebuf)));
 		ret = STATUS_ERROR;
 	}
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -1666,7 +1666,7 @@ PQconnectPoll(PGconn *conn)
 					if (!pg_set_noblock(conn->sock))
 					{
 						appendPQExpBuffer(&conn->errorMessage,
-										  libpq_gettext("could not set socket to non-blocking mode: %s\n"),
+										  libpq_gettext("could not set socket to nonblocking mode: %s\n"),
 							SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
 						pqDropConnection(conn);
 						conn->addr_cur = addr_cur->ai_next;

Original file line number	Diff line number	Diff line change
`@@ -808,7 +808,7 @@ pq_set_nonblocking(bool nonblocking)`
`808`	`808`	`{`
`809`	`809`	`if (!pg_set_noblock(MyProcPort->sock))`
`810`	`810`	`ereport(COMMERROR,`
`811`		`- (errmsg("could not set socket to non-blocking mode: %m")));`
	`811`	`+ (errmsg("could not set socket to nonblocking mode: %m")));`
`812`	`812`	`}`
`813`	`813`	`else`
`814`	`814`	`{`
Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ pg_krb5_sendauth(PGconn *conn)`
`285`	`285`	`char sebuf[256];`
`286`	`286`
`287`	`287`	`printfPQExpBuffer(&conn->errorMessage,`
`288`		`- libpq_gettext("could not restore non-blocking mode on socket: %s\n"),`
	`288`	`+ libpq_gettext("could not restore nonblocking mode on socket: %s\n"),`
`289`	`289`	`pqStrerror(errno, sebuf, sizeof(sebuf)));`
`290`	`290`	`ret = STATUS_ERROR;`
`291`	`291`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1666,7 +1666,7 @@ PQconnectPoll(PGconn *conn)`
`1666`	`1666`	`if (!pg_set_noblock(conn->sock))`
`1667`	`1667`	`{`
`1668`	`1668`	`appendPQExpBuffer(&conn->errorMessage,`
`1669`		`- libpq_gettext("could not set socket to non-blocking mode: %s\n"),`
	`1669`	`+ libpq_gettext("could not set socket to nonblocking mode: %s\n"),`
`1670`	`1670`	`SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));`
`1671`	`1671`	`pqDropConnection(conn);`
`1672`	`1672`	`conn->addr_cur = addr_cur->ai_next;`