diff options
author | Alex Deymo <deymo@google.com> | 2018-01-08 20:49:55 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-01-08 20:49:55 +0000 |
commit | d6cc5657f76e9d919cb763997c725dac3d737bfe (patch) | |
tree | 10f2cc17311582d8f1b00ecf3ab0c4af213b839d /tests/libtest/lib533.c | |
parent | aae00d53fb85eb5e1a4b768f0c353c4e5884baff (diff) | |
parent | fb9bb4b2ab398c43e78c91e514b108e0ed83520d (diff) | |
download | android_external_curl-d6cc5657f76e9d919cb763997c725dac3d737bfe.tar.gz android_external_curl-d6cc5657f76e9d919cb763997c725dac3d737bfe.tar.bz2 android_external_curl-d6cc5657f76e9d919cb763997c725dac3d737bfe.zip |
Merge "Update from 7.55.1 to 7.57.0" am: 96660a18c5 am: 484d473385
am: fb9bb4b2ab
Change-Id: Ibdd1eef03d7087e66dc85d29773988cd9a3f9d3e
Diffstat (limited to 'tests/libtest/lib533.c')
-rw-r--r-- | tests/libtest/lib533.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/libtest/lib533.c b/tests/libtest/lib533.c index 706b269..7dd0fb5 100644 --- a/tests/libtest/lib533.c +++ b/tests/libtest/lib533.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2011, 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -37,7 +37,7 @@ int test(char *URL) CURL *curl = NULL; int running; CURLM *m = NULL; - int current=0; + int current = 0; start_test_timing(); @@ -95,7 +95,7 @@ int test(char *URL) /* At this point, maxfd is guaranteed to be greater or equal than -1. */ - select_test(maxfd+1, &rd, &wr, &exc, &interval); + select_test(maxfd + 1, &rd, &wr, &exc, &interval); abort_on_test_timeout(); } |