From bf52cef16fd2cc1ad83f760059d27f49f036c3eb Mon Sep 17 00:00:00 2001
From: Dan Fandrich <dan@coneharvesters.com>
Date: Thu, 3 Apr 2008 20:28:32 +0000
Subject: Made sure that curl_global_init is called in all the multithreaded
 example programs.

---
 docs/examples/multithread.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'docs/examples/multithread.c')

diff --git a/docs/examples/multithread.c b/docs/examples/multithread.c
index 78c3a157a..939e9daef 100644
--- a/docs/examples/multithread.c
+++ b/docs/examples/multithread.c
@@ -15,6 +15,8 @@
 #include <pthread.h>
 #include <curl/curl.h>
 
+#define NUMT 4
+
 /*
   List of URLs to fetch.
 
@@ -24,14 +26,14 @@
   http://www.openssl.org/docs/crypto/threads.html#DESCRIPTION
 
 */
-const char *urls[]= {
+const char * const urls[NUMT]= {
   "http://curl.haxx.se/",
   "ftp://cool.haxx.se/",
   "http://www.contactor.se/",
   "www.haxx.se"
 };
 
-void *pull_one_url(void *url)
+static void *pull_one_url(void *url)
 {
   CURL *curl;
 
@@ -52,10 +54,14 @@ void *pull_one_url(void *url)
 
 int main(int argc, char **argv)
 {
-  pthread_t tid[4];
+  pthread_t tid[NUMT];
   int i;
   int error;
-  for(i=0; i< 4; i++) {
+
+  /* Must initialize libcurl before any threads are started */
+  curl_global_init(CURL_GLOBAL_ALL);
+
+  for(i=0; i< NUMT; i++) {
     error = pthread_create(&tid[i],
                            NULL, /* default attributes please */
                            pull_one_url,
@@ -67,7 +73,7 @@ int main(int argc, char **argv)
   }
 
   /* now wait for all threads to terminate */
-  for(i=0; i< 4; i++) {
+  for(i=0; i< NUMT; i++) {
     error = pthread_join(tid[i], NULL);
     fprintf(stderr, "Thread %d terminated\n", i);
   }
-- 
cgit v1.2.3