Fixed C++ comments.

(This used to be commit ca56042c032e95ff3e1e40ae9e89a0b847d83081)

37 files changed, 89 insertions, 89 deletions

diff --git a/testsuite/libsmbclient/src/closedir/closedir_1.c b/testsuite/libsmbclient/src/closedir/closedir_1.c
index 8d27b8ddd8..702b92c24a 100644
--- a/testsuite/libsmbclient/src/closedir/closedir_1.c
+++ b/testsuite/libsmbclient/src/closedir/closedir_1.c
@@ -47,7 +47,7 @@ int main(int argc, char** argv)
 		smbc_rmdir(url);
 		smbc_mkdir(url,0666);
 		dh = smbc_opendir(url);
-		//printf("directory handle: %i\n",dh);
+		/* printf("directory handle: %i\n",dh); */
 		err = smbc_closedir(dh);
 
 		if ( err < 0 )
diff --git a/testsuite/libsmbclient/src/closedir/closedir_2.c b/testsuite/libsmbclient/src/closedir/closedir_2.c
index c66cbb9c87..88b6e2ce7e 100644
--- a/testsuite/libsmbclient/src/closedir/closedir_2.c
+++ b/testsuite/libsmbclient/src/closedir/closedir_2.c
@@ -47,7 +47,7 @@ int main(int argc, char** argv)
 		smbc_rmdir(url);
 		smbc_mkdir(url,0666);
 		dh = smbc_opendir(url);
-		//printf("directory handle: %i\n",dh);
+		/* printf("directory handle: %i\n",dh); */
 		smbc_closedir(dh);
 
 		err = errno;
diff --git a/testsuite/libsmbclient/src/closedir/closedir_3.c b/testsuite/libsmbclient/src/closedir/closedir_3.c
index 23f5f67971..4fdc9c849c 100644
--- a/testsuite/libsmbclient/src/closedir/closedir_3.c
+++ b/testsuite/libsmbclient/src/closedir/closedir_3.c
@@ -45,7 +45,7 @@ int main(int argc, char** argv)
 
 		smbc_init(auth_fn, 0);
 		dh = smbc_opendir(url);
-		//printf("directory handle: %i\n",dh);
+		/* printf("directory handle: %i\n",dh); */
 		err = smbc_closedir(dh);
 
 		if ( err < 0 )
diff --git a/testsuite/libsmbclient/src/closedir/closedir_4.c b/testsuite/libsmbclient/src/closedir/closedir_4.c
index bb5dc08331..ee1d72bae3 100644
--- a/testsuite/libsmbclient/src/closedir/closedir_4.c
+++ b/testsuite/libsmbclient/src/closedir/closedir_4.c
@@ -45,7 +45,7 @@ int main(int argc, char** argv)
 
 		smbc_init(auth_fn, 0);
 		dh = smbc_opendir(url);
-		//printf("directory handle: %i\n",dh);
+		/* printf("directory handle: %i\n",dh); */
 		smbc_closedir(dh);
 
 		err = errno;
diff --git a/testsuite/libsmbclient/src/fstat/fstat_6.c b/testsuite/libsmbclient/src/fstat/fstat_6.c
index a570c0adbc..8a38e5be34 100644
--- a/testsuite/libsmbclient/src/fstat/fstat_6.c
+++ b/testsuite/libsmbclient/src/fstat/fstat_6.c
@@ -63,7 +63,7 @@ int main(int argc, char** argv)
 		smbc_close(fd);
 		free(message);
 
-		mode_mask = mode_mask | S_IFREG | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH; //0666 or 33206
+		mode_mask = mode_mask | S_IFREG | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH; /* 0666 or 33206 */
 
 		if ( st.st_mode != mode_mask )
 			err = 1;
