Changeset a35b458 in mainline for uspace/srv/net/dhcp/dhcp.c


Ignore:
Timestamp:
2018-03-02T20:10:49Z (6 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f1380b7
Parents:
3061bc1
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)
Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/dhcp/dhcp.c

    r3061bc1 ra35b458  
    430430
    431431        dlink->retries_left = dhcp_discover_retries;
    432        
     432
    433433        if ((dlink->timeout->state == fts_not_set) ||
    434434            (dlink->timeout->state == fts_fired))
    435435                fibril_timer_set(dlink->timeout, dhcp_discover_timeout_val,
    436436                    dhcpsrv_discover_timeout, dlink);
    437        
     437
    438438        return rc;
    439439}
     
    507507{
    508508        log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcpsrv_link_add(%zu)", link_id);
    509        
     509
    510510        dhcp_link_t *dlink = dhcpsrv_link_find(link_id);
    511        
     511
    512512        if (dlink == NULL) {
    513513                log_msg(LOG_DEFAULT, LVL_NOTE, "Link %zu doesn't exist",
     
    515515                return EINVAL;
    516516        }
    517        
     517
    518518        return dhcp_discover_proc(dlink);
    519519}
Note: See TracChangeset for help on using the changeset viewer.