[dhcp-agent-commits] dhcp-agent/src dhcp-client-cache.c,1.7,1.8 dhcp-client-states.c,1.6,1.7 dhcp-sy
Status: Alpha
Brought to you by:
actmodern
From: <act...@us...> - 2002-11-24 01:12:15
|
Update of /cvsroot/dhcp-agent/dhcp-agent/src In directory sc8-pr-cvs1:/tmp/cvs-serv25272/src Modified Files: dhcp-client-cache.c dhcp-client-states.c dhcp-sysconf.c dhcp-timer.c Log Message: fixed up indentation with indent Index: dhcp-client-cache.c =================================================================== RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-client-cache.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** dhcp-client-cache.c 22 Nov 2002 15:30:37 -0000 1.7 --- dhcp-client-cache.c 24 Nov 2002 01:12:12 -0000 1.8 *************** *** 178,182 **** case VARFILE_SUCCESS: ! cache_entry = create_cache_entry(atoi(varfile_get_name(varfile)), varfile_get_name(varfile), varfile_get_val(varfile)); return cache_entry; --- 178,182 ---- case VARFILE_SUCCESS: ! cache_entry = create_cache_entry(atoi(varfile_get_name(varfile)), varfile_get_name(varfile), varfile_get_val(varfile)); return cache_entry; Index: dhcp-client-states.c =================================================================== RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-client-states.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** dhcp-client-states.c 24 Nov 2002 01:10:00 -0000 1.6 --- dhcp-client-states.c 24 Nov 2002 01:12:12 -0000 1.7 *************** *** 151,155 **** { /* just call renew_option_list since it's the same. */ ! return(client_build_renew_option_list(dc)); } --- 151,155 ---- { /* just call renew_option_list since it's the same. */ ! return (client_build_renew_option_list(dc)); } *************** *** 288,296 **** if(next_timer != 0) ! timeout = next_timer/2; ! else timeout = next_timer; ! } else { timeout = RECOMMENDED_MAX_SECS_WAIT; } --- 288,296 ---- if(next_timer != 0) ! timeout = next_timer / 2; ! else timeout = next_timer; ! } else { timeout = RECOMMENDED_MAX_SECS_WAIT; } *************** *** 625,629 **** retval = ! rawnet_packet_transact(dc->rawnet, dc, NULL, client_check_renew, compensate_timeout_with_timer(dc)); switch (retval) { --- 625,630 ---- retval = ! rawnet_packet_transact(dc->rawnet, dc, NULL, client_check_renew, ! compensate_timeout_with_timer(dc)); switch (retval) { *************** *** 669,673 **** retval = ! rawnet_packet_transact(dc->rawnet, dc, NULL, client_check_rebind, compensate_timeout_with_timer(dc)); switch (retval) { --- 670,675 ---- retval = ! rawnet_packet_transact(dc->rawnet, dc, NULL, client_check_rebind, ! compensate_timeout_with_timer(dc)); switch (retval) { *************** *** 684,689 **** default: ! FATAL_MESSAGE ! ("invalid return value from raw network handler -- this a bug report it."); } --- 686,690 ---- default: ! FATAL_MESSAGE("invalid return value from raw network handler -- this a bug report it."); } Index: dhcp-sysconf.c =================================================================== RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-sysconf.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** dhcp-sysconf.c 22 Nov 2002 15:30:38 -0000 1.7 --- dhcp-sysconf.c 24 Nov 2002 01:12:12 -0000 1.8 *************** *** 465,469 **** sysconf_handlers[ce->tag].flag &= ~SYSCONF_DO_CLEANUP; WARN_MESSAGE("unable to setup option: %s", dhcp_option_string_get(ce->tag)); ! } else { --- 465,469 ---- sysconf_handlers[ce->tag].flag &= ~SYSCONF_DO_CLEANUP; WARN_MESSAGE("unable to setup option: %s", dhcp_option_string_get(ce->tag)); ! } else { Index: dhcp-timer.c =================================================================== RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-timer.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** dhcp-timer.c 24 Nov 2002 01:10:00 -0000 1.5 --- dhcp-timer.c 24 Nov 2002 01:12:12 -0000 1.6 *************** *** 118,122 **** uint32_t time_now; ! begin: if(timer->triggers == NULL) --- 118,122 ---- uint32_t time_now; ! begin: if(timer->triggers == NULL) *************** *** 175,177 **** return trigger->seconds; } - --- 175,176 ---- |