aboutsummaryrefslogtreecommitdiff
path: root/tests/unit
diff options
context:
space:
mode:
Diffstat (limited to 'tests/unit')
-rw-r--r--tests/unit/unit1303.c41
-rw-r--r--tests/unit/unit1604.c6
2 files changed, 24 insertions, 23 deletions
diff --git a/tests/unit/unit1303.c b/tests/unit/unit1303.c
index a4bd59826..c39e147aa 100644
--- a/tests/unit/unit1303.c
+++ b/tests/unit/unit1303.c
@@ -69,12 +69,12 @@ struct timetest {
};
UNITTEST_START
+{
+ struct timeval now;
+ long timeout;
+ unsigned int i;
-struct timeval now;
-long timeout;
-unsigned int i;
-
-const struct timetest run[] = {
+ const struct timetest run[] = {
/* both timeouts set, not connecting */
{BASE + 4, 0, 10000, 8000, FALSE, 6000, "6 seconds should be left"},
{BASE + 4, 990000, 10000, 8000, FALSE, 5010, "5010 ms should be left"},
@@ -126,21 +126,20 @@ const struct timetest run[] = {
/* both timeouts set, connecting, connect timeout the longer one */
{BASE + 4, 0, 10000, 12000, TRUE, 6000, "6 seconds should be left"},
-};
-
-/* this is the pretended start time of the transfer */
-data->progress.t_startsingle.tv_sec = BASE;
-data->progress.t_startsingle.tv_usec = 0;
-data->progress.t_startop.tv_sec = BASE;
-data->progress.t_startop.tv_usec = 0;
-
-for(i=0; i < sizeof(run)/sizeof(run[0]); i++) {
- NOW(run[i].now_s, run[i].now_us);
- TIMEOUTS(run[i].timeout_ms, run[i].connecttimeout_ms);
- timeout = Curl_timeleft(data, &now, run[i].connecting);
- if(timeout != run[i].result)
- fail(run[i].comment);
+ };
+
+ /* this is the pretended start time of the transfer */
+ data->progress.t_startsingle.tv_sec = BASE;
+ data->progress.t_startsingle.tv_usec = 0;
+ data->progress.t_startop.tv_sec = BASE;
+ data->progress.t_startop.tv_usec = 0;
+
+ for(i=0; i < sizeof(run)/sizeof(run[0]); i++) {
+ NOW(run[i].now_s, run[i].now_us);
+ TIMEOUTS(run[i].timeout_ms, run[i].connecttimeout_ms);
+ timeout = Curl_timeleft(data, &now, run[i].connecting);
+ if(timeout != run[i].result)
+ fail(run[i].comment);
+ }
}
-
-
UNITTEST_STOP
diff --git a/tests/unit/unit1604.c b/tests/unit/unit1604.c
index 242be0005..5f1ea9518 100644
--- a/tests/unit/unit1604.c
+++ b/tests/unit/unit1604.c
@@ -42,7 +42,8 @@ static void unit_stop(void)
#if defined(MSDOS) || defined(WIN32)
-static char *getflagstr(int flags) {
+static char *getflagstr(int flags)
+{
char *buf = malloc(256);
fail_unless(buf, "out of memory");
snprintf(buf, 256, "%s,%s,%s,%s",
@@ -53,7 +54,8 @@ static char *getflagstr(int flags) {
return buf;
}
-static char *getcurlcodestr(int cc) {
+static char *getcurlcodestr(int cc)
+{
char *buf = malloc(256);
fail_unless(buf, "out of memory");
snprintf(buf, 256, "%s (%d)",