Commit 0a5cf3a9 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Oops, make the memory magic debug stuff done before global init too just to

catch them all. The memory debug stuff is not in the public API anyway.
parent 6173e38f
Loading
Loading
Loading
Loading
+9 −6
Original line number Diff line number Diff line
@@ -3969,12 +3969,6 @@ operate(struct Configurable *config, int argc, argv_item_t argv[])

  memset(&heads, 0, sizeof(struct OutStruct));

  /* initialize curl library - do not call any libcurl functions before */
  if (main_init() != CURLE_OK) {
    helpf(config->errors, "error initializing curl library\n");
    return CURLE_FAILED_INIT;
  }

#ifdef CURLDEBUG
  /* this sends all memory debug messages to a logfile named memdump */
  env = curlx_getenv("CURL_MEMDEBUG");
@@ -3995,6 +3989,15 @@ operate(struct Configurable *config, int argc, argv_item_t argv[])
  }
#endif

  /* Initialize curl library - do not call any libcurl functions before.
     Note that the CURLDEBUG magic above is an exception, but then that's not
     part of the official public API.
   */
  if (main_init() != CURLE_OK) {
    helpf(config->errors, "error initializing curl library\n");
    return CURLE_FAILED_INIT;
  }

  /*
   * Get a curl handle to use for all forthcoming curl transfers.  Cleanup
   * when all transfers are done.