diff options
Diffstat (limited to 'src/stasis')
| -rw-r--r-- | src/stasis/plugin_anastasis_postgres.c | 19 | ||||
| -rw-r--r-- | src/stasis/stasis-0001.sql | 2 |
2 files changed, 8 insertions, 13 deletions
diff --git a/src/stasis/plugin_anastasis_postgres.c b/src/stasis/plugin_anastasis_postgres.c index bfe86da..709228f 100644 --- a/src/stasis/plugin_anastasis_postgres.c +++ b/src/stasis/plugin_anastasis_postgres.c @@ -1030,10 +1030,8 @@ postgres_store_recovery_document ( GNUNET_PQ_query_param_auto_from_type (recovery_data_hash), GNUNET_PQ_query_param_fixed_size (recovery_data, recovery_data_size), - (NULL == recovery_meta_data) - ? GNUNET_PQ_query_param_null () - : GNUNET_PQ_query_param_fixed_size (recovery_meta_data, - recovery_meta_data_size), + GNUNET_PQ_query_param_fixed_size (recovery_meta_data, + recovery_meta_data_size), GNUNET_PQ_query_param_timestamp (&now), GNUNET_PQ_query_param_end }; @@ -2251,20 +2249,17 @@ meta_iterator (void *cls, for (unsigned int i = 0; i<num_results; i++) { uint32_t version; - void *meta_data = NULL; - size_t meta_data_size = 0; + void *meta_data; + size_t meta_data_size; struct GNUNET_TIME_Timestamp ts; - bool unused = false; struct GNUNET_PQ_ResultSpec rs[] = { GNUNET_PQ_result_spec_uint32 ("version", &version), GNUNET_PQ_result_spec_timestamp ("creation_date", &ts), - GNUNET_PQ_result_spec_allow_null ( - GNUNET_PQ_result_spec_variable_size ("recovery_meta_data", - &meta_data, - &meta_data_size), - &unused), + GNUNET_PQ_result_spec_variable_size ("recovery_meta_data", + &meta_data, + &meta_data_size), GNUNET_PQ_result_spec_end }; enum GNUNET_GenericReturnValue ret; diff --git a/src/stasis/stasis-0001.sql b/src/stasis/stasis-0001.sql index 38e60fc..fe0ab63 100644 --- a/src/stasis/stasis-0001.sql +++ b/src/stasis/stasis-0001.sql @@ -140,7 +140,7 @@ CREATE TABLE IF NOT EXISTS anastasis_recoverydocument account_sig BYTEA NOT NULL CHECK(LENGTH(account_sig)=64), recovery_data_hash BYTEA NOT NULL CHECK(length(recovery_data_hash)=64), recovery_data BYTEA NOT NULL, - recovery_meta_data BYTEA DEFAULT NULL, + recovery_meta_data BYTEA NOT NULL, creation_date INT8 NOT NULL, PRIMARY KEY (user_id, version)); COMMENT ON TABLE anastasis_recoverydocument |