diff options
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/execute.c | 5 | ||||
| -rw-r--r-- | src/interfaces/ecpg/pgtypeslib/datetime.c | 2 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 4 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-exec.c | 2 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-misc.c | 2 | ||||
| -rw-r--r-- | src/interfaces/libpq/libpq-fe.h | 8 | ||||
| -rw-r--r-- | src/interfaces/libpq/libpq-int.h | 5 |
7 files changed, 15 insertions, 13 deletions
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c index 4e2016c7aea..de5c43a4602 100644 --- a/src/interfaces/ecpg/ecpglib/execute.c +++ b/src/interfaces/ecpg/ecpglib/execute.c @@ -2062,8 +2062,9 @@ ecpg_do_prologue(int lineno, const int compat, const int force_indicator, /*------ * create a list of variables * - * The variables are listed with input variables preceding outputvariables - * The end of each group is marked by an end marker. per variable we list: + * The variables are listed with input variables preceding output + * variables. The end of each group is marked by an end marker. + * Per variable we list: * * type - as defined in ecpgtype.h * value - where to store the data diff --git a/src/interfaces/ecpg/pgtypeslib/datetime.c b/src/interfaces/ecpg/pgtypeslib/datetime.c index 53fcd2157fa..9ee460b9a1f 100644 --- a/src/interfaces/ecpg/pgtypeslib/datetime.c +++ b/src/interfaces/ecpg/pgtypeslib/datetime.c @@ -623,7 +623,7 @@ PGTYPESdate_defmt_asc(date * d, const char *fmt, const char *str) /* * evil[tm] hack: if we read the pgtypes_date_months and haven't - * found a match, reset list to point to pgtypes_date_months_short + * found a match, reset list to point to months (abbreviations) * and reset the counter variable i */ if (list == pgtypes_date_months) diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index a329ebbf93a..d262b57021d 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -3732,8 +3732,8 @@ internal_ping(PGconn *conn) * PQPING_NO_RESPONSE. This result could be somewhat misleading for a * pre-7.4 server, since it won't send back a SQLSTATE, but those are long * out of support. Another corner case where the server could return a - * failure without a SQLSTATE is fork failure, but NO_RESPONSE isn't - * totally unreasonable for that anyway. We expect that every other + * failure without a SQLSTATE is fork failure, but PQPING_NO_RESPONSE + * isn't totally unreasonable for that anyway. We expect that every other * failure case in a modern server will produce a report with a SQLSTATE. * * NOTE: whenever we get around to making libpq generate SQLSTATEs for diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c index 48d4ebdd96c..b3c59a09923 100644 --- a/src/interfaces/libpq/fe-exec.c +++ b/src/interfaces/libpq/fe-exec.c @@ -3291,7 +3291,7 @@ PQflush(PGconn *conn) * PQfreemem - safely frees memory allocated * * Needed mostly by Win32, unless multithreaded DLL (/MD in VC6) - * Used for freeing memory from PQescapeByte()a/PQunescapeBytea() + * Used for freeing memory from PQescapeBytea()/PQunescapeBytea() */ void PQfreemem(void *ptr) diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c index 2d44845ccb2..18fec4a1731 100644 --- a/src/interfaces/libpq/fe-misc.c +++ b/src/interfaces/libpq/fe-misc.c @@ -7,7 +7,7 @@ * miscellaneous useful functions * * The communication routines here are analogous to the ones in - * backend/libpq/pqcomm.c and backend/libpq/pqcomprim.c, but operate + * backend/libpq/pqcomm.c and backend/libpq/pqformat.c, but operate * in the considerably different environment of the frontend libpq. * In particular, we work with a bare nonblock-mode socket, rather than * a stdio stream, so that we can avoid unwanted blocking of the application. diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index 26198fc1de4..3151975564a 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -565,10 +565,10 @@ extern void PQdisplayTuples(const PGresult *res, extern void PQprintTuples(const PGresult *res, FILE *fout, /* output stream */ - int printAttName, /* print attribute names */ - int terseOutput, /* delimiter bars */ - int width); /* width of column, if 0, use variable - * width */ + int PrintAttNames, /* print attribute names */ + int TerseOutput, /* delimiter bars */ + int colWidth); /* width of column, if 0, use + * variable width */ /* === in fe-lobj.c === */ diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h index fcf2bc2cab3..d37bb3ce404 100644 --- a/src/interfaces/libpq/libpq-int.h +++ b/src/interfaces/libpq/libpq-int.h @@ -169,7 +169,7 @@ struct pg_result int ntups; int numAttributes; PGresAttDesc *attDescs; - PGresAttValue **tuples; /* each PGresTuple is an array of + PGresAttValue **tuples; /* each PGresult tuple is an array of * PGresAttValue's */ int tupArrSize; /* allocated size of tuples array */ int numParameters; @@ -232,7 +232,8 @@ typedef enum PGQUERY_DESCRIBE /* Describe Statement or Portal */ } PGQueryClass; -/* PGSetenvStatusType defines the state of the PQSetenv state machine */ +/* PGSetenvStatusType defines the state of the pqSetenv state machine */ + /* (this is used only for 2.0-protocol connections) */ typedef enum { |