Commit 456169f9 authored by Steve Holme's avatar Steve Holme
Browse files

tool_operate: Moved list SSL engines code into operate()

parent dd97828d

src/tool_operate.c

+8 −10
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static int operate_do(struct Configurable *config, int argc, 
      goto quit_curl;

  }



  if((!config->url_list || !config->url_list->url) && !config->list_engines) {

  if(!config->url_list || !config->url_list->url) {

    helpf(config->errors, "no URL specified!\n");

    res = CURLE_FAILED_INIT;

    goto quit_curl;
@@ -353,15 +353,6 @@ static int operate_do(struct Configurable *config, int argc, 
  }

#endif



  if(config->list_engines) {

    struct curl_slist *engines = NULL;

    curl_easy_getinfo(curl, CURLINFO_SSL_ENGINES, &engines);

    list_engines(engines);

    curl_slist_free_all(engines);

    res = CURLE_OK;

    goto quit_curl;

  }



  /* Single header file for all URLs */

  if(config->headerfile) {

    /* open file for output: */
@@ -1853,6 +1844,13 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[]) 
      else

        result = CURLE_OK;

    }

    /* Check if we were asked to list the SSL engines */

    else if(config->list_engines) {

      struct curl_slist *engines = NULL;

      curl_easy_getinfo(config->easy, CURLINFO_SSL_ENGINES, &engines);

      list_engines(engines);

      curl_slist_free_all(engines);

    }

    /* Perform the main operation */

    else

      result = operate_do(config, argc, argv);