diff --git a/testsuite/libsmbclient/src/getdents/getdents_1.c b/testsuite/libsmbclient/src/getdents/getdents_1.c
index 96fa45cc10..6e253f78c5 100644
--- a/testsuite/libsmbclient/src/getdents/getdents_1.c
+++ b/testsuite/libsmbclient/src/getdents/getdents_1.c
@@ -31,8 +31,8 @@ int main(int argc, char** argv)
 {
 	int err = -1;
 	int dh = 0; 
-	//int dirsize = 0;
-	//int dircount = 0;
+	/* int dirsize = 0; */
+	/* int dircount = 0; */
 
 	struct smbc_dirent *dirptr;
 
diff --git a/testsuite/libsmbclient/src/getdents/getdents_2.c b/testsuite/libsmbclient/src/getdents/getdents_2.c
index 9d9d5b0b18..e7eb959a8f 100644
--- a/testsuite/libsmbclient/src/getdents/getdents_2.c
+++ b/testsuite/libsmbclient/src/getdents/getdents_2.c
@@ -31,8 +31,8 @@ int main(int argc, char** argv)
 {
 	int err = -1;
 	int dh = 0; 
-	//int dirsize = 0;
-	//int dircount = 0;
+	/* int dirsize = 0; */
+	/* int dircount = 0; */
 
 	struct smbc_dirent *dirptr;
 
diff --git a/testsuite/libsmbclient/src/getdents/getdents_3.c b/testsuite/libsmbclient/src/getdents/getdents_3.c
index aa22caa4d4..58c8f709a9 100644
--- a/testsuite/libsmbclient/src/getdents/getdents_3.c
+++ b/testsuite/libsmbclient/src/getdents/getdents_3.c
@@ -102,7 +102,7 @@ int main(int argc, char** argv)
 		while ( diramount > 0 )
 		{
 			direntsize = dirptr->dirlen;
-			//printf("Name: %s\n",dirptr->name);
+			/* printf("Name: %s\n",dirptr->name); */
 			if ( j == 0 )
 			{
 				if ( !(( strncmp(dirptr->name,".",1) == 0 )) ) 
@@ -125,7 +125,7 @@ int main(int argc, char** argv)
 					memcpy(tmp_file_ptr,buff,strlen(buff)+4);
 					strncat(tmp_file_ptr,".txt",4);
 
-					if ( !(( strcmp(dirptr->name,file_url) == 0 )) ) // make sure entries match
+					if ( !((strcmp(dirptr->name,file_url) == 0 )) ) /* make sure entries match */
 					{
 						err = 1;
 						break;
@@ -143,7 +143,7 @@ int main(int argc, char** argv)
 	
 		if ( ! err )
 		{
-			if ( (j - 2) != entry_num ) // Make sure that all entries created are counted and returned - minus . and ..
+			if ( (j - 2) != entry_num ) /* Make sure that all entries created are counted and returned - minus . and .. */
 				err = 1;
 		}	
 
diff --git a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_1.c b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_1.c
index f12fcb48c6..714f08fd72 100644
--- a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_1.c
+++ b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_1.c
@@ -53,8 +53,8 @@ void print_list_fn(struct print_job_info *pji)
 	strcpy(g_print_user,pji->user);
 	strcpy(g_print_name,pji->name);
 
-	//fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
-	//		          pji->id, pji->priority, pji->size, pji->user, pji->name);
+	/* fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
+			          pji->id, pji->priority, pji->size, pji->user, pji->name); */
 	
 }
 
@@ -85,7 +85,7 @@ int main(int argc, char** argv)
 
 		smbc_init(auth_fn, 0);
 
-		while ( ! print_queue_empty ) // Wait until the queue is empty
+		while ( ! print_queue_empty ) /* Wait until the queue is empty */
 		{
 			sleep(1);
 			print_queue_empty = 1;
diff --git a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_2.c b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_2.c
index faa60cd31b..6d6874716c 100644
--- a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_2.c
+++ b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_2.c
@@ -50,8 +50,8 @@ void print_list_fn(struct print_job_info *pji)
 	strcpy(g_print_user,pji->user);
 	strcpy(g_print_name,pji->name);
 
-	//fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
-	//		          pji->id, pji->priority, pji->size, pji->user, pji->name);
+	/* fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
+			          pji->id, pji->priority, pji->size, pji->user, pji->name); */
 	
 }
 
@@ -82,7 +82,7 @@ int main(int argc, char** argv)
 
 		smbc_init(auth_fn, 0);
 
-		while ( ! print_queue_empty ) // Wait until the queue is empty
+		while ( ! print_queue_empty ) /* Wait until the queue is empty */
 		{
 			sleep(1);
 			print_queue_empty = 1;
diff --git a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_3.c b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_3.c
index c08240d1d5..1cb52d0894 100644
--- a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_3.c
+++ b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_3.c
@@ -42,8 +42,8 @@ void print_list_fn(struct print_job_info *pji)
 	strcpy(g_print_user,pji->user);
 	strcpy(g_print_name,pji->name);
 
-	//fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
-	//	          pji->id, pji->priority, pji->size, pji->user, pji->name);
+	/* fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
+		          pji->id, pji->priority, pji->size, pji->user, pji->name); */
 	
 }
 
@@ -76,8 +76,8 @@ int main(int argc, char** argv)
 		message = malloc(msg_len);
 		message[msg_len - 1] = 0;	
 		strncpy(message,argv[5],msg_len);
-		//printf("Message: %s\n",message);
-		//printf("Message len: %i\n",msg_len);
+		/* printf("Message: %s\n",message); */ 
+		/* printf("Message len: %i\n",msg_len); */
 
 		smbc_init(auth_fn, 0);
 		smbc_unlink(url);
diff --git a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_4.c b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_4.c
index 89234b358f..ad207724b4 100644
--- a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_4.c
+++ b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_4.c
@@ -42,8 +42,8 @@ void print_list_fn(struct print_job_info *pji)
 	strcpy(g_print_user,pji->user);
 	strcpy(g_print_name,pji->name);
 
-	//fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
-	//	          pji->id, pji->priority, pji->size, pji->user, pji->name);
+	/* fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
+	  	          pji->id, pji->priority, pji->size, pji->user, pji->name); */
 	
 }
 
@@ -76,8 +76,8 @@ int main(int argc, char** argv)
 		message = malloc(msg_len);
 		message[msg_len - 1] = 0;	
 		strncpy(message,argv[5],msg_len);
-		//printf("Message: %s\n",message);
-		//printf("Message len: %i\n",msg_len);
+		/* printf("Message: %s\n",message); */
+		/* printf("Message len: %i\n",msg_len); */
 
 		smbc_init(auth_fn, 0);
 		smbc_unlink(url);
diff --git a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_5.c b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_5.c
index fa0007f7a5..874bc896d0 100644
--- a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_5.c
+++ b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_5.c
@@ -50,8 +50,8 @@ void print_list_fn(struct print_job_info *pji)
 	strcpy(g_print_user,pji->user);
 	strcpy(g_print_name,pji->name);
 
-	//fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
-	//		          pji->id, pji->priority, pji->size, pji->user, pji->name);
+	/* fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
+			          pji->id, pji->priority, pji->size, pji->user, pji->name); */
 	
 }
 
@@ -82,7 +82,7 @@ int main(int argc, char** argv)
 
 		smbc_init(auth_fn, 0);
 
-		while ( ! print_queue_empty ) // Wait until the queue is empty
+		while ( ! print_queue_empty ) /* Wait until the queue is empty */
 		{
 			sleep(1);
 			print_queue_empty = 1;
diff --git a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_6.c b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_6.c
index d752d0d0ab..7b691ae75a 100644
--- a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_6.c
+++ b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_6.c
@@ -43,8 +43,8 @@ void print_list_fn(struct print_job_info *pji)
 	strcpy(g_print_user,pji->user);
 	strcpy(g_print_name,pji->name);
 
-	//fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
-	//		          pji->id, pji->priority, pji->size, pji->user, pji->name);
+	/* fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
+			          pji->id, pji->priority, pji->size, pji->user, pji->name); */
 
 
 	print_fn_call_flag = 1;
@@ -83,8 +83,8 @@ int main(int argc, char** argv)
 		message = malloc(msg_len);
 		message[msg_len - 1] = 0;	
 		strncpy(message,argv[5],msg_len);
-		//printf("Message: %s\n",message);
-		//printf("Message len: %i\n",msg_len);
+		/* printf("Message: %s\n",message); */
+		/* printf("Message len: %i\n",msg_len); */
 
 		smbc_init(auth_fn, 0);
 		smbc_unlink(url);
diff --git a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_7.c b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_7.c
index 2675e12d9d..d25d20721b 100644
--- a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_7.c
+++ b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_7.c
@@ -42,8 +42,8 @@ void print_list_fn(struct print_job_info *pji)
 	strcpy(g_print_user,pji->user);
 	strcpy(g_print_name,pji->name);
 
-	//fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
-	//		          pji->id, pji->priority, pji->size, pji->user, pji->name);
+	/* fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
+			          pji->id, pji->priority, pji->size, pji->user, pji->name); */
 	
 }
 
@@ -76,8 +76,8 @@ int main(int argc, char** argv)
 		message = malloc(msg_len);
 		message[msg_len - 1] = 0;	
 		strncpy(message,argv[5],msg_len);
-		//printf("Message: %s\n",message);
-		//printf("Message len: %i\n",msg_len);
+		/* printf("Message: %s\n",message); */
+		/* printf("Message len: %i\n",msg_len); */
 
 		smbc_init(auth_fn, 0);
 		smbc_unlink(url);
@@ -92,7 +92,7 @@ int main(int argc, char** argv)
 
 
 		if (( (g_print_size > 0) && (g_print_size > 0) && (strcasecmp(g_username,g_print_user)==0) ))
-		//  && (strlen(g_print_name) > 0) ))
+		/*  && (strlen(g_print_name) > 0) )) */
 			err = 0;
 
 		else
diff --git a/testsuite/libsmbclient/src/lseekdir/lseekdir_1.c b/testsuite/libsmbclient/src/lseekdir/lseekdir_1.c
index 1c1ffa330e..010ca382a5 100644
--- a/testsuite/libsmbclient/src/lseekdir/lseekdir_1.c
+++ b/testsuite/libsmbclient/src/lseekdir/lseekdir_1.c
@@ -83,9 +83,9 @@ int main(int argc, char** argv)
 		}
 
 		dh = smbc_opendir(url);
-		//printf("directory handle: %i\n",dh);
+		/* printf("directory handle: %i\n",dh); */
 		err = smbc_lseekdir(dh,0);
-		//printf("err: %i\n",err);
+		/* printf("err: %i\n",err); */
 
 		if ( err < 0 )	
 
diff --git a/testsuite/libsmbclient/src/lseekdir/lseekdir_3.c b/testsuite/libsmbclient/src/lseekdir/lseekdir_3.c
index eae8c63b77..ede9cef081 100644
--- a/testsuite/libsmbclient/src/lseekdir/lseekdir_3.c
+++ b/testsuite/libsmbclient/src/lseekdir/lseekdir_3.c
@@ -48,9 +48,9 @@ int main(int argc, char** argv)
 		smbc_init(auth_fn, 0);
 
 		dh = smbc_opendir(url);
-		//printf("directory handle: %i\n",dh);
+		/* printf("directory handle: %i\n",dh); */
 		err = smbc_lseekdir(dh,0);
-		//printf("err: %i\n",err);
+		/* printf("err: %i\n",err); */
 
 		if ( err < 0 )	
 
diff --git a/testsuite/libsmbclient/src/lseekdir/lseekdir_4.c b/testsuite/libsmbclient/src/lseekdir/lseekdir_4.c
index ac21616340..1bc9a7e45d 100644
--- a/testsuite/libsmbclient/src/lseekdir/lseekdir_4.c
+++ b/testsuite/libsmbclient/src/lseekdir/lseekdir_4.c
@@ -48,10 +48,10 @@ int main(int argc, char** argv)
 		smbc_init(auth_fn, 0);
 
 		dh = smbc_opendir(url);
-		//printf("directory handle: %i\n",dh);
+		/* printf("directory handle: %i\n",dh); */
 		smbc_lseekdir(dh,0);
 		err = errno;
-		//printf("err: %i\n",err);
+		/* printf("err: %i\n",err); */
 
 
 	}
