Changeset a35b458 in mainline for uspace/lib/c/generic/dnsr.c


Ignore:
Timestamp:
2018-03-02T20:10:49Z (7 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/lib/c/generic/dnsr.c

    r3061bc1 ra35b458  
    4545{
    4646        fibril_mutex_lock(&dnsr_sess_mutex);
    47        
     47
    4848        if (dnsr_sess == NULL) {
    4949                service_id_t dnsr_svc;
    50                
     50
    5151                (void) loc_service_get_id(SERVICE_NAME_DNSR, &dnsr_svc,
    5252                    IPC_FLAG_BLOCKING);
    53                
     53
    5454                dnsr_sess = loc_service_connect(dnsr_svc, INTERFACE_DNSR,
    5555                    IPC_FLAG_BLOCKING);
    5656        }
    57        
     57
    5858        async_sess_t *sess = dnsr_sess;
    5959        fibril_mutex_unlock(&dnsr_sess_mutex);
    60        
     60
    6161        return async_exchange_begin(sess);
    6262}
     
    7070{
    7171        async_exch_t *exch = dnsr_exchange_begin();
    72        
     72
    7373        ipc_call_t answer;
    7474        aid_t req = async_send_1(exch, DNSR_NAME2HOST, (sysarg_t) ver,
    7575            &answer);
    76        
     76
    7777        errno_t rc = async_data_write_start(exch, name, str_size(name));
    7878        if (rc != EOK) {
     
    8585        if (info == NULL)
    8686                return ENOMEM;
    87        
     87
    8888        ipc_call_t answer_addr;
    8989        aid_t req_addr = async_data_read(exch, &info->addr,
    9090            sizeof(inet_addr_t), &answer_addr);
    91        
     91
    9292        errno_t retval_addr;
    9393        async_wait_for(req_addr, &retval_addr);
    94        
     94
    9595        if (retval_addr != EOK) {
    9696                async_exchange_end(exch);
     
    9999                return retval_addr;
    100100        }
    101        
     101
    102102        ipc_call_t answer_cname;
    103103        char cname_buf[DNSR_NAME_MAX_SIZE + 1];
    104104        aid_t req_cname = async_data_read(exch, cname_buf, DNSR_NAME_MAX_SIZE,
    105105            &answer_cname);
    106        
     106
    107107        dnsr_exchange_end(exch);
    108        
     108
    109109        errno_t retval_cname;
    110110        async_wait_for(req_cname, &retval_cname);
    111        
     111
    112112        if (retval_cname != EOK) {
    113113                async_forget(req);
     
    115115                return retval_cname;
    116116        }
    117        
     117
    118118        errno_t retval;
    119119        async_wait_for(req, &retval);
    120        
     120
    121121        if (retval != EOK) {
    122122                async_forget(req);
     
    124124                return retval;
    125125        }
    126        
     126
    127127        size_t act_size = IPC_GET_ARG2(answer_cname);
    128128        assert(act_size <= DNSR_NAME_MAX_SIZE);
    129        
     129
    130130        cname_buf[act_size] = '\0';
    131        
     131
    132132        info->cname = str_dup(cname_buf);
    133        
     133
    134134        if (info->cname == NULL) {
    135135                free(info);
     
    145145        if (info == NULL)
    146146                return;
    147        
     147
    148148        free(info->cname);
    149149        free(info);
     
    153153{
    154154        async_exch_t *exch = dnsr_exchange_begin();
    155        
     155
    156156        ipc_call_t answer;
    157157        aid_t req = async_send_0(exch, DNSR_GET_SRVADDR, &answer);
    158158        errno_t rc = async_data_read_start(exch, srvaddr, sizeof(inet_addr_t));
    159        
     159
    160160        loc_exchange_end(exch);
    161        
     161
    162162        if (rc != EOK) {
    163163                async_forget(req);
    164164                return rc;
    165165        }
    166        
     166
    167167        errno_t retval;
    168168        async_wait_for(req, &retval);
    169        
     169
    170170        return retval;
    171171}
     
    174174{
    175175        async_exch_t *exch = dnsr_exchange_begin();
    176        
     176
    177177        ipc_call_t answer;
    178178        aid_t req = async_send_0(exch, DNSR_SET_SRVADDR, &answer);
    179179        errno_t rc = async_data_write_start(exch, srvaddr, sizeof(inet_addr_t));
    180        
     180
    181181        loc_exchange_end(exch);
    182        
     182
    183183        if (rc != EOK) {
    184184                async_forget(req);
    185185                return rc;
    186186        }
    187        
     187
    188188        errno_t retval;
    189189        async_wait_for(req, &retval);
    190        
     190
    191191        return retval;
    192192}
Note: See TracChangeset for help on using the changeset viewer.