Changeset 102f641 in mainline for uspace/lib/c


Ignore:
Timestamp:
2019-09-02T19:01:50Z (6 years ago)
Author:
Matthieu Riolo <matthieu.riolo@…>
Children:
25697163
Parents:
241f1985
Message:

Correcting syntax according to ccheck

Location:
uspace/lib/c
Files:
18 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/generic/adt/dyn_array.c

    r241f1985 r102f641  
    4444#include <stdlib.h>
    4545
    46 
    47 
    48 
    4946static int dyn_array_realloc(dyn_array_t *da, size_t capacity)
    5047{
     
    7471        _dyn_array_unshift(da, index, 1);
    7572        int rc = dyn_array_reserve(da, da->size);
    76         assert(rc == EOK);
     73        assert(rc == EOK);
    7774}
    7875
     
    9693        _dyn_array_unshift(da, begin, end - begin);
    9794        int rc = dyn_array_reserve(da, da->size);
    98         assert(rc == EOK);
     95        assert(rc == EOK);
    9996}
    10097
     
    192189}
    193190
    194 
    195191/** @}
    196192 */
  • uspace/lib/c/generic/async/client.c

    r241f1985 r102f641  
    164164static FIBRIL_CONDVAR_INITIALIZE(avail_phone_cv);
    165165
    166 
    167166/** Create session for existing phone
    168167 *
    169168 * @return session on success, NULL on error
    170169 */
    171  
     170
    172171async_sess_t *create_session(cap_phone_handle_t phone, exch_mgmt_t mgmt,
    173172    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3)
     
    181180                session->arg2 = arg2;
    182181                session->arg3 = arg3;
    183                
     182
    184183                fibril_mutex_initialize(&session->remote_state_mtx);
    185184                session->remote_state_data = NULL;
    186                
     185
    187186                list_initialize(&session->exch_list);
    188187                fibril_mutex_initialize(&session->mutex);
  • uspace/lib/c/generic/async/server.c

    r241f1985 r102f641  
    226226void async_set_implicit_connection(async_port_handler_t conn)
    227227{
    228         assert(implicit_connection == NULL);
    229         implicit_connection = conn;
    230 }
    231 
     228        assert(implicit_connection == NULL);
     229        implicit_connection = conn;
     230}
    232231
    233232static fibril_rmutex_t client_mutex;
  • uspace/lib/c/generic/libc.c

    r241f1985 r102f641  
    5454#include "private/taskman.h"
    5555
    56 
    5756#ifdef CONFIG_RTLD
    5857#include <rtld/rtld.h>
     
    119118        }
    120119#endif
    121        
     120
    122121        /* Setup async framework and taskman connection */
    123122        __async_server_init();
  • uspace/lib/c/generic/loader.c

    r241f1985 r102f641  
    6868        if (ldr == NULL)
    6969                return NULL;
    70        
     70
    7171        async_sess_t *sess = taskman_session_loader();
    7272        if (sess == NULL) {
  • uspace/lib/c/generic/private/async.h

    r241f1985 r102f641  
    108108extern void async_reply_received(ipc_call_t *);
    109109extern async_sess_t *create_session(cap_phone_handle_t, exch_mgmt_t,
    110         sysarg_t, sysarg_t, sysarg_t);
     110    sysarg_t, sysarg_t, sysarg_t);
    111111extern cap_phone_handle_t async_session_phone(async_sess_t *);
    112112
  • uspace/lib/c/generic/task.c

    r241f1985 r102f641  
    115115        async_exch_t *exch = taskman_exchange_begin();
    116116        if (exch == NULL)
    117                         return EIO;
     117                return EIO;
    118118
    119119        wait->aid = async_send_3(exch, TASKMAN_WAIT, LOWER32(id), UPPER32(id),
     
    388388                if (wait->flags & TASK_WAIT_RETVAL && retval)
    389389                        *retval = ipc_get_arg2(&wait->result);
    390                
    391390        }
    392391
     
    440439        errno_t rc = async_req_2_0(exch, TASKMAN_RETVAL, val, wait_for_exit);
    441440        taskman_exchange_end(exch);
    442        
     441
    443442        return rc;
    444443}
  • uspace/lib/c/generic/task_event.c

    r241f1985 r102f641  
    6363        while (true) {
    6464                ipc_call_t call;
    65                
     65
    6666                if (!async_get_call(&call) || !ipc_get_imethod(&call)) {
    6767                        /* Hangup, end of game */
     
    9999        port_id_t port;
    100100        errno_t rc = async_create_callback_port(exch, INTERFACE_TASKMAN_CB, 0, 0,
    101                 taskman_event_conn, NULL, &port);
     101            taskman_event_conn, NULL, &port);
    102102        taskman_exchange_end(exch);
    103103
  • uspace/lib/c/generic/taskman.c

    r241f1985 r102f641  
    3232/** @file
    3333 */
    34 
    3534
    3635#include <async.h>
     
    8685                aid_t req = async_send_0(exch, TASKMAN_NEW_TASK, NULL);
    8786                async_exchange_end(exch);
    88                
     87
    8988                if (req) {
    9089                        async_forget(req);
     
    104103
    105104        async_sess_t *sess = async_connect_me_to(exch, INTERFACE_NS,
    106                 TASKMAN_CONNECT_TO_NS, 0);
     105            TASKMAN_CONNECT_TO_NS, 0);
    107106        async_exchange_end(exch);
    108107
     
    170169}
    171170
    172 
    173 
    174171/** @}
    175172 */
  • uspace/lib/c/generic/taskman_noasync.c

    r241f1985 r102f641  
    4444#include <taskman_noasync.h>
    4545
    46 
    47 
    48 
    4946/** Tell taskman we are his NS
    5047 *
     
    6764}
    6865
    69 
    7066void task_retval_noasync(errno_t retval)
    7167{
  • uspace/lib/c/include/adt/dyn_array.h

    r241f1985 r102f641  
    6060        _dyn_array_initialize((dyn_array), sizeof(type))
    6161
    62 
    6362/** Dynamic array accessor
    6463 *
     
    6867        (*((type *) (dyn_array)->_data + index))
    6968
    70 
    7169/** Access last element
    7270 *
     
    7573#define dyn_array_last(dyn_array, type)                                        \
    7674        (*((type *) (dyn_array)->_data + ((dyn_array)->size - 1)))
    77 
    7875
    7976/** Insert item at given position, shift rest of array
     
    10198#define dyn_array_append(dyn_array, type, value)                               \
    10299        dyn_array_insert(dyn_array, type, (dyn_array)->size, (value))
    103 
    104100
    105101/** Dynamic array iteration
  • uspace/lib/c/include/ipc/common.h

    r241f1985 r102f641  
    4646/**
    4747 * IPC_FLAG_AUTOSTART_ is for use in brokers only. In clinet code use
    48  * IPC_AUTOSTART that includes implies blocking behavior. */
     48 * IPC_AUTOSTART that includes implies blocking behavior.
     49 */
    4950#define IPC_FLAG_AUTOSTART_  0x02
    5051
  • uspace/lib/c/include/ipc/services.h

    r241f1985 r102f641  
    6767#define SERVICE_NAME_VOLSRV   "volsrv"
    6868
    69 
    7069#define LOC_DEVICE_NAMESPACE         "devices"
    7170#define LOC_UNIT_NAMESPACE_SEPARATOR "__"
  • uspace/lib/c/include/ipc/taskman.h

    r241f1985 r102f641  
    3838#include <ipc/common.h>
    3939
    40 
    4140typedef enum {
    4241        TASKMAN_WAIT = IPC_FIRST_USER_METHOD,
  • uspace/lib/c/include/loader/pcb.h

    r241f1985 r102f641  
    6363        /** Session to taskman (typically spawn parent) */
    6464        async_sess_t *session_taskman;
    65        
     65
    6666        /** Current working directory. */
    6767        char *cwd;
  • uspace/lib/c/include/taskman_noasync.h

    r241f1985 r102f641  
    3636#define LIBC_TASKMAN_NOASYNC_H_
    3737
    38 
    3938/* Internal functions to be used by NS only */
    4039extern int taskman_intro_ns_noasync(void);
  • uspace/lib/c/include/types/task.h

    r241f1985 r102f641  
    5151} task_wait_t;
    5252
    53 typedef void (* task_event_handler_t)(task_id_t, int, task_exit_t, int);
     53typedef void (*task_event_handler_t)(task_id_t, int, task_exit_t, int);
    5454
    5555#endif
  • uspace/lib/c/test/dyn_array.c

    r241f1985 r102f641  
    3838static dyn_array_t da;
    3939
    40 PCUT_TEST_BEFORE {
     40PCUT_TEST_BEFORE
     41{
    4142        dyn_array_initialize(&da, data_t);
    4243        int rc = dyn_array_reserve(&da, 3);
     
    4445}
    4546
    46 PCUT_TEST_AFTER {
     47PCUT_TEST_AFTER
     48{
    4749        dyn_array_destroy(&da);
    4850}
    4951
    50 PCUT_TEST(initialization) {
     52PCUT_TEST(initialization)
     53{
    5154        PCUT_ASSERT_INT_EQUALS(da.capacity, 3);
    5255        PCUT_ASSERT_INT_EQUALS(da.size, 0);
    5356}
    5457
    55 PCUT_TEST(append) {
     58PCUT_TEST(append)
     59{
    5660        dyn_array_append(&da, data_t, 42);
    5761        dyn_array_append(&da, data_t, 666);
     
    6266}
    6367
    64 PCUT_TEST(assign) {
     68PCUT_TEST(assign)
     69{
    6570        dyn_array_append(&da, data_t, 42);
    6671        dyn_array_at(&da, data_t, 0) = 112;
     
    6974}
    7075
    71 PCUT_TEST(remove) {
     76PCUT_TEST(remove)
     77{
    7278        dyn_array_append(&da, data_t, 10);
    7379        dyn_array_append(&da, data_t, 11);
     
    7985}
    8086
    81 PCUT_TEST(insert) {
     87PCUT_TEST(insert)
     88{
    8289        dyn_array_append(&da, data_t, 10);
    8390        dyn_array_append(&da, data_t, 11);
     
    9299}
    93100
    94 PCUT_TEST(capacity_grow) {
     101PCUT_TEST(capacity_grow)
     102{
    95103        dyn_array_append(&da, data_t, 42);
    96104        dyn_array_append(&da, data_t, 666);
     
    101109}
    102110
    103 PCUT_TEST(capacity_shrink) {
     111PCUT_TEST(capacity_shrink)
     112{
    104113        dyn_array_append(&da, data_t, 42);
    105114        dyn_array_append(&da, data_t, 666);
     
    113122}
    114123
    115 PCUT_TEST(iterator) {
     124PCUT_TEST(iterator)
     125{
    116126        for (int i = 0; i < 10; ++i) {
    117                 dyn_array_append(&da, data_t, i*i);
     127                dyn_array_append(&da, data_t, i * i);
    118128        }
    119129
    120130        int i = 0;
    121131        dyn_array_foreach(da, data_t, it) {
    122                 PCUT_ASSERT_INT_EQUALS(i*i, *it);
     132                PCUT_ASSERT_INT_EQUALS(i * i, *it);
    123133                ++i;
    124134        }
    125135}
    126136
    127 PCUT_TEST(find) {
     137PCUT_TEST(find)
     138{
    128139        dyn_array_append(&da, data_t, 10);
    129140        dyn_array_append(&da, data_t, 11);
     
    136147}
    137148
    138 PCUT_TEST(clear_range_middle) {
     149PCUT_TEST(clear_range_middle)
     150{
    139151        dyn_array_append(&da, data_t, 10);
    140152        dyn_array_append(&da, data_t, 11);
     
    148160}
    149161
    150 PCUT_TEST(clear_range_begin) {
     162PCUT_TEST(clear_range_begin)
     163{
    151164        dyn_array_append(&da, data_t, 10);
    152165        dyn_array_append(&da, data_t, 11);
     
    160173}
    161174
    162 PCUT_TEST(clear_range_end) {
     175PCUT_TEST(clear_range_end)
     176{
    163177        dyn_array_append(&da, data_t, 10);
    164178        dyn_array_append(&da, data_t, 11);
     
    172186}
    173187
    174 PCUT_TEST(clear_range_empty) {
     188PCUT_TEST(clear_range_empty)
     189{
    175190        dyn_array_append(&da, data_t, 10);
    176191        dyn_array_append(&da, data_t, 99);
     
    182197}
    183198
    184 PCUT_TEST(concat_simple) {
     199PCUT_TEST(concat_simple)
     200{
    185201        dyn_array_append(&da, data_t, 10);
    186202        dyn_array_append(&da, data_t, 99);
     
    202218        dyn_array_destroy(&da2);
    203219}
    204 PCUT_TEST(concat_self) {
     220
     221PCUT_TEST(concat_self)
     222{
    205223        dyn_array_append(&da, data_t, 10);
    206224        dyn_array_append(&da, data_t, 99);
Note: See TracChangeset for help on using the changeset viewer.