diff --git a/testsuite/libsmbclient/src/lseekdir/lseekdir_6.c b/testsuite/libsmbclient/src/lseekdir/lseekdir_6.c
index 94c86e26eb..543cbafe14 100644
--- a/testsuite/libsmbclient/src/lseekdir/lseekdir_6.c
+++ b/testsuite/libsmbclient/src/lseekdir/lseekdir_6.c
@@ -106,13 +106,13 @@ int main(int argc, char** argv)
 
 		}
 		
-		smbc_lseekdir(dh,0);	// move to front
-		smbc_lseekdir(dh,dirsize); // move to end
+		smbc_lseekdir(dh,0);	/* move to front */
+		smbc_lseekdir(dh,dirsize); /* move to end */
 		offset = smbc_telldir(dh);
 
 		if ( offset != dirsize )
 		{
-			//printf("offset: %i dirsize: %i\n",offset,dirsize);
+			/* printf("offset: %i dirsize: %i\n",offset,dirsize); */
 			err = 1;
 		}	
 
diff --git a/testsuite/libsmbclient/src/opendir/opendir_1.c b/testsuite/libsmbclient/src/opendir/opendir_1.c
index e839b99cd1..1bd01b5fee 100644
--- a/testsuite/libsmbclient/src/opendir/opendir_1.c
+++ b/testsuite/libsmbclient/src/opendir/opendir_1.c
@@ -45,7 +45,7 @@ int main(int argc, char** argv)
 
 		smbc_init(auth_fn, 0);
 		dh = smbc_opendir(url);
