X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fbenchmark%2Ftest_urcu_hash.c;h=a8a79e3fcb45bf9b8c73060ee0ce98c615fb9cf5;hb=a9e31859feb8d62a3e9d8a434c3f1bd80dbe3076;hp=896fb32be4393c62785cc98107a1e0bb89d45bee;hpb=e3717dbc8700ef1db5d341e2c5a74f61c4981ab3;p=urcu.git

diff --git a/tests/benchmark/test_urcu_hash.c b/tests/benchmark/test_urcu_hash.c
index 896fb32..a8a79e3 100644
--- a/tests/benchmark/test_urcu_hash.c
+++ b/tests/benchmark/test_urcu_hash.c
@@ -140,7 +140,7 @@ static pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 void set_affinity(void)
 {
-#if HAVE_SCHED_SETAFFINITY
+#ifdef HAVE_SCHED_SETAFFINITY
 	cpu_set_t mask;
 	int cpu, ret;
 #endif /* HAVE_SCHED_SETAFFINITY */
@@ -148,7 +148,7 @@ void set_affinity(void)
 	if (!use_affinity)
 		return;
 
-#if HAVE_SCHED_SETAFFINITY
+#ifdef HAVE_SCHED_SETAFFINITY
 	ret = pthread_mutex_lock(&affinity_mutex);
 	if (ret) {
 		perror("Error in pthread mutex lock");
@@ -204,7 +204,7 @@ unsigned long test_compare(const void *key1, size_t key1_len,
 }
 
 static
-void *thr_count(void *arg)
+void *thr_count(void *arg __attribute__((unused)))
 {
 	printf_verbose("thread_begin %s, tid %lu\n",
 			"counter", urcu_get_thread_id());
@@ -270,7 +270,7 @@ void test_delete_all_nodes(struct cds_lfht *ht)
 }
 
 static
-void show_usage(int argc, char **argv)
+void show_usage(char **argv)
 {
 	printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",
 		argv[0]);
@@ -323,28 +323,28 @@ int main(int argc, char **argv)
 	long long nr_leaked;
 
 	if (argc < 4) {
-		show_usage(argc, argv);
+		show_usage(argv);
 		mainret = 1;
 		goto end;
 	}
 
 	err = sscanf(argv[1], "%u", &nr_readers);
 	if (err != 1) {
-		show_usage(argc, argv);
+		show_usage(argv);
 		mainret = 1;
 		goto end;
 	}
 
 	err = sscanf(argv[2], "%u", &nr_writers);
 	if (err != 1) {
-		show_usage(argc, argv);
+		show_usage(argv);
 		mainret = 1;
 		goto end;
 	}
 
 	err = sscanf(argv[3], "%lu", &duration);
 	if (err != 1) {
-		show_usage(argc, argv);
+		show_usage(argv);
 		mainret = 1;
 		goto end;
 	}
@@ -361,7 +361,7 @@ int main(int argc, char **argv)
 			break;
 		case 'a':
 			if (argc < i + 2) {
-				show_usage(argc, argv);
+				show_usage(argv);
 				mainret = 1;
 				goto end;
 			}
@@ -372,7 +372,7 @@ int main(int argc, char **argv)
 			break;
 		case 'c':
 			if (argc < i + 2) {
-				show_usage(argc, argv);
+				show_usage(argv);
 				mainret = 1;
 				goto end;
 			}
@@ -380,7 +380,7 @@ int main(int argc, char **argv)
 			break;
 		case 'd':
 			if (argc < i + 2) {
-				show_usage(argc, argv);
+				show_usage(argv);
 				mainret = 1;
 				goto end;
 			}
@@ -391,7 +391,7 @@ int main(int argc, char **argv)
 			break;
 		case 'h':
 			if (argc < i + 2) {
-				show_usage(argc, argv);
+				show_usage(argv);
 				mainret = 1;
 				goto end;
 			}
@@ -399,7 +399,7 @@ int main(int argc, char **argv)
 			break;
 		case 'm':
 			if (argc < i + 2) {
-				show_usage(argc, argv);
+				show_usage(argv);
 				mainret = 1;
 				goto end;
 			}
@@ -407,7 +407,7 @@ int main(int argc, char **argv)
 			break;
 		case 'n':
 			if (argc < i + 2) {
-				show_usage(argc, argv);
+				show_usage(argv);
 				mainret = 1;
 				goto end;
 			}
@@ -438,7 +438,7 @@ int main(int argc, char **argv)
 			break;
 		case 'B':
 			if (argc < i + 2) {
-				show_usage(argc, argv);
+				show_usage(argv);
 				mainret = 1;
 				goto end;
 			}
@@ -695,11 +695,11 @@ end_pthread_join:
 	}
 	{
 		char msg[1] = { 0x42 };
-		ssize_t ret;
+		ssize_t sret;
 
 		do {
-			ret = write(count_pipe[1], msg, 1);	/* wakeup thread */
-		} while (ret == -1L && errno == EINTR);
+			sret = write(count_pipe[1], msg, 1);	/* wakeup thread */
+		} while (sret == -1L && errno == EINTR);
 	}
 	err = pthread_join(tid_count, &tret);
 	if (err != 0) {