summaryrefslogtreecommitdiff
path: root/src/libstrongswan/fetcher/fetcher_manager.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstrongswan/fetcher/fetcher_manager.c')
-rw-r--r--src/libstrongswan/fetcher/fetcher_manager.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/libstrongswan/fetcher/fetcher_manager.c b/src/libstrongswan/fetcher/fetcher_manager.c
index c81de032c..2c5f5f688 100644
--- a/src/libstrongswan/fetcher/fetcher_manager.c
+++ b/src/libstrongswan/fetcher/fetcher_manager.c
@@ -92,7 +92,11 @@ static status_t fetch(private_fetcher_manager_t *this,
va_start(args, response);
while (good)
{
+<<<<<<< HEAD
opt = va_arg(args, fetcher_option_t);
+=======
+ opt = va_arg(args, int);
+>>>>>>> upstream/4.5.1
switch (opt)
{
case FETCH_REQUEST_DATA:
@@ -109,7 +113,11 @@ static status_t fetch(private_fetcher_manager_t *this,
good = fetcher->set_option(fetcher, opt, va_arg(args, u_int));
continue;
case FETCH_END:
+<<<<<<< HEAD
break;;
+=======
+ break;
+>>>>>>> upstream/4.5.1
}
break;
}