-		//printf("directory handle: %i\n",dh);
+		/* printf("directory handle: %i\n",dh); */
 
 		if ( dh < 0 )
 			err = 1;
diff --git a/testsuite/libsmbclient/src/print_file/print_file_1.c b/testsuite/libsmbclient/src/print_file/print_file_1.c
index fcb4466112..19932aa319 100644
--- a/testsuite/libsmbclient/src/print_file/print_file_1.c
+++ b/testsuite/libsmbclient/src/print_file/print_file_1.c
@@ -50,8 +50,8 @@ int main(int argc, char** argv)
 		message = malloc(msg_len);
 		message[msg_len - 1] = 0;	
 		strncpy(message,argv[5],msg_len);
-		//printf("Message: %s\n",message);
-		//printf("Message len: %i\n",msg_len);
+		/* printf("Message: %s\n",message); */
+		/* printf("Message len: %i\n",msg_len); */
 
 		smbc_init(auth_fn, 0);
 		smbc_unlink(url);
diff --git a/testsuite/libsmbclient/src/print_file/print_file_2.c b/testsuite/libsmbclient/src/print_file/print_file_2.c
index a217a0f3b4..a569cd8fe9 100644
--- a/testsuite/libsmbclient/src/print_file/print_file_2.c
+++ b/testsuite/libsmbclient/src/print_file/print_file_2.c
@@ -50,8 +50,8 @@ int main(int argc, char** argv)
 		message = malloc(msg_len);
 		message[msg_len - 1] = 0;	
 		strncpy(message,argv[5],msg_len);
