Tweak recently-added tests to suppress scary-looking warnings on 64-bit

tglsfdc · tglsfdc · commit 6cbb2353cbd4 · 2007-10-03T15:59:13.000Z
machines about casts between pointers and integers of different sizes.
While they're harmless, we shouldn't expect users to have to go through
and figure that out for themselves.
diff --git a/src/interfaces/ecpg/test/expected/thread-alloc.c b/src/interfaces/ecpg/test/expected/thread-alloc.c
@@ -145,7 +145,7 @@ static void* fn(void* arg)
 #line 42 "alloc.pgc"
 
 
-	value = (int)arg;
+	value = (long)arg;
 	sprintf(name, "Connection: %d", value);
 
 	{ ECPGconnect(__LINE__, 0, "regress1" , NULL, NULL , name, 0); 
@@ -207,7 +207,7 @@ int main (int argc, char** argv)
 		CloseHandle(threads[i]);
 #else
 	for (i = 0; i < THREADS; ++i)
-		pthread_create(&threads[i], NULL, fn, (void*)i);
+		pthread_create(&threads[i], NULL, fn, (void *) (long) i);
 	for (i = 0; i < THREADS; ++i)
 		pthread_join(threads[i], NULL);
 #endif
diff --git a/src/interfaces/ecpg/test/expected/thread-prep.c b/src/interfaces/ecpg/test/expected/thread-prep.c
@@ -145,7 +145,7 @@ static void* fn(void* arg)
 #line 42 "prep.pgc"
 
 
-	value = (int)arg;
+	value = (long)arg;
 	sprintf(name, "Connection: %d", value);
 
 	{ ECPGconnect(__LINE__, 0, "regress1" , NULL, NULL , name, 0); 
@@ -245,7 +245,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 		CloseHandle(threads[i]);
 #else
 	for (i = 0; i < THREADS; ++i)
-		pthread_create(&threads[i], NULL, fn, (void*)i);
+		pthread_create(&threads[i], NULL, fn, (void *) (long) i);
 	for (i = 0; i < THREADS; ++i)
 		pthread_join(threads[i], NULL);
 #endif
diff --git a/src/interfaces/ecpg/test/expected/thread-thread.c b/src/interfaces/ecpg/test/expected/thread-thread.c
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
   for( n = 0; n < nthreads; n++ )
     {
 #ifndef WIN32
-      pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1));
+      pthread_create(&threads[n], NULL, test_thread, (void *) (long) (n + 1));
 #else
       threads[n] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)test_thread, (void *) (n + 1), 0, NULL);
 #endif
diff --git a/src/interfaces/ecpg/test/expected/thread-thread_implicit.c b/src/interfaces/ecpg/test/expected/thread-thread_implicit.c
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
   for( n = 0; n < nthreads; n++ )
     {
 #ifndef WIN32
-      pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1));
+      pthread_create(&threads[n], NULL, test_thread, (void *) (long) (n + 1));
 #else
       threads[n] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) test_thread, (void *) (n+1), 0, NULL);
 #endif
diff --git a/src/interfaces/ecpg/test/thread/alloc.pgc b/src/interfaces/ecpg/test/thread/alloc.pgc
@@ -41,7 +41,7 @@ static void* fn(void* arg)
 	char **r = NULL;
 	EXEC SQL END DECLARE SECTION;
 
-	value = (int)arg;
+	value = (long)arg;
 	sprintf(name, "Connection: %d", value);
 
 	EXEC SQL CONNECT TO REGRESSDB1 AS :name;
@@ -78,7 +78,7 @@ int main (int argc, char** argv)
 		CloseHandle(threads[i]);
 #else
 	for (i = 0; i < THREADS; ++i)
-		pthread_create(&threads[i], NULL, fn, (void*)i);
+		pthread_create(&threads[i], NULL, fn, (void *) (long) i);
 	for (i = 0; i < THREADS; ++i)
 		pthread_join(threads[i], NULL);
 #endif
