Commit b98c74b6 authored by Steve Holme's avatar Steve Holme
Browse files

tool_operhlp: Consolidated engine output code into tool_help

parent 6969e24a

src/tool_help.c

+12 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 


#include "tool_panykey.h"

#include "tool_help.h"

#include "tool_operhlp.h"



#include "memdebug.h" /* keep this as LAST include */
@@ -262,7 +261,18 @@ void tool_list_engines(CURL *curl) 
{

  struct curl_slist *engines = NULL;



  /* Get the list of engines */

  curl_easy_getinfo(curl, CURLINFO_SSL_ENGINES, &engines);

  list_engines(engines);



  puts("Build-time engines:");

  if(engines) {

    for(; engines; engines = engines->next)

      printf("  %s\n", engines->data);

  }

  else {

    puts("  <none>");

  }



  /* Cleanup the list of engines */

  curl_slist_free_all(engines);

}

src/tool_operhlp.c

+0 −14
Original line number Diff line number Diff line
@@ -34,20 +34,6 @@ 


#include "memdebug.h" /* keep this as LAST include */



/*

 * Print list of OpenSSL supported engines

 */

void list_engines(const struct curl_slist *engines)

{

  puts("Build-time engines:");

  if(!engines) {

    puts("  <none>");

    return;

  }

  for(; engines; engines = engines->next)

    printf("  %s\n", engines->data);

}



void clean_getout(struct Configurable *config)

{

  struct getout *next;

src/tool_operhlp.h

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
 ***************************************************************************/

#include "tool_setup.h"



void list_engines(const struct curl_slist *engines);



void clean_getout(struct Configurable *config);



bool output_expected(const char *url, const char *uploadfile);