mturk 2004/12/07 05:23:14 Modified: jk/native/common jk_lb_worker.c jk_uri_worker_map.c jk_util.c Log: Fix compile time warnings Revision Changes Path 1.34 +2 -3 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c Index: jk_lb_worker.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- jk_lb_worker.c 7 Dec 2004 12:24:53 -0000 1.33 +++ jk_lb_worker.c 7 Dec 2004 13:23:14 -0000 1.34 @@ -343,8 +343,7 @@ { worker_record_t *rc = NULL; char *sessionid = NULL; - int total_factor = 0; - int domain_id =-1; + int domain_id = -1; JK_TRACE_ENTER(l); if (p->sticky_session) { 1.34 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c Index: jk_uri_worker_map.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- jk_uri_worker_map.c 30 Nov 2004 07:30:42 -0000 1.33 +++ jk_uri_worker_map.c 7 Dec 2004 13:23:14 -0000 1.34 @@ -295,7 +295,7 @@ if (uri[0] == '/') { char *asterisk = strchr(uri, '*'); - if (asterisk && strchr(asterisk + 1, '*') || + if ((asterisk && strchr(asterisk + 1, '*')) || strchr(uri, '?')) { uwr->uri = jk_pool_strdup(&uw_map->p, uri); @@ -548,7 +548,7 @@ char *uri, jk_logger_t *l) { unsigned int i; - unsigned int best_match = -1; + int best_match = -1; unsigned int longest_match = 0; char *url_rewrite; 1.46 +2 -3 jakarta-tomcat-connectors/jk/native/common/jk_util.c Index: jk_util.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- jk_util.c 7 Dec 2004 12:24:53 -0000 1.45 +++ jk_util.c 7 Dec 2004 13:23:14 -0000 1.46 @@ -1036,8 +1036,7 @@ pthread_getunique_np(&t, &tid);
return ((int)(tid.intId.lo & 0xFFFFFFFF)); #else - int tid = 0; - pthread_getunique_np(&t, &tid); + int tid = (int)(t & 0xFFFF); return tid; #endif /* AS400 */ } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]