-		//printf("Message: %s\n",message);
-		//printf("Message len: %i\n",msg_len);
+		/* printf("Message: %s\n",message); */
+		/* printf("Message len: %i\n",msg_len); */
 
 		smbc_init(auth_fn, 0);
 		smbc_unlink(url);
diff --git a/testsuite/libsmbclient/src/read/read_7.c b/testsuite/libsmbclient/src/read/read_7.c
index 081b50a3c8..fa8a783d7f 100644
--- a/testsuite/libsmbclient/src/read/read_7.c
+++ b/testsuite/libsmbclient/src/read/read_7.c
@@ -42,7 +42,7 @@ int main(int argc, char** argv)
 		strncpy(g_username,argv[2],strlen(argv[2]));
 		strncpy(g_password,argv[3],strlen(argv[3]));
 
-		fd = 10345; // Random value for File Descriptor
+		fd = 10345; /* Random value for File Descriptor */
 		smbc_init(auth_fn, 0);
 		err = smbc_read(fd, message, sizeof(message));
 
diff --git a/testsuite/libsmbclient/src/read/read_8.c b/testsuite/libsmbclient/src/read/read_8.c
index 5523fbaac3..e3f7055d3f 100644
--- a/testsuite/libsmbclient/src/read/read_8.c
+++ b/testsuite/libsmbclient/src/read/read_8.c
@@ -42,7 +42,7 @@ int main(int argc, char** argv)
 		strncpy(g_username,argv[2],strlen(argv[2]));
 		strncpy(g_password,argv[3],strlen(argv[3]));
 
