Commit 92dff341 authored by Tom Lane's avatar Tom Lane

Formatting cleanup in ecpglib/prepare.c.

Looking at this code made my head hurt.  Format the comments more
like the way it's done elsewhere, break a few overly long lines.
No actual code changes in this commit.
parent 28d750c0
...@@ -64,9 +64,9 @@ replace_variables(char **text, int lineno) ...@@ -64,9 +64,9 @@ replace_variables(char **text, int lineno)
ptr += 2; /* skip '::' */ ptr += 2; /* skip '::' */
else else
{ {
/* a rough guess of the size we need: */
int buffersize = sizeof(int) * CHAR_BIT * 10 / 3;
int len; int len;
int buffersize = sizeof(int) * CHAR_BIT * 10 / 3; /* a rough guess of the
* size we need */
char *buffer, char *buffer,
*newcopy; *newcopy;
...@@ -75,7 +75,8 @@ replace_variables(char **text, int lineno) ...@@ -75,7 +75,8 @@ replace_variables(char **text, int lineno)
snprintf(buffer, buffersize, "$%d", counter++); snprintf(buffer, buffersize, "$%d", counter++);
for (len = 1; (*text)[ptr + len] && isvarchar((*text)[ptr + len]); len++); for (len = 1; (*text)[ptr + len] && isvarchar((*text)[ptr + len]); len++)
/* skip */ ;
if (!(newcopy = (char *) ecpg_alloc(strlen(*text) -len + strlen(buffer) + 1, lineno))) if (!(newcopy = (char *) ecpg_alloc(strlen(*text) -len + strlen(buffer) + 1, lineno)))
{ {
ecpg_free(buffer); ecpg_free(buffer);
...@@ -158,13 +159,15 @@ prepare_common(int lineno, struct connection *con, const char *name, const char ...@@ -158,13 +159,15 @@ prepare_common(int lineno, struct connection *con, const char *name, const char
/* handle the EXEC SQL PREPARE statement */ /* handle the EXEC SQL PREPARE statement */
/* questionmarks is not needed but remains in there for the time being to not change the API */ /* questionmarks is not needed but remains in there for the time being to not change the API */
bool bool
ECPGprepare(int lineno, const char *connection_name, const bool questionmarks, const char *name, const char *variable) ECPGprepare(int lineno, const char *connection_name, const bool questionmarks,
const char *name, const char *variable)
{ {
struct connection *con; struct connection *con;
struct prepared_statement *this, struct prepared_statement *this,
*prev; *prev;
(void) questionmarks; /* quiet the compiler */ (void) questionmarks; /* quiet the compiler */
con = ecpg_get_connection(connection_name); con = ecpg_get_connection(connection_name);
if (!ecpg_init(con, connection_name, lineno)) if (!ecpg_init(con, connection_name, lineno))
...@@ -185,7 +188,9 @@ ecpg_find_prepared_statement(const char *name, ...@@ -185,7 +188,9 @@ ecpg_find_prepared_statement(const char *name,
struct prepared_statement *this, struct prepared_statement *this,
*prev; *prev;
for (this = con->prep_stmts, prev = NULL; this != NULL; prev = this, this = this->next) for (this = con->prep_stmts, prev = NULL;
this != NULL;
prev = this, this = this->next)
{ {
if (strcmp(this->name, name) == 0) if (strcmp(this->name, name) == 0)
{ {
...@@ -198,7 +203,8 @@ ecpg_find_prepared_statement(const char *name, ...@@ -198,7 +203,8 @@ ecpg_find_prepared_statement(const char *name,
} }
static bool static bool
deallocate_one(int lineno, enum COMPAT_MODE c, struct connection *con, struct prepared_statement *prev, struct prepared_statement *this) deallocate_one(int lineno, enum COMPAT_MODE c, struct connection *con,
struct prepared_statement *prev, struct prepared_statement *this)
{ {
bool r = false; bool r = false;
...@@ -217,7 +223,9 @@ deallocate_one(int lineno, enum COMPAT_MODE c, struct connection *con, struct pr ...@@ -217,7 +223,9 @@ deallocate_one(int lineno, enum COMPAT_MODE c, struct connection *con, struct pr
sprintf(text, "deallocate \"%s\"", this->name); sprintf(text, "deallocate \"%s\"", this->name);
query = PQexec(this->stmt->connection->connection, text); query = PQexec(this->stmt->connection->connection, text);
ecpg_free(text); ecpg_free(text);
if (ecpg_check_PQresult(query, lineno, this->stmt->connection->connection, this->stmt->compat)) if (ecpg_check_PQresult(query, lineno,
this->stmt->connection->connection,
this->stmt->compat))
{ {
PQclear(query); PQclear(query);
r = true; r = true;
...@@ -288,7 +296,8 @@ ecpg_deallocate_all_conn(int lineno, enum COMPAT_MODE c, struct connection *con) ...@@ -288,7 +296,8 @@ ecpg_deallocate_all_conn(int lineno, enum COMPAT_MODE c, struct connection *con)
bool bool
ECPGdeallocate_all(int lineno, int compat, const char *connection_name) ECPGdeallocate_all(int lineno, int compat, const char *connection_name)
{ {
return ecpg_deallocate_all_conn(lineno, compat, ecpg_get_connection(connection_name)); return ecpg_deallocate_all_conn(lineno, compat,
ecpg_get_connection(connection_name));
} }
char * char *
...@@ -353,10 +362,10 @@ SearchStmtCache(const char *ecpgQuery) ...@@ -353,10 +362,10 @@ SearchStmtCache(const char *ecpgQuery)
int entNo, int entNo,
entIx; entIx;
/* hash the statement */ /* hash the statement */
entNo = HashStmt(ecpgQuery); entNo = HashStmt(ecpgQuery);
/* search the cache */ /* search the cache */
for (entIx = 0; entIx < stmtCacheEntPerBucket; ++entIx) for (entIx = 0; entIx < stmtCacheEntPerBucket; ++entIx)
{ {
if (stmtCacheEntries[entNo].stmtID[0]) /* check if entry is in use */ if (stmtCacheEntries[entNo].stmtID[0]) /* check if entry is in use */
...@@ -367,7 +376,7 @@ SearchStmtCache(const char *ecpgQuery) ...@@ -367,7 +376,7 @@ SearchStmtCache(const char *ecpgQuery)
++entNo; /* incr entry # */ ++entNo; /* incr entry # */
} }
/* if entry wasn't found - set entry # to zero */ /* if entry wasn't found - set entry # to zero */
if (entIx >= stmtCacheEntPerBucket) if (entIx >= stmtCacheEntPerBucket)
entNo = 0; entNo = 0;
...@@ -380,7 +389,8 @@ SearchStmtCache(const char *ecpgQuery) ...@@ -380,7 +389,8 @@ SearchStmtCache(const char *ecpgQuery)
* OR negative error code * OR negative error code
*/ */
static int static int
ecpg_freeStmtCacheEntry(int lineno, int compat, int entNo) /* entry # to free */ ecpg_freeStmtCacheEntry(int lineno, int compat,
int entNo) /* entry # to free */
{ {
stmtCacheEntry *entry; stmtCacheEntry *entry;
struct connection *con; struct connection *con;
...@@ -427,10 +437,10 @@ AddStmtToCache(int lineno, /* line # of statement */ ...@@ -427,10 +437,10 @@ AddStmtToCache(int lineno, /* line # of statement */
entNo; entNo;
stmtCacheEntry *entry; stmtCacheEntry *entry;
/* hash the statement */ /* hash the statement */
initEntNo = HashStmt(ecpgQuery); initEntNo = HashStmt(ecpgQuery);
/* search for an unused entry */ /* search for an unused entry */
entNo = initEntNo; /* start with the initial entry # for the entNo = initEntNo; /* start with the initial entry # for the
* bucket */ * bucket */
luEntNo = initEntNo; /* use it as the initial 'least used' entry */ luEntNo = initEntNo; /* use it as the initial 'least used' entry */
...@@ -444,15 +454,18 @@ AddStmtToCache(int lineno, /* line # of statement */ ...@@ -444,15 +454,18 @@ AddStmtToCache(int lineno, /* line # of statement */
++entNo; /* increment entry # */ ++entNo; /* increment entry # */
} }
/* if no unused entries were found - use the 'least used' entry found in the bucket */ /*
if (ix >= stmtCacheEntPerBucket) /* if no unused entries were found */ * if no unused entries were found, re-use the 'least used' entry found in
entNo = luEntNo; /* re-use the 'least used' entry */ * the bucket
*/
if (ix >= stmtCacheEntPerBucket)
entNo = luEntNo;
/* 'entNo' is the entry to use - make sure its free */ /* 'entNo' is the entry to use - make sure its free */
if (ecpg_freeStmtCacheEntry(lineno, compat, entNo) < 0) if (ecpg_freeStmtCacheEntry(lineno, compat, entNo) < 0)
return -1; return -1;
/* add the query to the entry */ /* add the query to the entry */
entry = &stmtCacheEntries[entNo]; entry = &stmtCacheEntries[entNo];
entry->lineno = lineno; entry->lineno = lineno;
entry->ecpgQuery = ecpg_strdup(ecpgQuery, lineno); entry->ecpgQuery = ecpg_strdup(ecpgQuery, lineno);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment