From fcb5e5585b970cf0a15544b039a32dce609f2d8e Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Mon, 19 Jan 2015 22:54:00 +0200 Subject: [PATCH] Misc cleanup, mostly dead code removal. --- connection.c | 27 ++++++++++----------------- connection.h | 29 ----------------------------- statement.c | 19 +++++++------------ 3 files changed, 17 insertions(+), 58 deletions(-) diff --git a/connection.c b/connection.c index 2217bf8..72f6051 100644 --- a/connection.c +++ b/connection.c @@ -49,8 +49,6 @@ #define STMT_INCREMENT 16 /* how many statement holders to allocate * at a time */ -#define PRN_NULLCHECK - static void CC_lookup_lo(ConnectionClass *self); static char *CC_create_errormsg(ConnectionClass *self); static int CC_close_eof_cursors(ConnectionClass *self); @@ -2502,7 +2500,6 @@ void CC_initialize_pg_version(ConnectionClass *self) { strcpy(self->pg_version, "7.4"); - self->pg_version_number = (float) 7.4; self->pg_version_major = 7; self->pg_version_minor = 4; } @@ -2511,14 +2508,12 @@ CC_initialize_pg_version(ConnectionClass *self) void CC_log_error(const char *func, const char *desc, const ConnectionClass *self) { -#ifdef PRN_NULLCHECK -#define nullcheck(a) (a ? a : "(NULL)") -#endif +#define NULLCHECK(a) (a ? a : "(NULL)") if (self) { - qlog("CONN ERROR: func=%s, desc='%s', errnum=%d, errmsg='%s'\n", func, desc, self->__error_number, nullcheck(self->__error_message)); - mylog("CONN ERROR: func=%s, desc='%s', errnum=%d, errmsg='%s'\n", func, desc, self->__error_number, nullcheck(self->__error_message)); + qlog("CONN ERROR: func=%s, desc='%s', errnum=%d, errmsg='%s'\n", func, desc, self->__error_number, NULLCHECK(self->__error_message)); + mylog("CONN ERROR: func=%s, desc='%s', errnum=%d, errmsg='%s'\n", func, desc, self->__error_number, NULLCHECK(self->__error_message)); qlog(" ------------------------------------------------------------\n"); qlog(" henv=%p, conn=%p, status=%u, num_stmts=%d\n", self->henv, self, self->status, self->num_stmts); qlog(" pqconn=%p, stmts=%p, lobj_type=%d\n", self->pqconn, self->stmts, self->lobj_type); @@ -2528,7 +2523,6 @@ CC_log_error(const char *func, const char *desc, const ConnectionClass *self) qlog("INVALID CONNECTION HANDLE ERROR: func=%s, desc='%s'\n", func, desc); mylog("INVALID CONNECTION HANDLE ERROR: func=%s, desc='%s'\n", func, desc); } -#undef PRN_NULLCHECK } /* @@ -2702,7 +2696,6 @@ cleanup1: self->pg_version_major = pversion / 10000; self->pg_version_minor = (pversion % 10000) / 100; sprintf(self->pg_version, "%d.%d.%d", self->pg_version_major, self->pg_version_minor, pversion % 100); - self->pg_version_number = (float) atof(self->pg_version); mylog("Server version=%s\n", self->pg_version); ret = 1; @@ -2845,13 +2838,13 @@ DLL_DECLARE void PgDtc_create_connect_string(void *self, char *connstr, int strs *xaOptStr = '\0'; break; } - snprintf(connstr, strsize, "DRIVER={%s};" - "%s" - "SERVER=%s;PORT=%s;DATABASE=%s;UID=%s;PWD=%s;" ABBR_SSLMODE "=%s" - , - - drivername, xaOptStr - , ci->server, ci->port, ci->database, ci->username, SAFE_NAME(ci->password), ci->sslmode + snprintf(connstr, strsize, + "DRIVER={%s};%s" + "SERVER=%s;PORT=%s;DATABASE=%s;" + "UID=%s;PWD=%s;" ABBR_SSLMODE "=%s", + drivername, xaOptStr, + ci->server, ci->port, ci->database, ci->username, + SAFE_NAME(ci->password), ci->sslmode ); return; } diff --git a/connection.h b/connection.h index ddadac7..f53d67c 100644 --- a/connection.h +++ b/connection.h @@ -204,26 +204,6 @@ do { \ } \ } while (0) -typedef unsigned int ProtocolVersion; - -#define PG_PROTOCOL(major, minor) (((major) << 16) | (minor)) -#define PG_PROTOCOL_LATEST PG_PROTOCOL(3, 0) -#define PG_NEGOTIATE_SSLMODE PG_PROTOCOL(1234, 5679) - -/* Transferred from pqcomm.h: */ - -typedef ProtocolVersion MsgType; - -#define CANCEL_REQUEST_CODE PG_PROTOCOL(1234,5678) - -typedef struct CancelRequestPacket -{ - /* Note that each field is stored in network byte order! */ - MsgType cancelRequestCode; /* code to identify a cancel request */ - unsigned int backendPID; /* PID of client's backend */ - unsigned int cancelAuthCode; /* secret key to authorize cancel */ -} CancelRequestPacket; - /* Structure to hold all the connection attributes for a specific connection (used for both registry and file, DSN and DRIVER) */ @@ -274,9 +254,6 @@ typedef struct GLOBAL_VALUES drivers; /* moved from driver's option */ } ConnInfo; -/* Macro to determine is the connection using 7.4 rejected? */ -#define PROTOCOL_74REJECTED(conninfo_) (strncmp((conninfo_)->protocol, PG74REJECTED, strlen(PG74REJECTED)) == 0) - #define SUPPORT_DESCRIBE_PARAM(conninfo_) (conninfo_->use_server_side_prepare) /* @@ -383,7 +360,6 @@ struct ConnectionClass_ char pg_version[MAX_INFO_STRING]; /* Version of PostgreSQL * we're connected to - * DJP 25-1-2001 */ - float pg_version_number; Int2 pg_version_major; Int2 pg_version_minor; char ms_jet; @@ -489,11 +465,6 @@ void handle_pgres_error(ConnectionClass *self, const PGresult *pgres, void CC_clear_error(ConnectionClass *self); int CC_send_function(ConnectionClass *conn, const char *fn_name, void *result_buf, int *actual_result_len, int result_is_int, LO_ARG *argv, int nargs); char CC_send_settings(ConnectionClass *self); -/* -char *CC_create_errormsg(ConnectionClass *self); -void CC_lookup_lo(ConnectionClass *conn); -void CC_lookup_pg_version(ConnectionClass *conn); -*/ void CC_initialize_pg_version(ConnectionClass *conn); void CC_log_error(const char *func, const char *desc, const ConnectionClass *self); int CC_send_cancel_request(const ConnectionClass *conn); diff --git a/statement.c b/statement.c index 803d5e6..6f586a2 100644 --- a/statement.c +++ b/statement.c @@ -36,8 +36,6 @@ #include "pgapifunc.h" -#define PRN_NULLCHECK - /* Map sql commands to statement types */ static const struct { @@ -2360,9 +2358,7 @@ void SC_log_error(const char *func, const char *desc, const StatementClass *self) { const char *head; -#ifdef PRN_NULLCHECK -#define nullcheck(a) (a ? a : "(NULL)") -#endif +#define NULLCHECK(a) (a ? a : "(NULL)") if (self) { QResultClass *res = SC_get_Result(self); @@ -2376,9 +2372,9 @@ SC_log_error(const char *func, const char *desc, const StatementClass *self) else { head = "STATEMENT ERROR"; - qlog("%s: func=%s, desc='%s', errnum=%d, errmsg='%s'\n",head, func, desc, self->__error_number, nullcheck(self->__error_message)); + qlog("%s: func=%s, desc='%s', errnum=%d, errmsg='%s'\n",head, func, desc, self->__error_number, NULLCHECK(self->__error_message)); } - mylog("%s: func=%s, desc='%s', errnum=%d, errmsg='%s'\n", head, func, desc, self->__error_number, nullcheck(self->__error_message)); + mylog("%s: func=%s, desc='%s', errnum=%d, errmsg='%s'\n", head, func, desc, self->__error_number, NULLCHECK(self->__error_message)); if (SC_get_errornumber(self) > 0) { qlog(" ------------------------------------------------------------\n"); @@ -2386,8 +2382,8 @@ SC_log_error(const char *func, const char *desc, const StatementClass *self) qlog(" prepare=%d, internal=%d\n", self->prepare, self->internal); qlog(" bindings=%p, bindings_allocated=%d\n", opts->bindings, opts->allocated); qlog(" parameters=%p, parameters_allocated=%d\n", apdopts->parameters, apdopts->allocated); - qlog(" statement_type=%d, statement='%s'\n", self->statement_type, nullcheck(self->statement)); - qlog(" stmt_with_params='%s'\n", nullcheck(self->stmt_with_params)); + qlog(" statement_type=%d, statement='%s'\n", self->statement_type, NULLCHECK(self->statement)); + qlog(" stmt_with_params='%s'\n", NULLCHECK(self->stmt_with_params)); qlog(" data_at_exec=%d, current_exec_param=%d, put_data=%d\n", self->data_at_exec, self->current_exec_param, self->put_data); qlog(" currTuple=%d, current_col=%d, lobj_fd=%d\n", self->currTuple, self->current_col, self->lobj_fd); qlog(" maxRows=%d, rowset_size=%d, keyset_size=%d, cursor_type=%d, scroll_concurrency=%d\n", self->options.maxRows, rowsetSize, self->options.keyset_size, self->options.cursor_type, self->options.scroll_concurrency); @@ -2398,8 +2394,8 @@ SC_log_error(const char *func, const char *desc, const StatementClass *self) if (res) { qlog(" fields=%p, backend_tuples=%p, tupleField=%d, conn=%p\n", QR_get_fields(res), res->backend_tuples, res->tupleField, res->conn); - qlog(" fetch_count=%d, num_total_rows=%d, num_fields=%d, cursor='%s'\n", res->fetch_number, QR_get_num_total_tuples(res), res->num_fields, nullcheck(QR_get_cursor(res))); - qlog(" message='%s', command='%s', notice='%s'\n", nullcheck(QR_get_message(res)), nullcheck(res->command), nullcheck(res->notice)); + qlog(" fetch_count=%d, num_total_rows=%d, num_fields=%d, cursor='%s'\n", res->fetch_number, QR_get_num_total_tuples(res), res->num_fields, NULLCHECK(QR_get_cursor(res))); + qlog(" message='%s', command='%s', notice='%s'\n", NULLCHECK(QR_get_message(res)), NULLCHECK(res->command), NULLCHECK(res->notice)); qlog(" status=%d\n", QR_get_rstatus(res)); } @@ -2412,7 +2408,6 @@ SC_log_error(const char *func, const char *desc, const StatementClass *self) qlog("INVALID STATEMENT HANDLE ERROR: func=%s, desc='%s'\n", func, desc); mylog("INVALID STATEMENT HANDLE ERROR: func=%s, desc='%s'\n", func, desc); } -#undef PRN_NULLCHECK } /* -- 2.39.5