]> granicus.if.org Git - pgbouncer/commitdiff
Correct spelling of 'immediate'
authorDan McGee <dan@archlinux.org>
Wed, 22 Jun 2011 00:37:28 +0000 (19:37 -0500)
committerMarko Kreen <markokr@gmail.com>
Fri, 24 Jun 2011 13:10:54 +0000 (16:10 +0300)
sed -i -e 's/immidiate/immediate/g' src/*.c include/*.h

Signed-off-by: Dan McGee <dan@archlinux.org>
include/pktbuf.h
src/admin.c
src/client.c
src/objects.c
src/pktbuf.c
src/proto.c
src/sbuf.c
src/varcache.c

index 465c6d719140a0582e331cc84644682e242bb35e..24d773a8c2920d51eb44017353a1dea8a2924d39 100644 (file)
@@ -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...) \
index 160d33727065f103fda2fbf8a59f8e9999cc50a2..a5cc5c6a8195edbf99fa1a4f42c12934327d4809 100644 (file)
@@ -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);
 }
 
 /*
index b05fc51fd81417812070ef128ceac02025c8536d..305c8f24ced4a3ef2c034abb4e02b9cb6c369572 100644 (file)
@@ -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 */
 
index 15e6410c42d3ff5b25a1643dacc5d021f69b194e..9e7e2a45733f89f2ecfc91636fbc1b6be43a479e 100644 (file)
@@ -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();
index 3410c216dca2836b80db2d4bc866c6485f41705e..6be1d855c5b1a6dc018b8fdf7394e4e9011decc9 100644 (file)
@@ -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;
 }
index 352e08e08c73435bdd508c89342028c17035a8d0..e754a2902f2061a1e5fe1fbb152ed36fd43ee58e 100644 (file)
@@ -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, ...)
index d6e474481ecbdd75eda72913c157dcc1754829f2..fe657f4a204a95a13e51f2d0b5a7856a1a1aaf39 100644 (file)
@@ -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) {
index 37582c640e42fcb3916c41c9ca467d4cbe0b4b69..ea2fc29c41d2ed97025660384897d24cf0f1f37e 100644 (file)
@@ -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)