#include "gnunet_crypto_lib.h"
#include "gnunet_psyc_util_lib.h"
#include "psycstore.h"
-#include "gnunet_postgres_lib.h"
#include "gnunet_pq_lib.h"
/**
GNUNET_PQ_query_param_end
};
- if (GNUNET_PQ_STATUS_SUCCESS_NO_RESULTS !=
+ if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
GNUNET_PQ_eval_prepared_non_select (plugin->dbh, stmt, params))
return GNUNET_SYSERR;
GNUNET_PQ_query_param_end
};
- if (GNUNET_PQ_STATUS_SUCCESS_NO_RESULTS !=
+ if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
GNUNET_PQ_eval_prepared_non_select (plugin->dbh, "transaction_begin", params))
return GNUNET_SYSERR;
GNUNET_PQ_query_param_end
};
- if (GNUNET_PQ_STATUS_SUCCESS_NO_RESULTS !=
+ if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
GNUNET_PQ_eval_prepared_non_select (plugin->dbh, "transaction_commit", params))
return GNUNET_SYSERR;
GNUNET_PQ_query_param_end
};
- if (GNUNET_PQ_STATUS_SUCCESS_NO_RESULTS !=
+ if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
GNUNET_PQ_eval_prepared_non_select (plugin->dbh, "transaction_rollback", params))
return GNUNET_SYSERR;
GNUNET_PQ_query_param_end
};
- if (GNUNET_PQ_STATUS_SUCCESS_NO_RESULTS !=
- GNUNET_PQ_eval_prepared_non_select (plugin->dbh, "insert_channel_key", params))
+ if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+ GNUNET_PQ_eval_prepared_non_select (plugin->dbh,
+ "insert_channel_key",
+ params))
return GNUNET_SYSERR;
return GNUNET_OK;
GNUNET_PQ_query_param_end
};
- if (GNUNET_PQ_STATUS_SUCCESS_NO_RESULTS !=
+ if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
GNUNET_PQ_eval_prepared_non_select (plugin->dbh, "insert_slave_key", params))
return GNUNET_SYSERR;
uint64_t group_generation)
{
struct Plugin *plugin = cls;
-
- uint32_t idid_join = (uint32_t)did_join;
+ uint32_t idid_join = (uint32_t) did_join;
GNUNET_assert (TRANSACTION_NONE == plugin->transaction);
- if (announced_at > INT64_MAX ||
- effective_since > INT64_MAX ||
- group_generation > INT64_MAX)
+ if ( (announced_at > INT64_MAX) ||
+ (effective_since > INT64_MAX) ||
+ (group_generation > INT64_MAX) )
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
- if (GNUNET_OK != channel_key_store (plugin, channel_key)
- || GNUNET_OK != slave_key_store (plugin, slave_key))
+ if ( (GNUNET_OK !=
+ channel_key_store (plugin, channel_key)) ||
+ (GNUNET_OK !=
+ slave_key_store (plugin, slave_key)) )
return GNUNET_SYSERR;
struct GNUNET_PQ_QueryParam params[] = {
GNUNET_PQ_query_param_end
};
- if (GNUNET_PQ_STATUS_SUCCESS_NO_RESULTS !=
- GNUNET_PQ_eval_prepared_non_select (plugin->dbh, "insert_membership", params))
+ if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+ GNUNET_PQ_eval_prepared_non_select (plugin->dbh,
+ "insert_membership",
+ params))
return GNUNET_SYSERR;
return GNUNET_OK;
GNUNET_PQ_result_spec_end
};
- if (GNUNET_PQ_STATUS_SUCCESS_ONE_RESULT !=
+ if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
GNUNET_PQ_eval_prepared_singleton_select (plugin->dbh, "select_membership",
params_select, results_select))
return GNUNET_SYSERR;
GNUNET_PQ_query_param_end
};
- if (GNUNET_PQ_STATUS_SUCCESS_NO_RESULTS !=
+ if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
GNUNET_PQ_eval_prepared_non_select (plugin->dbh, "insert_fragment", params_insert))
return GNUNET_SYSERR;
GNUNET_PQ_query_param_end
};
- if (GNUNET_PQ_STATUS_SUCCESS_NO_RESULTS !=
+ if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
GNUNET_PQ_eval_prepared_non_select (plugin->dbh, "update_message_flags", params_update))
return GNUNET_SYSERR;
GNUNET_PQ_result_spec_end
};
- if (GNUNET_PQ_STATUS_SUCCESS_ONE_RESULT !=
+ if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
GNUNET_PQ_eval_prepared_singleton_select (plugin->dbh, stmt,
params_select, results_select))
return GNUNET_SYSERR;
GNUNET_PQ_result_spec_end
};
- if (GNUNET_PQ_STATUS_SUCCESS_ONE_RESULT !=
+ if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
GNUNET_PQ_eval_prepared_singleton_select (plugin->dbh, stmt,
params_select, results_select))
return GNUNET_SYSERR;
GNUNET_PQ_query_param_end
};
- if (GNUNET_PQ_STATUS_SUCCESS_NO_RESULTS !=
+ if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
GNUNET_PQ_eval_prepared_non_select (plugin->dbh, stmt, params))
return GNUNET_SYSERR;
GNUNET_PQ_query_param_end
};
- if (GNUNET_PQ_STATUS_SUCCESS_NO_RESULTS !=
+ if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
GNUNET_PQ_eval_prepared_non_select (plugin->dbh, stmt, params))
return GNUNET_SYSERR;
GNUNET_PQ_result_spec_end
};
- if (GNUNET_PQ_STATUS_SUCCESS_ONE_RESULT !=
+ if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
GNUNET_PQ_eval_prepared_singleton_select (plugin->dbh, stmt,
params_select, results_select))
return GNUNET_SYSERR;
/**
- * Closure for #fragment_rows.
+ * Closure for #get_state_cb.
*/
struct GetStateContext {
const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key;
* @param result the postgres result
* @param num_result the number of results in @a result
*/
-void get_state (void *cls,
+static void
+get_state_cb (void *cls,
PGresult *res,
unsigned int num_results)
{
if (0 > GNUNET_PQ_eval_prepared_multi_select (plugin->dbh,
stmt, params_select,
- &get_state, &gsc))
+ &get_state_cb, &gsc))
return GNUNET_SYSERR;
return gsc.ret; /* GNUNET_OK ?? */
}
if (0 > GNUNET_PQ_eval_prepared_multi_select (plugin->dbh,
stmt, params_select,
- &get_state, &gsc))
+ &get_state_cb, &gsc))
return GNUNET_SYSERR;
return gsc.ret; /* GNUNET_OK ?? */
}