-		fd = 10345; // Random value for File Descriptor
+		fd = 10345; /* Random value for File Descriptor */
 		smbc_init(auth_fn, 0);
 		err = smbc_read(fd, message, sizeof(message));
 
diff --git a/testsuite/libsmbclient/src/readdir/readdir_5.c b/testsuite/libsmbclient/src/readdir/readdir_5.c
index d1a31ef9f0..de94c4698e 100644
--- a/testsuite/libsmbclient/src/readdir/readdir_5.c
+++ b/testsuite/libsmbclient/src/readdir/readdir_5.c
@@ -104,7 +104,7 @@ int main(int argc, char** argv)
 				break;
 			}
 
-			//printf("Name: %s\n",dirptr->name);
+			/* printf("Name: %s\n",dirptr->name); */
 			if ( j == 0 )
 			{
 				if ( !(( strncmp(dirptr->name,".",1) == 0 )) ) 
@@ -127,7 +127,7 @@ int main(int argc, char** argv)
 					memcpy(tmp_file_ptr,buff,strlen(buff)+4);
 					strncat(tmp_file_ptr,".txt",4);
 
-					if ( !(( strcmp(dirptr->name,file_url) == 0 )) ) // make sure entries match
+					if ( !(( strcmp(dirptr->name,file_url) == 0 )) ) /* make sure entries match */
 					{
 						err = 1;
 						break;
@@ -143,7 +143,7 @@ int main(int argc, char** argv)
 	
 		if ( ! err )
 		{
-			if ( (j - 2) != entry_num ) // Make sure that all entries created are counted and returned - minus . and ..
+			if ( (j - 2) != entry_num ) /* Make sure that all entries created are counted and returned - minus . and .. */
 				err = 1;
 		}	
 
diff --git a/testsuite/libsmbclient/src/stat/stat_6.c b/testsuite/libsmbclient/src/stat/stat_6.c
index a27e9ba139..071bdd0f2f 100644
--- a/testsuite/libsmbclient/src/stat/stat_6.c
+++ b/testsuite/libsmbclient/src/stat/stat_6.c
@@ -63,7 +63,7 @@ int main(int argc, char** argv)
 
 		free(message);
 
-		mode_mask = mode_mask | S_IFREG | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH; //0666 or 33206
+		mode_mask = mode_mask | S_IFREG | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH; /* 0666 or 33206 */
 
 		if ( st.st_mode != mode_mask )
 			err = 1;
diff --git a/testsuite/libsmbclient/src/telldir/telldir_1.c b/testsuite/libsmbclient/src/telldir/telldir_1.c
index 401bae9e16..725033f453 100644
--- a/testsuite/libsmbclient/src/telldir/telldir_1.c
+++ b/testsuite/libsmbclient/src/telldir/telldir_1.c
@@ -83,9 +83,9 @@ int main(int argc, char** argv)
 		}
 
 		dh = smbc_opendir(url);
-		//printf("directory handle: %i\n",dh);
+		/* printf("directory handle: %i\n",dh); */
 		err = smbc_telldir(dh);
-		//printf("err: %i\n",err);
+		/* printf("err: %i\n",err); */
 
 		if ( err < 0 )	
 
diff --git a/testsuite/libsmbclient/src/telldir/telldir_3.c b/testsuite/libsmbclient/src/telldir/telldir_3.c
index 18f1aac695..06ba59538a 100644
--- a/testsuite/libsmbclient/src/telldir/telldir_3.c
+++ b/testsuite/libsmbclient/src/telldir/telldir_3.c
@@ -48,9 +48,9 @@ int main(int argc, char** argv)
 		smbc_init(auth_fn, 0);
 
 		dh = smbc_opendir(url);
-		//printf("directory handle: %i\n",dh);
+		/* printf("directory handle: %i\n",dh); */
 		err = smbc_telldir(dh);
-		//printf("err: %i\n",err);
+		/* printf("err: %i\n",err); */
 
 		if ( err < 0 )	
 
diff --git a/testsuite/libsmbclient/src/telldir/telldir_4.c b/testsuite/libsmbclient/src/telldir/telldir_4.c
index da9ca00b4d..14184237d7 100644
--- a/testsuite/libsmbclient/src/telldir/telldir_4.c
+++ b/testsuite/libsmbclient/src/telldir/telldir_4.c
@@ -48,10 +48,10 @@ int main(int argc, char** argv)
 		smbc_init(auth_fn, 0);
 
 		dh = smbc_opendir(url);
-		//printf("directory handle: %i\n",dh);
+		/* printf("directory handle: %i\n",dh); */
 		smbc_telldir(dh);
 		err = errno;
-		//printf("err: %i\n",err);
+		/* printf("err: %i\n",err); */
 
 
 	}
