diff options
| author | Christian Grothoff <christian@grothoff.org> | 2017-06-15 21:52:09 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2017-06-15 21:52:09 +0200 |
| commit | b874a4c39b56323a48b2af4c0032af7d800647e7 (patch) | |
| tree | 409f117a18aa8f6e610f5495ced02bd7dff414b7 /src/exchangedb | |
| parent | 274ec6191f1fe763645dc74cb0c449ce3cc396bc (diff) | |
remove dead or unnecessary macros
Diffstat (limited to 'src/exchangedb')
| -rw-r--r-- | src/exchangedb/plugin_exchangedb_postgres.c | 63 |
1 files changed, 8 insertions, 55 deletions
diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c index 2eac21ca7..a97d19701 100644 --- a/src/exchangedb/plugin_exchangedb_postgres.c +++ b/src/exchangedb/plugin_exchangedb_postgres.c @@ -82,53 +82,6 @@ /** - * Shorthand for exit jumps. Logs the current line number - * and jumps to the "EXITIF_exit" label. - * - * @param cond condition that must be TRUE to exit with an error - */ -#define EXITIF(cond) \ - do { \ - if (cond) { GNUNET_break (0); goto EXITIF_exit; } \ - } while (0) - - -/** - * Execute an SQL statement and log errors on failure. Must be - * run in a function that has an "SQLEXEC_fail" label to jump - * to in case the SQL statement failed. - * - * @param conn database connection - * @param sql SQL statement to run - */ -#define SQLEXEC_(conn, sql) \ - do { \ - PGresult *result = PQexec (conn, sql); \ - if (PGRES_COMMAND_OK != PQresultStatus (result)) \ - { \ - BREAK_DB_ERR (result, conn); \ - PQclear (result); \ - goto SQLEXEC_fail; \ - } \ - PQclear (result); \ - } while (0) - - -/** - * Run an SQL statement, ignoring errors and clearing the result. - * - * @param conn database connection - * @param sql SQL statement to run - */ -#define SQLEXEC_IGNORE_ERROR_(conn, sql) \ - do { \ - PGresult *result = PQexec (conn, sql); \ - PQclear (result); \ - } while (0) - - - -/** * Handle for a database session (per-thread, for transactions). */ struct TALER_EXCHANGEDB_Session @@ -1941,10 +1894,14 @@ postgres_get_denomination_info (void *cls, GNUNET_PQ_result_spec_end }; - EXITIF (GNUNET_OK != - GNUNET_PQ_extract_result (result, - rs, - 0)); + if (GNUNET_OK != + GNUNET_PQ_extract_result (result, + rs, + 0)) + { + PQclear (result); + return GNUNET_SYSERR; + } } PQclear (result); issue->properties.purpose.size = htonl (sizeof (struct TALER_DenominationKeyValidityPS)); @@ -1952,10 +1909,6 @@ postgres_get_denomination_info (void *cls, GNUNET_CRYPTO_rsa_public_key_hash (denom_pub->rsa_public_key, &issue->properties.denom_hash); return GNUNET_OK; - - EXITIF_exit: - PQclear (result); - return GNUNET_SYSERR; } |