From a33d23c6ff774a9575df7c51bc8724a6a7f2ec63 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 21 Jun 2011 19:37:28 -0500 Subject: [PATCH] Correct spelling of 'immediate' sed -i -e 's/immidiate/immediate/g' src/*.c include/*.h Signed-off-by: Dan McGee --- include/pktbuf.h | 6 +++--- src/admin.c | 2 +- src/client.c | 2 +- src/objects.c | 2 +- src/pktbuf.c | 4 ++-- src/proto.c | 6 +++--- src/sbuf.c | 2 +- src/varcache.c | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/pktbuf.h b/include/pktbuf.h index 465c6d7..24d773a 100644 --- a/include/pktbuf.h +++ b/include/pktbuf.h @@ -50,7 +50,7 @@ struct PktBuf *pktbuf_temp(void); /* * sending */ -bool pktbuf_send_immidiate(PktBuf *buf, PgSocket *sk) _MUSTCHECK; +bool pktbuf_send_immediate(PktBuf *buf, PgSocket *sk) _MUSTCHECK; bool pktbuf_send_queued(PktBuf *buf, PgSocket *sk) _MUSTCHECK; /* @@ -116,14 +116,14 @@ void pktbuf_write_DataRow(PktBuf *buf, const char *tupdesc, ...); } while (0) /* - * Shortcuts for immidiate send of one packet. + * Shortcuts for immediate send of one packet. */ #define SEND_wrap(buflen, pktfn, res, sk, args...) do { \ uint8_t _data[buflen]; PktBuf _buf; \ pktbuf_static(&_buf, _data, sizeof(_data)); \ pktfn(&_buf, ## args); \ - res = pktbuf_send_immidiate(&_buf, sk); \ + res = pktbuf_send_immediate(&_buf, sk); \ } while (0) #define SEND_RowDescription(res, sk, args...) \ diff --git a/src/admin.c b/src/admin.c index 160d337..a5cc5c6 100644 --- a/src/admin.c +++ b/src/admin.c @@ -141,7 +141,7 @@ bool admin_ready(PgSocket *admin, const char *desc) pktbuf_static(&buf, tmp, sizeof(tmp)); pktbuf_write_CommandComplete(&buf, desc); pktbuf_write_ReadyForQuery(&buf); - return pktbuf_send_immidiate(&buf, admin); + return pktbuf_send_immediate(&buf, admin); } /* diff --git a/src/client.c b/src/client.c index b05fc51..305c8f2 100644 --- a/src/client.c +++ b/src/client.c @@ -302,7 +302,7 @@ static bool handle_client_work(PgSocket *client, PktHdr *pkt) } case 'F': /* FunctionCall */ - /* request immidiate response from server */ + /* request immediate response from server */ case 'H': /* Flush */ case 'S': /* Sync */ diff --git a/src/objects.c b/src/objects.c index 15e6410..9e7e2a4 100644 --- a/src/objects.c +++ b/src/objects.c @@ -669,7 +669,7 @@ bool release_server(PgSocket *server) fatal("bad server state in release_server (%d)", server->state); } - /* enforce lifetime immidiately on release */ + /* enforce lifetime immediately on release */ if (server->state != SV_LOGIN && life_over(server)) { disconnect_server(server, true, "server_lifetime"); pool->last_lifetime_disconnect = get_cached_time(); diff --git a/src/pktbuf.c b/src/pktbuf.c index 3410c21..6be1d85 100644 --- a/src/pktbuf.c +++ b/src/pktbuf.c @@ -85,7 +85,7 @@ struct PktBuf *pktbuf_temp(void) return temp_pktbuf; } -bool pktbuf_send_immidiate(PktBuf *buf, PgSocket *sk) +bool pktbuf_send_immediate(PktBuf *buf, PgSocket *sk) { int fd = sbuf_socket(&sk->sbuf); uint8_t *pos = buf->buf + buf->send_pos; @@ -96,7 +96,7 @@ bool pktbuf_send_immidiate(PktBuf *buf, PgSocket *sk) return false; res = safe_send(fd, pos, amount, 0); if (res < 0) { - log_debug("pktbuf_send_immidiate: %s", strerror(errno)); + log_debug("pktbuf_send_immediate: %s", strerror(errno)); } return res == amount; } diff --git a/src/proto.c b/src/proto.c index 352e08e..e754a29 100644 --- a/src/proto.c +++ b/src/proto.c @@ -124,7 +124,7 @@ bool send_pooler_error(PgSocket *client, bool send_ready, const char *msg) 'S', "ERROR", 'C', "08P01", 'M', msg, 0); if (send_ready) pktbuf_write_ReadyForQuery(&buf); - return pktbuf_send_immidiate(&buf, client); + return pktbuf_send_immediate(&buf, client); } /* @@ -231,7 +231,7 @@ bool welcome_client(PgSocket *client) } /* send all together */ - res = pktbuf_send_immidiate(msg, client); + res = pktbuf_send_immediate(msg, client); if (!res) { disconnect_client(client, true, "failed to send welcome message"); return false; @@ -347,7 +347,7 @@ bool send_startup_packet(PgSocket *server) pktbuf_write_StartupMessage(pkt, username, db->startup_params->buf, db->startup_params->write_pos); - return pktbuf_send_immidiate(pkt, server); + return pktbuf_send_immediate(pkt, server); } int scan_text_result(struct MBuf *pkt, const char *tupdesc, ...) diff --git a/src/sbuf.c b/src/sbuf.c index d6e4744..fe657f4 100644 --- a/src/sbuf.c +++ b/src/sbuf.c @@ -136,7 +136,7 @@ bool sbuf_connect(SBuf *sbuf, const struct sockaddr *sa, int sa_len, int timeout /* launch connection */ res = safe_connect(sock, sa, sa_len); if (res == 0) { - /* unix socket gives connection immidiately */ + /* unix socket gives connection immediately */ sbuf_connect_cb(sock, EV_WRITE, sbuf); return true; } else if (errno == EINPROGRESS) { diff --git a/src/varcache.c b/src/varcache.c index 37582c6..ea2fc29 100644 --- a/src/varcache.c +++ b/src/varcache.c @@ -140,7 +140,7 @@ bool varcache_apply(PgSocket *server, PgSocket *client, bool *changes_p) pktbuf_finish_packet(pkt); slog_debug(server, "varcache_apply: %s", pkt->buf + sql_ofs); - return pktbuf_send_immidiate(pkt, server); + return pktbuf_send_immediate(pkt, server); } void varcache_fill_unset(VarCache *src, PgSocket *dst) -- 2.40.0