diff --git a/testsuite/libsmbclient/src/telldir/telldir_5.c b/testsuite/libsmbclient/src/telldir/telldir_5.c
index 3d7e92fb06..9172b2d1ab 100644
--- a/testsuite/libsmbclient/src/telldir/telldir_5.c
+++ b/testsuite/libsmbclient/src/telldir/telldir_5.c
@@ -110,7 +110,7 @@ int main(int argc, char** argv)
 
 		if ( offset != dirsize )
 		{
-			//printf("offset: %i dirsize: %i\n",offset,dirsize);
+			/* printf("offset: %i dirsize: %i\n",offset,dirsize); */
 			err = 1;
 		}	
 
diff --git a/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_1.c b/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_1.c
index 1b937192a0..b19bf228de 100644
--- a/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_1.c
+++ b/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_1.c
@@ -42,8 +42,8 @@ void print_list_fn(struct print_job_info *pji)
 	strcpy(g_print_user,pji->user);
 	strcpy(g_print_name,pji->name);
 
-	//fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
-	//		          pji->id, pji->priority, pji->size, pji->user, pji->name);
+	/* fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
+			          pji->id, pji->priority, pji->size, pji->user, pji->name); */
 	
 }
 
@@ -76,8 +76,8 @@ int main(int argc, char** argv)
 		message = malloc(msg_len);
 		message[msg_len - 1] = 0;	
 		strncpy(message,argv[5],msg_len);
-		//printf("Message: %s\n",message);
-		//printf("Message len: %i\n",msg_len);
+		/* printf("Message: %s\n",message); */
+		/* printf("Message len: %i\n",msg_len); */
 
 		smbc_init(auth_fn, 0);
 		smbc_unlink(url);
diff --git a/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_2.c b/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_2.c
index 49c9ef6687..52f127c362 100644
--- a/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_2.c
+++ b/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_2.c
@@ -42,8 +42,8 @@ void print_list_fn(struct print_job_info *pji)
 	strcpy(g_print_user,pji->user);
 	strcpy(g_print_name,pji->name);
 
-	//fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
-	//		          pji->id, pji->priority, pji->size, pji->user, pji->name);
+	/* fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
+			          pji->id, pji->priority, pji->size, pji->user, pji->name); */
 	
 }
 
@@ -76,8 +76,8 @@ int main(int argc, char** argv)
 		message = malloc(msg_len);
 		message[msg_len - 1] = 0;	
 		strncpy(message,argv[5],msg_len);
-		//printf("Message: %s\n",message);
-		//printf("Message len: %i\n",msg_len);
+		/* printf("Message: %s\n",message); */
+		/* printf("Message len: %i\n",msg_len); */
 
 		smbc_init(auth_fn, 0);
 		smbc_unlink(url);
diff --git a/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_3.c b/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_3.c
index a4cbf42fec..5686b3f53e 100644
--- a/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_3.c
+++ b/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_3.c
@@ -42,8 +42,8 @@ void print_list_fn(struct print_job_info *pji)
 	strcpy(g_print_user,pji->user);
 	strcpy(g_print_name,pji->name);
 
-	//fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
-	//		          pji->id, pji->priority, pji->size, pji->user, pji->name);
+	/* fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
+			          pji->id, pji->priority, pji->size, pji->user, pji->name); */
 	
 }
 
@@ -76,8 +76,8 @@ int main(int argc, char** argv)
 		message = malloc(msg_len);
 		message[msg_len - 1] = 0;	
 		strncpy(message,argv[5],msg_len);
-		//printf("Message: %s\n",message);
-		//printf("Message len: %i\n",msg_len);
+		/* printf("Message: %s\n",message); */
+		/* printf("Message len: %i\n",msg_len); */
 
 		smbc_init(auth_fn, 0);
 		smbc_unlink(url);
