diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-07 10:06:50 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-07 10:06:50 -0500 |
| commit | cb54cd6745eaf15716aa357fc253f43f26c051a6 (patch) | |
| tree | 8637fbe20d722885eb295aee4f5f0ac86683854f /src/common/util.h | |
| parent | 49dca8b1beae9c2dade2c3193fa7f77f5c15d869 (diff) | |
| parent | 7984fc153112baa5c370215f2205025a7648d7b4 (diff) | |
| download | tor-cb54cd6745eaf15716aa357fc253f43f26c051a6.tar.gz tor-cb54cd6745eaf15716aa357fc253f43f26c051a6.zip | |
Merge branch 'bug9286_v3_squashed'
Diffstat (limited to 'src/common/util.h')
| -rw-r--r-- | src/common/util.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/common/util.h b/src/common/util.h index a1da53890e..ee40949b61 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -274,6 +274,7 @@ void format_local_iso_time(char *buf, time_t t); void format_iso_time(char *buf, time_t t); void format_iso_time_nospace(char *buf, time_t t); void format_iso_time_nospace_usec(char *buf, const struct timeval *tv); +int parse_iso_time_(const char *cp, time_t *t, int strict); int parse_iso_time(const char *buf, time_t *t); int parse_http_time(const char *buf, struct tm *tm); int format_time_interval(char *out, size_t out_len, long interval); |