taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://git.taler.net/var/git/exchange

Browse Source
This commit is contained in:
Christian Grothoff 2016-09-23 14:07:12 +02:00
commit 7234e063a7
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/taler.conf.5
View File

@ -8,7 +8,7 @@ taler.conf \- Taler configuration file.
.SH DESCRIPTION .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 .SH EXCHANGE OPTIONS

2
src/exchange-tools/taler-exchange-keyup.c
View File

@ -354,7 +354,7 @@ get_anchor_iter (void *cls,
char *end = NULL; char *end = NULL;
base = GNUNET_STRINGS_get_short_name (filename); base = GNUNET_STRINGS_get_short_name (filename);
stamp.abs_value_us = strtol (base, stamp.abs_value_us = strtoll (base,
&end, &end,
10); 10);
if ((NULL == end) || (0 != *end)) if ((NULL == end) || (0 != *end))

6
src/exchangedb/exchangedb_signkeys.c
View File

@ -125,13 +125,13 @@ static char *
get_signkey_file (const char *exchange_directory, get_signkey_file (const char *exchange_directory,
struct GNUNET_TIME_Absolute start) 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", "%s" DIR_SEPARATOR_STR TALER_EXCHANGEDB_DIR_SIGNING_KEYS DIR_SEPARATOR_STR "%llu",
exchange_directory, exchange_directory,
(unsigned long long) start.abs_value_us); (unsigned long long) start.abs_value_us);
return dir; return fn;
} }