diff --git a/src/interfaces/ecpg/test/thread/prep.pgc b/src/interfaces/ecpg/test/thread/prep.pgc
@@ -41,7 +41,7 @@ static void* fn(void* arg)
 	char query[256] = "INSERT INTO T VALUES ( ? )";
 	EXEC SQL END DECLARE SECTION;
 
-	value = (int)arg;
+	value = (long)arg;
 	sprintf(name, "Connection: %d", value);
 
 	EXEC SQL CONNECT TO REGRESSDB1 AS :name;
@@ -84,7 +84,7 @@ int main (int argc, char** argv)
 		CloseHandle(threads[i]);
 #else
 	for (i = 0; i < THREADS; ++i)
-		pthread_create(&threads[i], NULL, fn, (void*)i);
+		pthread_create(&threads[i], NULL, fn, (void *) (long) i);
 	for (i = 0; i < THREADS; ++i)
 		pthread_join(threads[i], NULL);
 #endif
diff --git a/src/interfaces/ecpg/test/thread/thread.pgc b/src/interfaces/ecpg/test/thread/thread.pgc
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
   for( n = 0; n < nthreads; n++ )
     {
 #ifndef WIN32
-      pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1));
+      pthread_create(&threads[n], NULL, test_thread, (void *) (long) (n + 1));
 #else
       threads[n] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)test_thread, (void *) (n + 1), 0, NULL);
 #endif
diff --git a/src/interfaces/ecpg/test/thread/thread_implicit.pgc b/src/interfaces/ecpg/test/thread/thread_implicit.pgc
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
   for( n = 0; n < nthreads; n++ )
     {
 #ifndef WIN32
-      pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1));
+      pthread_create(&threads[n], NULL, test_thread, (void *) (long) (n + 1));
 #else
       threads[n] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) test_thread, (void *) (n+1), 0, NULL);
 #endif

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ int main(int argc, char *argv[])`
`96`	`96`	`for( n = 0; n < nthreads; n++ )`
`97`	`97`	`{`
`98`	`98`	`#ifndef WIN32`
`99`		`- pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1));`
	`99`	`+ pthread_create(&threads[n], NULL, test_thread, (void *) (long) (n + 1));`
`100`	`100`	`#else`
`101`	`101`	`threads[n] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)test_thread, (void *) (n + 1), 0, NULL);`
`102`	`102`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ int main(int argc, char *argv[])`
`97`	`97`	`for( n = 0; n < nthreads; n++ )`
`98`	`98`	`{`
`99`	`99`	`#ifndef WIN32`
`100`		`- pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1));`
	`100`	`+ pthread_create(&threads[n], NULL, test_thread, (void *) (long) (n + 1));`
`101`	`101`	`#else`
`102`	`102`	`threads[n] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) test_thread, (void *) (n+1), 0, NULL);`
`103`	`103`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ int main(int argc, char *argv[])`
`64`	`64`	`for( n = 0; n < nthreads; n++ )`
`65`	`65`	`{`
`66`	`66`	`#ifndef WIN32`
`67`		`- pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1));`
	`67`	`+ pthread_create(&threads[n], NULL, test_thread, (void *) (long) (n + 1));`
`68`	`68`	`#else`
`69`	`69`	`threads[n] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)test_thread, (void *) (n + 1), 0, NULL);`
`70`	`70`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ int main(int argc, char *argv[])`
`65`	`65`	`for( n = 0; n < nthreads; n++ )`
`66`	`66`	`{`
`67`	`67`	`#ifndef WIN32`
`68`		`- pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1));`
	`68`	`+ pthread_create(&threads[n], NULL, test_thread, (void *) (long) (n + 1));`
`69`	`69`	`#else`
`70`	`70`	`threads[n] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) test_thread, (void *) (n+1), 0, NULL);`
`71`	`71`	`#endif`