diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rwxr-xr-x | contrib/uncrustify_precommit | 2 | ||||
-rw-r--r-- | src/include/sync_database_plugin.h | 2 | ||||
-rw-r--r-- | src/include/sync_service.h | 2 | ||||
-rw-r--r-- | src/lib/test_sync_api.conf | 6 | ||||
-rw-r--r-- | src/sync/sync-httpd.c | 6 | ||||
-rw-r--r-- | src/sync/sync-httpd_backup.c | 8 | ||||
-rw-r--r-- | src/sync/sync-httpd_backup_post.c | 4 | ||||
-rw-r--r-- | src/sync/sync.conf | 2 | ||||
-rw-r--r-- | src/syncdb/plugin_syncdb_postgres.c | 6 | ||||
-rw-r--r-- | src/syncdb/test_sync_db.c | 2 |
12 files changed, 24 insertions, 21 deletions
@@ -1,3 +1,6 @@ +Tue 31 Mar 2020 03:44:33 PM CEST + Releasing sync 0.7.0. -CG + Tue 24 Dec 2019 11:01:21 PM CET Releasing sync 0.6.0. -CG diff --git a/configure.ac b/configure.ac index 049bcd5..94f01ed 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ # This configure file is in the public domain AC_PREREQ([2.69]) -AC_INIT([sync], [0.6.0], [taler-bug@gnu.org]) +AC_INIT([sync], [0.7.0], [taler-bug@gnu.org]) AC_CONFIG_SRCDIR([src/sync/sync-httpd.c]) AC_CONFIG_HEADERS([sync_config.h]) # support for non-recursive builds diff --git a/contrib/uncrustify_precommit b/contrib/uncrustify_precommit index fd29998..2487333 100755 --- a/contrib/uncrustify_precommit +++ b/contrib/uncrustify_precommit @@ -30,6 +30,6 @@ if [ $RET = 1 ]; then echo "Run" echo "uncrustify --no-backup -c uncrustify.cfg ${crustified}" - echo "before commiting." + echo "before committing." fi exit $RET diff --git a/src/include/sync_database_plugin.h b/src/include/sync_database_plugin.h index cf6a026..e35ce11 100644 --- a/src/include/sync_database_plugin.h +++ b/src/include/sync_database_plugin.h @@ -41,7 +41,7 @@ enum SYNC_DB_QueryStatus /** * Update failed because the old backup hash does not match what we previously had in the DB. */ - SYNC_DB_OLD_BACKUP_MISSMATCH = -4, + SYNC_DB_OLD_BACKUP_MISMATCH = -4, /** * Account is unpaid / does not exist. diff --git a/src/include/sync_service.h b/src/include/sync_service.h index 08c2dcc..80d18ea 100644 --- a/src/include/sync_service.h +++ b/src/include/sync_service.h @@ -307,7 +307,7 @@ struct SYNC_DownloadDetails * to verify backup chains) * @param curr_backup_hash hash over @a backup (verified) * @param backup_size number of bytes in @a backup - * @param backup the lastest backup as downloaded from the + * @param backup the latest backup as downloaded from the * server and affirmed by @a sig */ typedef void diff --git a/src/lib/test_sync_api.conf b/src/lib/test_sync_api.conf index 5218f3a..14d38df 100644 --- a/src/lib/test_sync_api.conf +++ b/src/lib/test_sync_api.conf @@ -1,10 +1,10 @@ # This file is in the public domain. # [PATHS] -# Persistant data storage for the testcase +# Persistent data storage for the testcase TALER_TEST_HOME = test_sync_api_home/ -# Persistant data storage +# Persistent data storage TALER_DATA_HOME = $TALER_HOME/.local/share/taler/ # Configuration files @@ -171,7 +171,7 @@ ENABLE_CREDIT = YES # wire fees [fees-x-taler-bank] -# Fees for the forseeable future... +# Fees for the foreseeable future... # If you see this after 2018, update to match the next 10 years... WIRE-FEE-2018 = EUR:0.01 WIRE-FEE-2019 = EUR:0.01 diff --git a/src/sync/sync-httpd.c b/src/sync/sync-httpd.c index e7299e8..b4d86a9 100644 --- a/src/sync/sync-httpd.c +++ b/src/sync/sync-httpd.c @@ -126,7 +126,7 @@ struct SYNC_DatabasePlugin *db; * can be set with the #MHD_OPTION_NOTIFY_COMPLETED). * Initially, `*con_cls` will be NULL. * @return #MHD_YES if the connection was handled successfully, - * #MHD_NO if the socket must be closed due to a serios + * #MHD_NO if the socket must be closed due to a serious * error while handling the request */ static int @@ -247,7 +247,7 @@ url_handler (void *cls, if (NULL != hc) { /* Store the async context ID, so we can restore it if - * we get another callack for this request. */ + * we get another callback for this request. */ hc->async_scope_id = aid; } return ret; @@ -280,7 +280,7 @@ url_handler (void *cls, if (NULL != hc) { /* Store the async context ID, so we can restore it if - * we get another callack for this request. */ + * we get another callback for this request. */ hc->async_scope_id = aid; } return ret; diff --git a/src/sync/sync-httpd_backup.c b/src/sync/sync-httpd_backup.c index e3da6b7..b97f90f 100644 --- a/src/sync/sync-httpd_backup.c +++ b/src/sync/sync-httpd_backup.c @@ -51,12 +51,12 @@ SH_backup_get (struct MHD_Connection *connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_INTERNAL_INVARIANT_FAILURE, "unexpected return status (backup missing)"); - case SYNC_DB_OLD_BACKUP_MISSMATCH: + case SYNC_DB_OLD_BACKUP_MISMATCH: GNUNET_break (0); return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_INTERNAL_INVARIANT_FAILURE, - "unexpected return status (backup missmatch)"); + "unexpected return status (backup mismatch)"); case SYNC_DB_PAYMENT_REQUIRED: return TALER_MHD_reply_with_error (connection, MHD_HTTP_NOT_FOUND, @@ -176,12 +176,12 @@ SH_return_backup (struct MHD_Connection *connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_INTERNAL_INVARIANT_FAILURE, "unexpected return status (backup missing)"); - case SYNC_DB_OLD_BACKUP_MISSMATCH: + case SYNC_DB_OLD_BACKUP_MISMATCH: GNUNET_break (0); return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_INTERNAL_INVARIANT_FAILURE, - "unexpected return status (backup missmatch)"); + "unexpected return status (backup mismatch)"); case SYNC_DB_PAYMENT_REQUIRED: GNUNET_break (0); return TALER_MHD_reply_with_error (connection, diff --git a/src/sync/sync-httpd_backup_post.c b/src/sync/sync-httpd_backup_post.c index dc6310b..ff055a0 100644 --- a/src/sync/sync-httpd_backup_post.c +++ b/src/sync/sync-httpd_backup_post.c @@ -540,7 +540,7 @@ handle_database_error (struct BackupContext *bc, MHD_HTTP_NOT_FOUND, TALER_EC_SYNC_PREVIOUS_BACKUP_UNKNOWN, "Cannot update, no existing backup known"); - case SYNC_DB_OLD_BACKUP_MISSMATCH: + case SYNC_DB_OLD_BACKUP_MISMATCH: GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Conflict detected, returning existing backup\n"); return SH_return_backup (bc->con, @@ -743,7 +743,7 @@ SH_backup_post (struct MHD_Connection *connection, /* get ready to hash (done here as we may go async for payments next) */ bc->hash_ctx = GNUNET_CRYPTO_hash_context_start (); - /* Check database to see if the transaction is permissable */ + /* Check database to see if the transaction is permissible */ { struct GNUNET_HashCode hc; enum SYNC_DB_QueryStatus qs; diff --git a/src/sync/sync.conf b/src/sync/sync.conf index 0242454..77f8070 100644 --- a/src/sync/sync.conf +++ b/src/sync/sync.conf @@ -59,7 +59,7 @@ SYNC_HOME = ${HOME:-${USERPROFILE}} # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html # for how these should be used. -# Persistant data storage +# Persistent data storage SYNC_DATA_HOME = ${XDG_DATA_HOME:-$SYNC_HOME/.local/share}/sync/ # Configuration files diff --git a/src/syncdb/plugin_syncdb_postgres.c b/src/syncdb/plugin_syncdb_postgres.c index e4632f0..8431ed3 100644 --- a/src/syncdb/plugin_syncdb_postgres.c +++ b/src/syncdb/plugin_syncdb_postgres.c @@ -560,7 +560,7 @@ postgres_store_backup (void *cls, if (0 != GNUNET_memcmp (&bh, backup_hash)) /* previous conflicting backup exists */ - return SYNC_DB_OLD_BACKUP_MISSMATCH; + return SYNC_DB_OLD_BACKUP_MISMATCH; /* backup identical to what was provided, no change */ return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS; } @@ -705,11 +705,11 @@ postgres_update_backup (void *cls, } if (0 == GNUNET_memcmp (&bh, old_backup_hash)) - /* all constraints seem satisified, original error must + /* all constraints seem satisfied, original error must have been a hard error */ return GNUNET_DB_STATUS_HARD_ERROR; /* previous backup does not match old_backup_hash */ - return SYNC_DB_OLD_BACKUP_MISSMATCH; + return SYNC_DB_OLD_BACKUP_MISMATCH; } diff --git a/src/syncdb/test_sync_db.c b/src/syncdb/test_sync_db.c index 0cbb8a5..c690189 100644 --- a/src/syncdb/test_sync_db.c +++ b/src/syncdb/test_sync_db.c @@ -148,7 +148,7 @@ run (void *cls) &h2, 4, "DATA")); - FAILIF (SYNC_DB_OLD_BACKUP_MISSMATCH != + FAILIF (SYNC_DB_OLD_BACKUP_MISMATCH != plugin->update_backup_TR (plugin->cls, &account_pub, &h, |