NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit6cbb235

committed

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

machines about casts between pointers and integers of different sizes.While they're harmless, we shouldn't expect users to have to go throughand figure that out for themselves.

1 parent2b0e46e commit6cbb235Copy full SHA for 6cbb235

File tree

8 files changed

+12

-12

lines changed

src/interfaces/ecpg/test
- expected
- thread

8 files changed

+12

-12

lines changed

`‎src/interfaces/ecpg/test/expected/thread-alloc.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ static void* fn(void* arg)`
`145`	`145`	`#line 42 "alloc.pgc"`
`146`	`146`
`147`	`147`
`148`		`-value= (int)arg;`
	`148`	`+value= (long)arg;`
`149`	`149`	`sprintf(name,"Connection: %d",value);`
`150`	`150`
`151`	`151`	`{ECPGconnect(__LINE__,0,"regress1" ,NULL,NULL ,name,0);`
`@@ -207,7 +207,7 @@ int main (int argc, char** argv)`
`207`	`207`	`CloseHandle(threads[i]);`
`208`	`208`	`#else`
`209`	`209`	`for (i=0;i<THREADS;++i)`
`210`		`-pthread_create(&threads[i],NULL,fn, (void*)i);`
	`210`	`+pthread_create(&threads[i],NULL,fn, (void*) (long)i);`
`211`	`211`	`for (i=0;i<THREADS;++i)`
`212`	`212`	`pthread_join(threads[i],NULL);`
`213`	`213`	`#endif`

`‎src/interfaces/ecpg/test/expected/thread-prep.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ static void* fn(void* arg)`
`145`	`145`	`#line 42 "prep.pgc"`
`146`	`146`
`147`	`147`
`148`		`-value= (int)arg;`
	`148`	`+value= (long)arg;`
`149`	`149`	`sprintf(name,"Connection: %d",value);`
`150`	`150`
`151`	`151`	`{ECPGconnect(__LINE__,0,"regress1" ,NULL,NULL ,name,0);`
`@@ -245,7 +245,7 @@ if (sqlca.sqlcode < 0) sqlprint();}`
`245`	`245`	`CloseHandle(threads[i]);`
`246`	`246`	`#else`
`247`	`247`	`for (i=0;i<THREADS;++i)`
`248`		`-pthread_create(&threads[i],NULL,fn, (void*)i);`
	`248`	`+pthread_create(&threads[i],NULL,fn, (void*) (long)i);`
`249`	`249`	`for (i=0;i<THREADS;++i)`
`250`	`250`	`pthread_join(threads[i],NULL);`
`251`	`251`	`#endif`

`‎src/interfaces/ecpg/test/expected/thread-thread.c`

Lines changed: 1 addition & 1 deletion

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`	`#ifndefWIN32`
`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`

`‎src/interfaces/ecpg/test/expected/thread-thread_implicit.c`

Lines changed: 1 addition & 1 deletion

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`	`#ifndefWIN32`
`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`

`‎src/interfaces/ecpg/test/thread/alloc.pgc`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ static void* fn(void* arg)`
`41`	`41`	`char **r = NULL;`
`42`	`42`	`EXEC SQL END DECLARE SECTION;`
`43`	`43`
`44`		`-value = (int)arg;`
	`44`	`+value = (long)arg;`
`45`	`45`	`sprintf(name, "Connection: %d", value);`
`46`	`46`
`47`	`47`	`EXEC SQL CONNECT TO REGRESSDB1 AS :name;`
`@@ -78,7 +78,7 @@ int main (int argc, char** argv)`
`78`	`78`	`CloseHandle(threads[i]);`
`79`	`79`	`#else`
`80`	`80`	`for (i = 0; i < THREADS; ++i)`
`81`		`-pthread_create(&threads[i], NULL, fn, (void*)i);`
	`81`	`+pthread_create(&threads[i], NULL, fn, (void *) (long)i);`
`82`	`82`	`for (i = 0; i < THREADS; ++i)`
`83`	`83`	`pthread_join(threads[i], NULL);`
`84`	`84`	`#endif`

`‎src/interfaces/ecpg/test/thread/prep.pgc`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ static void* fn(void* arg)`
`41`	`41`	`char query[256] = "INSERT INTO T VALUES ( ? )";`
`42`	`42`	`EXEC SQL END DECLARE SECTION;`
`43`	`43`
`44`		`-value = (int)arg;`
	`44`	`+value = (long)arg;`
`45`	`45`	`sprintf(name, "Connection: %d", value);`
`46`	`46`
`47`	`47`	`EXEC SQL CONNECT TO REGRESSDB1 AS :name;`
`@@ -84,7 +84,7 @@ int main (int argc, char** argv)`
`84`	`84`	`CloseHandle(threads[i]);`
`85`	`85`	`#else`
`86`	`86`	`for (i = 0; i < THREADS; ++i)`
`87`		`-pthread_create(&threads[i], NULL, fn, (void*)i);`
	`87`	`+pthread_create(&threads[i], NULL, fn, (void *) (long)i);`
`88`	`88`	`for (i = 0; i < THREADS; ++i)`
`89`	`89`	`pthread_join(threads[i], NULL);`
`90`	`90`	`#endif`

`‎src/interfaces/ecpg/test/thread/thread.pgc`

Lines changed: 1 addition & 1 deletion

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`

`‎src/interfaces/ecpg/test/thread/thread_implicit.pgc`

Lines changed: 1 addition & 1 deletion

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`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit6cbb235

File tree

8 files changed

8 files changed

`‎src/interfaces/ecpg/test/expected/thread-alloc.c`

`‎src/interfaces/ecpg/test/expected/thread-prep.c`

`‎src/interfaces/ecpg/test/expected/thread-thread.c`

`‎src/interfaces/ecpg/test/expected/thread-thread_implicit.c`

`‎src/interfaces/ecpg/test/thread/alloc.pgc`

`‎src/interfaces/ecpg/test/thread/prep.pgc`

`‎src/interfaces/ecpg/test/thread/thread.pgc`

`‎src/interfaces/ecpg/test/thread/thread_implicit.pgc`

0 commit comments