diff options
author | Nick Mathewson <nickm@torproject.org> | 2009-12-12 02:10:57 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2009-12-12 02:10:57 -0500 |
commit | d086c9a7f73ce5b9b7cf4add07fa7d071b829081 (patch) | |
tree | 3a89c6826a54852aa29ba572a72c1d6a66a50803 | |
parent | 9e6225ae1662e10f3e6c32af52736b60eb489b55 (diff) | |
parent | 28b29e0fd7a81e4e36e3c133c7a98d0d9021ccfc (diff) | |
download | tor-d086c9a7f73ce5b9b7cf4add07fa7d071b829081.tar.gz tor-d086c9a7f73ce5b9b7cf4add07fa7d071b829081.zip |
Merge commit 'sebastian/fixes'
-rw-r--r-- | Makefile.am | 3 | ||||
-rw-r--r-- | src/common/util.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 24b30bc092..850ab71bb5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -61,7 +61,8 @@ doxygen: test: all ./src/test/test -# Avoid strlcpy.c, strlcat.c, tree.h +# Avoid strlcpy.c, strlcat.c, aes.c, OpenBSD_malloc_Linux.c, sha256.c, +# eventdns.[hc], tinytest.[ch] check-spaces: ./contrib/checkSpace.pl -C \ src/common/*.h \ diff --git a/src/common/util.c b/src/common/util.c index 5ad12c3e65..06c8909cc1 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2450,7 +2450,7 @@ tor_vsscanf(const char *buf, const char *pattern, va_list ap) * long widths. %u does not consume any space. Is locale-independent. * Returns -1 on malformed patterns. * - * (As with other local-independent functions, we need this to parse data that + * (As with other locale-independent functions, we need this to parse data that * is in ASCII without worrying that the C library's locale-handling will make * miscellaneous characters look like numbers, spaces, and so on.) */ |