upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Warning cleanup

Browse source 
Avoid "cast pointer to int of different size" warning by passing
the int arg to new threads as an offset into rtid/rwtid.
This commit is contained in:
Hallvard Furuseth 2010-11-22 15:44:11 +00:00
parent c62b0553ad
commit 5dd8cc1015
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/progs/slapd-mtread.c
View file

@ -82,6 +82,7 @@ int rt_pass[MAX_THREAD];
int rt_fail[MAX_THREAD]; int rt_fail[MAX_THREAD];
int rwt_pass[MAX_THREAD]; int rwt_pass[MAX_THREAD];
int rwt_fail[MAX_THREAD]; int rwt_fail[MAX_THREAD];
ldap_pvt_thread_t rtid[MAX_THREAD], rwtid[MAX_THREAD];
/* /*
* Shared globals (command line args) * Shared globals (command line args)
@ -174,7 +175,6 @@ main( int argc, char **argv )
int port = -1; int port = -1;
char *manager = NULL; char *manager = NULL;
struct berval passwd = { 0, NULL }; struct berval passwd = { 0, NULL };
ldap_pvt_thread_t rtid[MAX_THREAD], rwtid[MAX_THREAD];
char outstr[BUFSIZ]; char outstr[BUFSIZ];
int ptpass; int ptpass;
int testfail = 0; int testfail = 0;
@ -342,13 +342,13 @@ main( int argc, char **argv )
/* Set up read only threads */ /* Set up read only threads */
for ( i = 0; i < threads; i++ ) { for ( i = 0; i < threads; i++ ) {
ldap_pvt_thread_create( &rtid[i], 0, do_onethread, (void*)i); ldap_pvt_thread_create( &rtid[i], 0, do_onethread, &rtid[i]);
snprintf(outstr, BUFSIZ, "Created RO thread %d [%d]", i, (int)rtid[i]); snprintf(outstr, BUFSIZ, "Created RO thread %d [%d]", i, (int)rtid[i]);
thread_verbose(outstr); thread_verbose(outstr);
} }
/* Set up read/write threads */ /* Set up read/write threads */
for ( i = 0; i < rwthreads; i++ ) { for ( i = 0; i < rwthreads; i++ ) {
ldap_pvt_thread_create( &rwtid[i], 0, do_onerwthread, (void*)i); ldap_pvt_thread_create( &rwtid[i], 0, do_onerwthread, &rwtid[i]);
snprintf(outstr, BUFSIZ, "Created RW thread %d [%d]", i, (int)rwtid[i]); snprintf(outstr, BUFSIZ, "Created RW thread %d [%d]", i, (int)rwtid[i]);
thread_verbose(outstr); thread_verbose(outstr);
} }
@ -405,7 +405,7 @@ do_onethread( void *arg )
int me = whoami(); int me = whoami();
char thrstr[BUFSIZ]; char thrstr[BUFSIZ];
int rc, refcnt = 0; int rc, refcnt = 0;
int myidx = (int)arg; int myidx = (ldap_pvt_thread_t *)arg - rtid;
mlds = (LDAP **) calloc( sizeof(LDAP *), noconns); mlds = (LDAP **) calloc( sizeof(LDAP *), noconns);
if (mlds == NULL) { if (mlds == NULL) {
@ -472,7 +472,7 @@ do_onerwthread( void *arg )
int adds = 0; int adds = 0;
int dels = 0; int dels = 0;
int rc, refcnt = 0; int rc, refcnt = 0;
int myidx = (int)arg; int myidx = (ldap_pvt_thread_t *)arg - rwtid;
mlds = (LDAP **) calloc( sizeof(LDAP *), noconns); mlds = (LDAP **) calloc( sizeof(LDAP *), noconns);
if (mlds == NULL) { if (mlds == NULL) {