Skip to content

Commit

Permalink
Remove unused return code from ni_dhcp4_fsm_release
Browse files Browse the repository at this point in the history
Signed-off-by: Olaf Hering <olaf@aepfle.de>
  • Loading branch information
olafhering committed Aug 29, 2014
1 parent f4f7110 commit 383aef3
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
4 changes: 1 addition & 3 deletions dhcp4/device.c
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,6 @@ ni_dhcp4_release(ni_dhcp4_device_t *dev, const ni_uuid_t *lease_uuid)
{
char *rel_uuid = NULL;
char *our_uuid = NULL;
int rv;

if (dev->lease == NULL) {
ni_error("%s: no lease set", dev->ifname);
Expand All @@ -454,8 +453,7 @@ ni_dhcp4_release(ni_dhcp4_device_t *dev, const ni_uuid_t *lease_uuid)
* server's reply. We just keep our fingers crossed that it's
* getting out. If it doesn't, it's rather likely the network
* is hosed anyway, so there's little point in delaying. */
if ((rv = ni_dhcp4_fsm_release(dev)) < 0)
return rv;
ni_dhcp4_fsm_release(dev);

ni_dhcp4_device_stop(dev);
return 0;
Expand Down
2 changes: 1 addition & 1 deletion dhcp4/dhcp.h
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ extern int ni_dhcp4_acquire(ni_dhcp4_device_t *, const ni_dhcp4_request_t *);
extern int ni_dhcp4_release(ni_dhcp4_device_t *, const ni_uuid_t *);
extern void ni_dhcp4_restart_leases(void);

extern int ni_dhcp4_fsm_release(ni_dhcp4_device_t *);
extern void ni_dhcp4_fsm_release(ni_dhcp4_device_t *);
extern int ni_dhcp4_fsm_process_dhcp4_packet(ni_dhcp4_device_t *, ni_buffer_t *);
extern int ni_dhcp4_fsm_commit_lease(ni_dhcp4_device_t *, ni_addrconf_lease_t *);
extern int ni_dhcp4_recover_lease(ni_dhcp4_device_t *);
Expand Down
4 changes: 1 addition & 3 deletions dhcp4/fsm.c
Original file line number Diff line number Diff line change
Expand Up @@ -370,20 +370,18 @@ ni_dhcp4_fsm_decline(ni_dhcp4_device_t *dev)
ni_dhcp4_fsm_set_timeout(dev, 10);
}

int
void
ni_dhcp4_fsm_release(ni_dhcp4_device_t *dev)
{
if (!dev->config) {
ni_debug_dhcp("%s: not configured, dropping lease", dev->ifname);
ni_dhcp4_fsm_commit_lease(dev, NULL);
return 0;
}

ni_debug_dhcp("%s: releasing lease", dev->ifname);
ni_dhcp4_device_send_message(dev, DHCP4_RELEASE, dev->lease);

ni_dhcp4_fsm_commit_lease(dev, NULL);
return 0;
}

/*
Expand Down

0 comments on commit 383aef3

Please sign in to comment.