diff --git a/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_4.c b/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_4.c
index 156d341394..28966f8af4 100644
--- a/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_4.c
+++ b/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_4.c
@@ -42,8 +42,8 @@ void print_list_fn(struct print_job_info *pji)
 	strcpy(g_print_user,pji->user);
 	strcpy(g_print_name,pji->name);
 
-	//fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
-	//		          pji->id, pji->priority, pji->size, pji->user, pji->name);
+	/* fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
+			          pji->id, pji->priority, pji->size, pji->user, pji->name); */
 	
 }
 
@@ -76,8 +76,8 @@ int main(int argc, char** argv)
 		message = malloc(msg_len);
 		message[msg_len - 1] = 0;	
 		strncpy(message,argv[5],msg_len);
-		//printf("Message: %s\n",message);
-		//printf("Message len: %i\n",msg_len);
+		/* printf("Message: %s\n",message); */
+		/* printf("Message len: %i\n",msg_len); */
 
 		smbc_init(auth_fn, 0);
 		smbc_unlink(url);
diff --git a/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_5.c b/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_5.c
index 4ba5e208b2..4fb3e30017 100644
--- a/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_5.c
+++ b/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_5.c
@@ -42,8 +42,8 @@ void print_list_fn_2(struct print_job_info *pji)
 	print_ids[print_id_count] = pji->id;
 	print_id_count++;
 
-	//fprintf(stdout, "Call to Second Print Function - Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
-	//		          pji->id, pji->priority, pji->size, pji->user, pji->name);
+	/* fprintf(stdout, "Call to Second Print Function - Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
+			          pji->id, pji->priority, pji->size, pji->user, pji->name); */
 	
 }
 
@@ -56,8 +56,8 @@ void print_list_fn(struct print_job_info *pji)
 	strcpy(g_print_user,pji->user);
 	strcpy(g_print_name,pji->name);
 
-	//fprintf(stdout, "Call to First Print Function - Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
-	//			  pji->id, pji->priority, pji->size, pji->user, pji->name);
+	/* fprintf(stdout, "Call to First Print Function - Print job: ID: %u, Prio: %u, Size: %u, User: %s, Name: %s\n",
+				  pji->id, pji->priority, pji->size, pji->user, pji->name); */
 
 }
 
@@ -93,8 +93,8 @@ int main(int argc, char** argv)
 		message = malloc(msg_len);
 		message[msg_len - 1] = 0;	
 		strncpy(message,argv[5],msg_len);
-		//printf("Message: %s\n",message);
-		//printf("Message len: %i\n",msg_len);
+		/* printf("Message: %s\n",message); */
+		/* printf("Message len: %i\n",msg_len); */
 
 		smbc_init(auth_fn, 0);
 		smbc_unlink(url);
diff --git a/testsuite/libsmbclient/src/write/write_7.c b/testsuite/libsmbclient/src/write/write_7.c
index b0ce9b6fa2..bc509f1efd 100644
--- a/testsuite/libsmbclient/src/write/write_7.c
+++ b/testsuite/libsmbclient/src/write/write_7.c
@@ -42,7 +42,7 @@ int main(int argc, char** argv)
 		strncpy(g_username,argv[2],strlen(argv[2]));
 		strncpy(g_password,argv[3],strlen(argv[3]));
 
-		fd = 10345; // Random value for File Descriptor
+		fd = 10345; /* Random value for File Descriptor */
 		smbc_init(auth_fn, 0);
 		err = smbc_write(fd, message, sizeof(message));
 
diff --git a/testsuite/libsmbclient/src/write/write_8.c b/testsuite/libsmbclient/src/write/write_8.c
index 4176bec601..acc20f1958 100644
--- a/testsuite/libsmbclient/src/write/write_8.c
+++ b/testsuite/libsmbclient/src/write/write_8.c
@@ -42,7 +42,7 @@ int main(int argc, char** argv)
 		strncpy(g_username,argv[2],strlen(argv[2]));
 		strncpy(g_password,argv[3],strlen(argv[3]));
 
-		fd = 10345; // Random value for File Descriptor
+		fd = 10345; /* Random value for File Descriptor */
 		smbc_init(auth_fn, 0);
 		err = smbc_write(fd, message, sizeof(message));