X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap_r%2Frq.c;h=ccd255949e003e70500443f85231c555b49d41d7;hb=e22dc83ac096d1239a6903199f5dc3231b0f444b;hp=7b775f61f1898f646f4b4ffbbd30716a7bf57652;hpb=2d06c4fe2df486bbfbc9cacc777b94a763736dab;p=openldap diff --git a/libraries/libldap_r/rq.c b/libraries/libldap_r/rq.c index 7b775f61f1..ccd255949e 100644 --- a/libraries/libldap_r/rq.c +++ b/libraries/libldap_r/rq.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2003-2005 The OpenLDAP Foundation. + * Copyright 2003-2009 The OpenLDAP Foundation. * Portions Copyright 2003 IBM Corporation. * All rights reserved. * @@ -99,20 +99,16 @@ ldap_pvt_runqueue_remove( struct re_s* ldap_pvt_runqueue_next_sched( struct runqueue_s* rq, - struct timeval** next_run + struct timeval* next_run ) { struct re_s* entry; entry = LDAP_STAILQ_FIRST( &rq->task_list ); - if ( entry == NULL ) { - *next_run = NULL; - return NULL; - } else if ( entry->next_sched.tv_sec == 0 ) { - *next_run = NULL; + if ( entry == NULL || entry->next_sched.tv_sec == 0 ) { return NULL; } else { - *next_run = &entry->next_sched; + *next_run = entry->next_sched; return entry; } }