diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-09-23 14:07:12 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-09-23 14:07:12 +0200 |
| commit | 7234e063a7bb2571dafef4edc3d3f90d3b78c063 (patch) | |
| tree | 13197a3f94d603fcda016f5337f3c135c7032f91 | |
| parent | dc4cbbc060eda607065cdfbc49262db6c553ecdc (diff) | |
| parent | 64b7126234ed5765a63867e38d120f35630717dd (diff) | |
Merge branch 'master' of git+ssh://git.taler.net/var/git/exchange
| -rw-r--r-- | doc/taler.conf.5 | 2 | ||||
| -rw-r--r-- | src/exchange-tools/taler-exchange-keyup.c | 6 | ||||
| -rw-r--r-- | src/exchangedb/exchangedb_signkeys.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/doc/taler.conf.5 b/doc/taler.conf.5 index 7d9a4e92a..6e50c69be 100644 --- a/doc/taler.conf.5 +++ b/doc/taler.conf.5 @@ -8,7 +8,7 @@ taler.conf \- Taler configuration file. .SH DESCRIPTION -The basic structure of the configuration file is the following. The file is split into sections. Every section begins with "[SECTIONNAME]" and contains a number of options of the form "OPTION=VALUE". Empty lines and lines beginning with a "#" are treated as comments. Files containing default values for many of the options described below are installed under \$TALER\_PREFIX/share/taler/config.d/. The configuration file given with \-c to Taler binaries overrides these defaults. +The basic structure of the configuration file is the following. The file is split into sections. Every section begins with "[SECTIONNAME]" and contains a number of options of the form "OPTION=VALUE". Empty lines and lines beginning with a "#" are treated as comments. Files containing default values for many of the options described below are installed under $TALER\_PREFIX/share/taler/config.d/. The configuration file given with \-c to Taler binaries overrides these defaults. .SH EXCHANGE OPTIONS diff --git a/src/exchange-tools/taler-exchange-keyup.c b/src/exchange-tools/taler-exchange-keyup.c index d039c427f..9e2500d2a 100644 --- a/src/exchange-tools/taler-exchange-keyup.c +++ b/src/exchange-tools/taler-exchange-keyup.c @@ -354,9 +354,9 @@ get_anchor_iter (void *cls, char *end = NULL; base = GNUNET_STRINGS_get_short_name (filename); - stamp.abs_value_us = strtol (base, - &end, - 10); + stamp.abs_value_us = strtoll (base, + &end, + 10); if ((NULL == end) || (0 != *end)) { fprintf(stderr, diff --git a/src/exchangedb/exchangedb_signkeys.c b/src/exchangedb/exchangedb_signkeys.c index 4ead23134..8273c84b8 100644 --- a/src/exchangedb/exchangedb_signkeys.c +++ b/src/exchangedb/exchangedb_signkeys.c @@ -125,13 +125,13 @@ static char * get_signkey_file (const char *exchange_directory, struct GNUNET_TIME_Absolute start) { - char *dir; + char *fn; - GNUNET_asprintf (&dir, + GNUNET_asprintf (&fn, "%s" DIR_SEPARATOR_STR TALER_EXCHANGEDB_DIR_SIGNING_KEYS DIR_SEPARATOR_STR "%llu", exchange_directory, (unsigned long long) start.abs_value_us); - return dir; + return fn; } |