-fix tests for libmagic (and uncrustify indentation)

9 files changed, 26 insertions, 26 deletions

diff --git a/src/testcurl/https/test_https_get_iovec.c b/src/testcurl/https/test_https_get_iovec.c
index 81231bd6..615ef340 100644
--- a/src/testcurl/https/test_https_get_iovec.c
+++ b/src/testcurl/https/test_https_get_iovec.c
@@ -128,7 +128,7 @@ iovec_ahc (void *cls,
     iov[j].iov_len = TESTSTR_SIZE / TESTSTR_IOVCNT;
 
     for (i = 0; i < (int) (TESTSTR_IOVLEN / sizeof(int)); ++i)
-      ((int*) iov[j].iov_base)[i] = i + (j * TESTSTR_IOVLEN / sizeof(int));
+      ((int *) iov[j].iov_base)[i] = i + (j * TESTSTR_IOVLEN / sizeof(int));
   }
 
   response = MHD_create_response_from_iovec (iov,
diff --git a/src/testcurl/https/test_https_session_info.c b/src/testcurl/https/test_https_session_info.c
index d594753e..ebafec34 100644
--- a/src/testcurl/https/test_https_session_info.c
+++ b/src/testcurl/https/test_https_session_info.c
@@ -55,7 +55,7 @@ query_session_ahc (void *cls, struct MHD_Connection *connection,
 
   if (NULL == *ptr)
   {
-    *ptr = (void*) &query_session_ahc;
+    *ptr = (void *) &query_session_ahc;
     return MHD_YES;
   }
 
diff --git a/src/testcurl/https/test_https_sni.c b/src/testcurl/https/test_https_sni.c
index 6effd313..4e7c1677 100644
--- a/src/testcurl/https/test_https_sni.c
+++ b/src/testcurl/https/test_https_sni.c
@@ -132,11 +132,11 @@ load_keys (const char *hostname,
  */
 static int
 sni_callback (gnutls_session_t session,
-              const gnutls_datum_t*req_ca_dn,
+              const gnutls_datum_t *req_ca_dn,
               int nreqs,
-              const gnutls_pk_algorithm_t*pk_algos,
+              const gnutls_pk_algorithm_t *pk_algos,
               int pk_algos_length,
-              gnutls_pcert_st**pcert,
+              gnutls_pcert_st **pcert,
               unsigned int *pcert_length,
               gnutls_privkey_t *pkey)
 {
diff --git a/src/testcurl/mhd_has_in_name.h b/src/testcurl/mhd_has_in_name.h
index 570a2332..3be50b8a 100644
--- a/src/testcurl/mhd_has_in_name.h
+++ b/src/testcurl/mhd_has_in_name.h
@@ -61,5 +61,5 @@ has_in_name (const char *prog_name, const char *marker)
   }
   if (name_pos == pos)
     return 0;
-  return strstr (prog_name + name_pos, marker) != (char*) 0;
+  return strstr (prog_name + name_pos, marker) != (char *) 0;
 }
diff --git a/src/testcurl/perf_get_concurrent.c b/src/testcurl/perf_get_concurrent.c
index 76bb42f9..7427ef42 100644
--- a/src/testcurl/perf_get_concurrent.c
+++ b/src/testcurl/perf_get_concurrent.c
@@ -188,7 +188,7 @@ thread_gets (void *param)
   CURL *c;
   CURLcode errornum;
   unsigned int i;
-  char *const url = (char*) param;
+  char *const url = (char *) param;
 
   c = curl_easy_init ();
   curl_easy_setopt (c, CURLOPT_URL, url);
@@ -237,7 +237,7 @@ do_gets (void *param)
             port);
   for (j = 0; j < PAR; j++)
   {
-    if (0 != pthread_create (&par[j], NULL, &thread_gets, (void*) url))
+    if (0 != pthread_create (&par[j], NULL, &thread_gets, (void *) url))
     {
       for (j--; j >= 0; j--)
         pthread_join (par[j], NULL);
@@ -247,7 +247,7 @@ do_gets (void *param)
   for (j = 0; j < PAR; j++)
   {
     char *ret_val;
-    if ((0 != pthread_join (par[j], (void**) &ret_val)) ||
+    if ((0 != pthread_join (par[j], (void **) &ret_val)) ||
         (NULL != ret_val) )
       err = ret_val;
   }
@@ -289,7 +289,7 @@ testInternalGet (int port, int poll_flag)
     port = (int) dinfo->port;
   }
   start_timer ();
-  ret_val = do_gets ((void*) (intptr_t) port);
+  ret_val = do_gets ((void *) (intptr_t) port);
   if (! ret_val)
     stop (test_desc);
   MHD_stop_daemon (d);
@@ -340,7 +340,7 @@ testMultithreadedGet (int port, int poll_flag)
     port = (int) dinfo->port;
   }
   start_timer ();
-  ret_val = do_gets ((void*) (intptr_t) port);
+  ret_val = do_gets ((void *) (intptr_t) port);
   if (! ret_val)
     stop (test_desc);
   MHD_stop_daemon (d);
@@ -389,7 +389,7 @@ testMultithreadedPoolGet (int port, int poll_flag)
     port = (int) dinfo->port;
   }
   start_timer ();
-  ret_val = do_gets ((void*) (intptr_t) port);
+  ret_val = do_gets ((void *) (intptr_t) port);
   if (! ret_val)
     stop (test_desc);
   MHD_stop_daemon (d);
@@ -437,7 +437,7 @@ testExternalGet (int port)
     port = (int) dinfo->port;
   }
   if (0 != pthread_create (&pid, NULL,
-                           &do_gets, (void*) (intptr_t) port))
+                           &do_gets, (void *) (intptr_t) port))
   {
     MHD_stop_daemon (d);
     return 512;
@@ -489,7 +489,7 @@ testExternalGet (int port)
 
   stop ("external select");
   MHD_stop_daemon (d);
-  if ((0 != pthread_join (pid, (void**) &ret_val)) ||
+  if ((0 != pthread_join (pid, (void **) &ret_val)) ||
       (NULL != ret_val) )
   {
     fprintf (stderr,
diff --git a/src/testcurl/test_add_conn.c b/src/testcurl/test_add_conn.c
index 9bd7964f..76671cec 100644
--- a/src/testcurl/test_add_conn.c
+++ b/src/testcurl/test_add_conn.c
@@ -273,7 +273,7 @@ createListeningSocket (int *pport)
     externalErrorExitDesc ("socket() failed");
 
 #ifdef MHD_POSIX_SOCKETS
-  setsockopt (skt, SOL_SOCKET, SO_REUSEADDR, (void*) &on, sizeof (on));
+  setsockopt (skt, SOL_SOCKET, SO_REUSEADDR, (void *) &on, sizeof (on));
   /* Ignore possible error */
 #endif /* MHD_POSIX_SOCKETS */
 
@@ -281,7 +281,7 @@ createListeningSocket (int *pport)
   sin.sin_family = AF_INET;
   sin.sin_port = htons (*pport);
   sin.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-  if (0 != bind (skt, (struct sockaddr*) &sin, sizeof(sin)))
+  if (0 != bind (skt, (struct sockaddr *) &sin, sizeof(sin)))
     externalErrorExitDesc ("bind() failed");
 
   if (0 != listen (skt, SOMAXCONN))
@@ -370,7 +370,7 @@ doAcceptAndAddConn (void *param)
 
   (void) doAcceptAndAddConnInThread (p);
 
-  return (void*) p;
+  return (void *) p;
 }
 
 
@@ -381,7 +381,7 @@ startThreadAddConn (struct addConnParam *param)
   param->result = eMarker;
 
   if (0 != pthread_create (&param->addConnThread, NULL, &doAcceptAndAddConn,
-                           (void*) param))
+                           (void *) param))
     externalErrorExitDesc ("pthread_create() failed");
 }
 
