diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-07-19 11:13:53 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-07-19 11:13:53 +0200 |
| commit | b484854525313543414e0ce0df35190bffb917b1 (patch) | |
| tree | b1e6ef5313f42bda2f0728486d8a37da96e96bfe /src/or/hibernate.c | |
| parent | 9d5d0f040f9b0ddf6c10166200d115bfa30a31da (diff) | |
| parent | d461799f0b5fe3b5a2c3a74db21d4a89b9b97424 (diff) | |
| download | tor-b484854525313543414e0ce0df35190bffb917b1.tar.gz tor-b484854525313543414e0ce0df35190bffb917b1.zip | |
Merge branch 'bug1699'
Diffstat (limited to 'src/or/hibernate.c')
| -rw-r--r-- | src/or/hibernate.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/hibernate.c b/src/or/hibernate.c index 3c52a31729..6b512eacf2 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -863,9 +863,11 @@ consider_hibernation(time_t now) * NULL. */ int getinfo_helper_accounting(control_connection_t *conn, - const char *question, char **answer) + const char *question, char **answer, + const char **errmsg) { (void) conn; + (void) errmsg; if (!strcmp(question, "accounting/enabled")) { *answer = tor_strdup(accounting_is_enabled(get_options()) ? "1" : "0"); } else if (!strcmp(question, "accounting/hibernating")) { |