@@ -391,7 +391,7 @@ finishThreadAddConn (struct addConnParam *param)
 {
   struct addConnParam *result;
 
-  if (0 != pthread_join (param->addConnThread, (void**) &result))
+  if (0 != pthread_join (param->addConnThread, (void **) &result))
     externalErrorExitDesc ("pthread_join() failed");
 
   if (param != result)
@@ -520,7 +520,7 @@ doCurlQueryInThread (struct curlQueryParams *p)
 static void *
 doCurlQuery (void *param)
 {
-  struct curlQueryParams *p = (struct curlQueryParams*) param;
+  struct curlQueryParams *p = (struct curlQueryParams *) param;
 
   (void) doCurlQueryInThread (p);
 
@@ -535,7 +535,7 @@ startThreadCurlQuery (struct curlQueryParams *param)
   param->queryError = eMarker;
 
   if (0 != pthread_create (&param->queryThread, NULL, &doCurlQuery,
-                           (void*) param))
+                           (void *) param))
     externalErrorExitDesc ("pthread_create() failed");
 }
 
@@ -545,7 +545,7 @@ finishThreadCurlQuery (struct curlQueryParams *param)
 {
   struct curlQueryParams *result;
 
-  if (0 != pthread_join (param->queryThread, (void**) &result))
+  if (0 != pthread_join (param->queryThread, (void **) &result))
     externalErrorExitDesc ("pthread_join() failed");
 
   if (param != result)
diff --git a/src/testcurl/test_get_response_cleanup.c b/src/testcurl/test_get_response_cleanup.c
index 7e0af24f..5eda6c4f 100644
--- a/src/testcurl/test_get_response_cleanup.c
+++ b/src/testcurl/test_get_response_cleanup.c
@@ -62,7 +62,7 @@
 #define MHD_CPU_COUNT 2
 #endif
 
-#define TESTSTR "/* DO NOT CHANGE THIS LINE */"
+#define TESTSTR " /* DO NOT CHANGE THIS LINE */ "
 
 static int oneone;
 
diff --git a/src/testcurl/test_get_wait.c b/src/testcurl/test_get_wait.c
index 0fc190f9..40fcaf6d 100644
--- a/src/testcurl/test_get_wait.c
+++ b/src/testcurl/test_get_wait.c
@@ -189,7 +189,7 @@ testRunWaitGet (int port, int poll_flag)
   }
 
   if (0 != pthread_create (&get_tid, NULL,
-                           &thread_gets, (void*) (intptr_t) port))
+                           &thread_gets, (void *) (intptr_t) port))
     _exit (99);
 
   /* As another thread sets "done" flag after ending of network
diff --git a/src/testcurl/test_large_put.c b/src/testcurl/test_large_put.c
index 66c51588..0a7040ba 100644
--- a/src/testcurl/test_large_put.c
+++ b/src/testcurl/test_large_put.c
@@ -62,7 +62,7 @@ struct CBC
   size_t size;
 };
 
-char*
+char *
 alloc_init (size_t buf_size)
 {
   static const char template[] =
@@ -145,7 +145,7 @@ ahc_echo (void *cls,
       processed = 0;
       *pparam = &processed;     /* Safe as long as only one parallel request served. */
     }
-    pproc = (size_t*) *pparam;
+    pproc = (size_t *) *pparam;
 
     if (0 == *upload_data_size)
       return MHD_YES;   /* No data to process. */