Index: uspace/lib/c/generic/io/asprintf.c =================================================================== --- uspace/lib/c/generic/io/asprintf.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/asprintf.c (revision f1380b76772fb5d1aa03637b5e57bd9b929fea61) @@ -58,5 +58,5 @@ NULL }; - + return printf_core(fmt, &ps, args); } @@ -68,5 +68,5 @@ int ret = vprintf_size(fmt, args); va_end(args); - + return ret; } @@ -88,13 +88,13 @@ int ret = vprintf_size(fmt, args2); va_end(args2); - + if (ret > 0) { *strp = malloc(STR_BOUNDS(ret) + 1); if (*strp == NULL) return -1; - + vsnprintf(*strp, STR_BOUNDS(ret) + 1, fmt, args); } - + return ret; } @@ -115,5 +115,5 @@ int ret = vasprintf(strp, fmt, args); va_end(args); - + return ret; } Index: uspace/lib/c/generic/io/chargrid.c =================================================================== --- uspace/lib/c/generic/io/chargrid.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/chargrid.c (revision f1380b76772fb5d1aa03637b5e57bd9b929fea61) @@ -57,5 +57,5 @@ sizeof(chargrid_t) + cols * rows * sizeof(charfield_t); chargrid_t *scrbuf; - + if ((flags & CHARGRID_FLAG_SHARED) == CHARGRID_FLAG_SHARED) { scrbuf = (chargrid_t *) as_area_create(AS_AREA_ANY, size, @@ -69,5 +69,5 @@ return NULL; } - + scrbuf->size = size; scrbuf->flags = flags; @@ -75,11 +75,11 @@ scrbuf->rows = rows; scrbuf->cursor_visible = false; - + scrbuf->attrs.type = CHAR_ATTR_STYLE; scrbuf->attrs.val.style = STYLE_NORMAL; - + scrbuf->top_row = 0; chargrid_clear(scrbuf); - + return scrbuf; } @@ -107,8 +107,8 @@ scrbuf->top_row = (scrbuf->top_row + 1) % scrbuf->rows; chargrid_clear_row(scrbuf, scrbuf->row); - + return scrbuf->rows; } - + return 2; } @@ -122,5 +122,5 @@ return chargrid_update_rows(scrbuf); } - + return 1; } @@ -144,17 +144,17 @@ assert(scrbuf->col < scrbuf->cols); assert(scrbuf->row < scrbuf->rows); - + charfield_t *field = chargrid_charfield_at(scrbuf, scrbuf->col, scrbuf->row); - + field->ch = ch; field->attrs = scrbuf->attrs; field->flags |= CHAR_FLAG_DIRTY; - + if (update) { scrbuf->col++; return chargrid_update_cols(scrbuf); } - + return 1; } @@ -173,8 +173,8 @@ assert(scrbuf->col < scrbuf->cols); assert(scrbuf->row < scrbuf->rows); - + scrbuf->col = 0; scrbuf->row++; - + return chargrid_update_rows(scrbuf); } @@ -194,11 +194,11 @@ assert(scrbuf->col < scrbuf->cols); assert(scrbuf->row < scrbuf->rows); - + sysarg_t spaces = tab_size - scrbuf->cols % tab_size; sysarg_t flush = 1; - + for (sysarg_t i = 0; i < spaces; i++) flush += chargrid_putchar(scrbuf, ' ', true) - 1; - + return flush; } @@ -220,16 +220,16 @@ assert(scrbuf->col < scrbuf->cols); assert(scrbuf->row < scrbuf->rows); - + if ((scrbuf->col == 0) && (scrbuf->row == 0)) return 0; - + if (scrbuf->col == 0) { scrbuf->col = scrbuf->cols - 1; scrbuf->row--; - + chargrid_putchar(scrbuf, ' ', false); return 2; } - + scrbuf->col--; chargrid_putchar(scrbuf, ' ', false); @@ -249,5 +249,5 @@ scrbuf->data[pos].flags = CHAR_FLAG_DIRTY; } - + scrbuf->col = 0; scrbuf->row = 0; @@ -284,5 +284,5 @@ assert(col); assert(row); - + *col = scrbuf->col; *row = scrbuf->row; @@ -305,5 +305,5 @@ charfield_t *field = chargrid_charfield_at(scrbuf, col, row); - + field->ch = 0; field->attrs = scrbuf->attrs; Index: uspace/lib/c/generic/io/console.c =================================================================== --- uspace/lib/c/generic/io/console.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/console.c (revision f1380b76772fb5d1aa03637b5e57bd9b929fea61) @@ -48,5 +48,5 @@ if (!ctrl) return NULL; - + ctrl->input_sess = vfs_fsession(ifile, INTERFACE_CONSOLE); if (!ctrl->input_sess) { @@ -54,5 +54,5 @@ return NULL; } - + ctrl->output_sess = vfs_fsession(ofile, INTERFACE_CONSOLE); if (!ctrl->output_sess) { @@ -60,9 +60,9 @@ return NULL; } - + ctrl->input = ifile; ctrl->output = ofile; ctrl->input_aid = 0; - + return ctrl; } @@ -95,5 +95,5 @@ errno_t rc = async_req_0_2(exch, CONSOLE_GET_SIZE, cols, rows); async_exchange_end(exch); - + return rc; } @@ -134,5 +134,5 @@ errno_t rc = async_req_0_1(exch, CONSOLE_GET_COLOR_CAP, ccap); async_exchange_end(exch); - + return rc; } @@ -143,5 +143,5 @@ errno_t rc = async_req_0_2(exch, CONSOLE_GET_POS, col, row); async_exchange_end(exch); - + return rc; } @@ -183,17 +183,17 @@ if (ctrl->input_aid == 0) { ipc_call_t result; - + async_exch_t *exch = async_exchange_begin(ctrl->input_sess); aid_t aid = async_send_0(exch, CONSOLE_GET_EVENT, &result); async_exchange_end(exch); - + errno_t rc; async_wait_for(aid, &rc); - + if (rc != EOK) { errno = rc; return false; } - + rc = console_ev_decode(&result, event); if (rc != EOK) { @@ -204,12 +204,12 @@ errno_t retval; async_wait_for(ctrl->input_aid, &retval); - + ctrl->input_aid = 0; - + if (retval != EOK) { errno = retval; return false; } - + errno_t rc = console_ev_decode(&ctrl->input_call, event); if (rc != EOK) { @@ -218,5 +218,5 @@ } } - + return true; } @@ -227,5 +227,5 @@ struct timeval t0; gettimeofday(&t0, NULL); - + if (ctrl->input_aid == 0) { async_exch_t *exch = async_exchange_begin(ctrl->input_sess); @@ -234,5 +234,5 @@ async_exchange_end(exch); } - + errno_t retval; errno_t rc = async_wait_timeout(ctrl->input_aid, &retval, *timeout); @@ -242,12 +242,12 @@ return false; } - + ctrl->input_aid = 0; - + if (retval != EOK) { errno = retval; return false; } - + rc = console_ev_decode(&ctrl->input_call, event); if (rc != EOK) { @@ -255,10 +255,10 @@ return false; } - + /* Update timeout */ struct timeval t1; gettimeofday(&t1, NULL); *timeout -= tv_sub_diff(&t1, &t0); - + return true; } Index: uspace/lib/c/generic/io/input.c =================================================================== --- uspace/lib/c/generic/io/input.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/input.c (revision f1380b76772fb5d1aa03637b5e57bd9b929fea61) @@ -61,5 +61,5 @@ errno_t rc = async_create_callback_port(exch, INTERFACE_INPUT_CB, 0, 0, input_cb_conn, input, &port); - + async_exchange_end(exch); @@ -88,5 +88,5 @@ errno_t rc = async_req_0_0(exch, INPUT_ACTIVATE); async_exchange_end(exch); - + return rc; } Index: uspace/lib/c/generic/io/io.c =================================================================== --- uspace/lib/c/generic/io/io.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/io.c (revision f1380b76772fb5d1aa03637b5e57bd9b929fea61) @@ -119,5 +119,5 @@ list_append(&stdin->link, &files); } - + int outfd = inbox_get("stdout"); if (outfd >= 0) { @@ -133,5 +133,5 @@ list_append(&stdout->link, &files); } - + int errfd = inbox_get("stderr"); if (errfd >= 0) { @@ -165,8 +165,8 @@ return false; } - + if ((*mp == 'b') || (*mp == 't')) mp++; - + bool plus; if (*mp == '+') { @@ -175,5 +175,5 @@ } else plus = false; - + if (*mp != 0) { errno = EINVAL; @@ -183,5 +183,5 @@ *create = false; *truncate = false; - + /* Parse first character of fmode and determine mode for vfs_open(). */ switch (fmode[0]) { @@ -209,5 +209,5 @@ return false; } - + return true; } @@ -241,5 +241,5 @@ { /* FIXME: Use more complex rules for setting buffering options. */ - + switch (stream->fd) { case 1: @@ -259,5 +259,5 @@ { assert(stream->buf == NULL); - + stream->buf = malloc(stream->buf_size); if (stream->buf == NULL) { @@ -265,5 +265,5 @@ return EOF; } - + stream->buf_head = stream->buf; stream->buf_tail = stream->buf; @@ -285,5 +285,5 @@ if (!parse_mode(fmode, &mode, &create, &truncate)) return NULL; - + /* Open file. */ FILE *stream = malloc(sizeof(FILE)); @@ -311,5 +311,5 @@ return NULL; } - + if (truncate) { rc = vfs_resize(file, 0); @@ -331,7 +331,7 @@ _setvbuf(stream); stream->ungetc_chars = 0; - + list_append(&stream->link, &files); - + return stream; } @@ -345,5 +345,5 @@ return NULL; } - + stream->fd = fd; stream->pos = 0; @@ -355,7 +355,7 @@ _setvbuf(stream); stream->ungetc_chars = 0; - + list_append(&stream->link, &files); - + return stream; } @@ -365,20 +365,20 @@ { errno_t rc = 0; - + fflush(stream); - + if (stream->sess != NULL) async_hangup(stream->sess); - + if (stream->fd >= 0) rc = vfs_put(stream->fd); - + list_remove(&stream->link); - + if (rc != EOK) { errno = rc; return EOF; } - + return 0; } @@ -387,10 +387,10 @@ { int rc = _fclose_nofree(stream); - + if ((stream != &stdin_null) && (stream != &stdout_kio) && (stream != &stderr_kio)) free(stream); - + return rc; } @@ -399,10 +399,10 @@ { FILE *nstr; - + if (path == NULL) { /* Changing mode is not supported */ return NULL; } - + (void) _fclose_nofree(stream); nstr = fopen(path, mode); @@ -411,11 +411,11 @@ return NULL; } - + list_remove(&nstr->link); *stream = *nstr; list_append(&stream->link, &files); - + free(nstr); - + return stream; } @@ -659,10 +659,10 @@ return 0; /* Errno set by _fallocbuf(). */ } - + data = (uint8_t *) buf; bytes_left = size * nmemb; total_written = 0; need_flush = false; - + while ((!stream->error) && (bytes_left > 0)) { buf_free = stream->buf_size - (stream->buf_head - stream->buf); @@ -671,13 +671,13 @@ else now = bytes_left; - + for (i = 0; i < now; i++) { b = data[i]; stream->buf_head[i] = b; - + if ((b == '\n') && (stream->btype == _IOLBF)) need_flush = true; } - + data += now; stream->buf_head += now; @@ -686,5 +686,5 @@ total_written += now; stream->buf_state = _bs_write; - + if (buf_free == 0) { /* Only need to drain buffer. */ @@ -697,5 +697,5 @@ if (need_flush) fflush(stream); - + return (total_written / size); } @@ -705,14 +705,14 @@ char buf[STR_BOUNDS(1)]; size_t sz = 0; - + if (chr_encode(c, buf, &sz, STR_BOUNDS(1)) == EOK) { size_t wr = fwrite(buf, 1, sz, stream); - + if (wr < sz) return EOF; - + return (int) c; } - + return EOF; } @@ -739,5 +739,5 @@ { char c; - + /* This could be made faster by only flushing when needed. */ if (stdout) @@ -745,8 +745,8 @@ if (stderr) fflush(stderr); - + if (fread(&c, sizeof(char), 1, stream) < sizeof(char)) return EOF; - + return (int) c; } @@ -841,5 +841,5 @@ if (stream->error) return EOF; - + _fflushbuf(stream); if (stream->error) { @@ -876,5 +876,5 @@ if (stream->error) return EOF; - + _fflushbuf(stream); if (stream->error) { @@ -882,10 +882,10 @@ return EOF; } - + if (stream->kio) { kio_update(); return 0; } - + if ((stream->fd >= 0) && (stream->need_sync)) { errno_t rc; @@ -904,5 +904,5 @@ return 0; } - + return 0; } @@ -930,5 +930,5 @@ return EOF; } - + return stream->fd; } @@ -939,8 +939,8 @@ if (stream->sess == NULL) stream->sess = vfs_fd_session(stream->fd, iface); - + return stream->sess; } - + return NULL; } @@ -952,5 +952,5 @@ return EOK; } - + return ENOENT; } Index: uspace/lib/c/generic/io/kio.c =================================================================== --- uspace/lib/c/generic/io/kio.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/kio.c (revision f1380b76772fb5d1aa03637b5e57bd9b929fea61) @@ -46,5 +46,5 @@ { errno_t rc = (errno_t) __SYSCALL3(SYS_KIO, KIO_WRITE, (sysarg_t) buf, size); - + if (rc == EOK) *nwritten = size; @@ -73,9 +73,9 @@ va_list args; va_start(args, fmt); - + int ret = kio_vprintf(fmt, args); - + va_end(args); - + return ret; } @@ -84,5 +84,5 @@ { size_t wr; - + wr = 0; (void) kio_write(str, size, &wr); @@ -95,16 +95,16 @@ size_t chars = 0; size_t wr; - + while (offset < size) { char buf[STR_BOUNDS(1)]; size_t sz = 0; - + if (chr_encode(str[chars], buf, &sz, STR_BOUNDS(1)) == EOK) kio_write(buf, sz, &wr); - + chars++; offset += sizeof(wchar_t); } - + return chars; } @@ -125,5 +125,5 @@ NULL }; - + return printf_core(fmt, &ps, ap); } Index: uspace/lib/c/generic/io/output.c =================================================================== --- uspace/lib/c/generic/io/output.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/output.c (revision f1380b76772fb5d1aa03637b5e57bd9b929fea61) @@ -45,5 +45,5 @@ errno_t ret = async_req_0_0(exch, OUTPUT_YIELD); async_exchange_end(exch); - + return ret; } @@ -54,5 +54,5 @@ errno_t ret = async_req_0_0(exch, OUTPUT_CLAIM); async_exchange_end(exch); - + return ret; } @@ -63,5 +63,5 @@ errno_t ret = async_req_0_2(exch, OUTPUT_GET_DIMENSIONS, maxx, maxy); async_exchange_end(exch); - + return ret; } @@ -70,13 +70,13 @@ { async_exch_t *exch = async_exchange_begin(sess); - + sysarg_t rv; errno_t ret = async_req_0_1(exch, OUTPUT_GET_CAPS, &rv); - + async_exchange_end(exch); - + if (ret == EOK) *ccaps = (console_caps_t) rv; - + return ret; } @@ -86,18 +86,18 @@ { async_exch_t *exch = async_exchange_begin(sess); - + ipc_call_t answer; aid_t req = async_send_0(exch, OUTPUT_FRONTBUF_CREATE, &answer); errno_t rc = async_share_out_start(exch, frontbuf, AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE); - + async_exchange_end(exch); - + errno_t ret; async_wait_for(req, &ret); - + if ((rc != EOK) || (ret != EOK)) return 0; - + return (frontbuf_handle_t) IPC_GET_ARG1(answer); } @@ -108,5 +108,5 @@ errno_t ret = async_req_1_0(exch, OUTPUT_SET_STYLE, style); async_exchange_end(exch); - + return ret; } @@ -117,5 +117,5 @@ errno_t ret = async_req_1_0(exch, OUTPUT_CURSOR_UPDATE, frontbuf); async_exchange_end(exch); - + return ret; } @@ -126,5 +126,5 @@ errno_t ret = async_req_1_0(exch, OUTPUT_UPDATE, frontbuf); async_exchange_end(exch); - + return ret; } @@ -137,5 +137,5 @@ cols, rows); async_exchange_end(exch); - + return ret; } Index: uspace/lib/c/generic/io/printf.c =================================================================== --- uspace/lib/c/generic/io/printf.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/printf.c (revision f1380b76772fb5d1aa03637b5e57bd9b929fea61) @@ -48,9 +48,9 @@ va_list args; va_start(args, fmt); - + int ret = vfprintf(stream, fmt, args); - + va_end(args); - + return ret; } @@ -67,9 +67,9 @@ va_list args; va_start(args, fmt); - + int ret = vprintf(fmt, args); - + va_end(args); - + return ret; } Index: uspace/lib/c/generic/io/printf_core.c =================================================================== --- uspace/lib/c/generic/io/printf_core.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/printf_core.c (revision f1380b76772fb5d1aa03637b5e57bd9b929fea61) @@ -211,5 +211,5 @@ if (str == NULL) return printf_putnchars(nullstr, str_size(nullstr), ps); - + return ps->str_write((void *) str, str_size(str), ps->data); } @@ -227,5 +227,5 @@ if (!ascii_check(ch)) return ps->str_write((void *) &invalch, 1, ps->data); - + return ps->str_write(&ch, 1, ps->data); } @@ -243,5 +243,5 @@ if (!chr_check(ch)) return ps->str_write((void *) &invalch, 1, ps->data); - + return ps->wstr_write(&ch, sizeof(wchar_t), ps->data); } @@ -269,8 +269,8 @@ } } - + if (printf_putchar(ch, ps) > 0) counter++; - + while (--width > 0) { /* @@ -281,5 +281,5 @@ counter++; } - + return (int) (counter); } @@ -307,8 +307,8 @@ } } - + if (printf_putwchar(ch, ps) > 0) counter++; - + while (--width > 0) { /* @@ -319,5 +319,5 @@ counter++; } - + return (int) (counter); } @@ -337,5 +337,5 @@ if (str == NULL) return printf_putstr(nullstr, ps); - + size_t strw = str_length(str); @@ -343,5 +343,5 @@ if ((precision == 0) || (precision > strw)) precision = strw; - + /* Left padding */ size_t counter = 0; @@ -353,5 +353,5 @@ } } - + /* Part of @a str fitting into the alloted space. */ int retval; @@ -386,5 +386,5 @@ if (str == NULL) return printf_putstr(nullstr, ps); - + size_t strw = wstr_length(str); @@ -392,5 +392,5 @@ if ((precision == 0) || (precision > strw)) precision = strw; - + /* Left padding */ size_t counter = 0; @@ -402,5 +402,5 @@ } } - + /* Part of @a wstr fitting into the alloted space. */ int retval; @@ -408,7 +408,7 @@ if ((retval = printf_wputnchars(str, size, ps)) < 0) return -counter; - + counter += retval; - + /* Right padding */ while (width-- > 0) { @@ -440,5 +440,5 @@ precision = 0; } - + const char *digits; if (flags & __PRINTF_FLAG_BIGCHARS) @@ -446,14 +446,14 @@ else digits = digits_small; - + char data[PRINT_NUMBER_BUFFER_SIZE]; char *ptr = &data[PRINT_NUMBER_BUFFER_SIZE - 1]; - + /* Size of number with all prefixes and signs */ int size = 0; - + /* Put zero at end of string */ *ptr-- = 0; - + if (num == 0) { *ptr-- = '0'; @@ -465,8 +465,8 @@ } while (num /= base); } - + /* Size of plain number */ int number_size = size; - + /* * Collect the sum of all prefixes/signs/etc. to calculate padding and @@ -487,5 +487,5 @@ } } - + char sgn = 0; if (flags & __PRINTF_FLAG_SIGNED) { @@ -501,8 +501,8 @@ } } - + if (flags & __PRINTF_FLAG_LEFTALIGNED) flags &= ~__PRINTF_FLAG_ZEROPADDED; - + /* * If the number is left-aligned or precision is specified then @@ -513,5 +513,5 @@ precision = width - size + number_size; } - + /* Print leading spaces */ if (number_size > precision) { @@ -519,8 +519,8 @@ precision = number_size; } - + width -= precision + size - number_size; size_t counter = 0; - + if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) { while (width-- > 0) { @@ -529,5 +529,5 @@ } } - + /* Print sign */ if (sgn) { @@ -535,5 +535,5 @@ counter++; } - + /* Print prefix */ if (flags & __PRINTF_FLAG_PREFIX) { @@ -568,5 +568,5 @@ } } - + /* Print leading zeroes */ precision -= number_size; @@ -575,17 +575,17 @@ counter++; } - + /* Print the number itself */ int retval; if ((retval = printf_putstr(++ptr, ps)) > 0) counter += retval; - + /* Print trailing spaces */ - + while (width-- > 0) { if (printf_putchar(' ', ps) == 1) counter++; } - + return ((int) counter); } @@ -601,5 +601,5 @@ const int str_len = 3; const char *str; - + if (flags & __PRINTF_FLAG_BIGCHARS) { str = val.is_infinity ? "INF" : "NAN"; @@ -624,5 +624,5 @@ if ((ret = ps->str_write(&sign, 1, ps->data)) < 0) return -1; - + counter += ret; } @@ -630,5 +630,5 @@ if ((ret = ps->str_write(str, str_len, ps->data)) < 0) return -1; - + counter += ret; @@ -751,5 +751,5 @@ if ((ret = ps->str_write(&sign, 1, ps->data)) < 0) return -1; - + counter += ret; } @@ -783,5 +783,5 @@ counter += ret; - + /* Print the decimal point and the fractional part. */ if (has_decimal_pt) { @@ -790,5 +790,5 @@ if ((ret = ps->str_write(&ch, 1, ps->data)) < 0) return -1; - + counter += ret; @@ -885,5 +885,5 @@ /* Let the implementation figure out the proper precision. */ val_str.len = double_to_short_str(val, buf, buf_size, &val_str.dec_exp); - + /* Precision needed for the last significant digit. */ precision = max(0, -val_str.dec_exp); @@ -903,5 +903,5 @@ if ((ret = ps->str_write(&exp_ch, 1, ps->data)) < 0) return -1; - + counter += ret; @@ -915,5 +915,5 @@ /* Print the exponent. */ exp_val = abs(exp_val); - + char exp_str[4] = { 0 }; @@ -921,5 +921,5 @@ exp_str[1] = '0' + (exp_val % 100) / 10 ; exp_str[2] = '0' + (exp_val % 10); - + int exp_len = (exp_str[0] == '0') ? 2 : 3; const char *exp_str_start = &exp_str[3] - exp_len; @@ -981,5 +981,5 @@ if ((ret = ps->str_write(&sign, 1, ps->data)) < 0) return -1; - + counter += ret; } @@ -1004,5 +1004,5 @@ if ((ret = ps->str_write(&ch, 1, ps->data)) < 0) return -1; - + counter += ret; @@ -1104,5 +1104,5 @@ /* Let the implementation figure out the proper precision. */ val_str.len = double_to_short_str(val, buf, buf_size, &val_str.dec_exp); - + /* Use all produced digits. */ precision = val_str.len - 1; @@ -1223,5 +1223,5 @@ precision = (precision < 0) ? 6 : precision; return print_double_fixed(g, precision, width, flags, ps); - + case 'E': flags |= __PRINTF_FLAG_BIGCHARS; @@ -1230,5 +1230,5 @@ precision = (precision < 0) ? 6 : precision; return print_double_scientific(g, precision, width, flags, ps); - + case 'G': flags |= __PRINTF_FLAG_BIGCHARS; @@ -1236,5 +1236,5 @@ case 'g': return print_double_generic(g, precision, width, flags, ps); - + default: assert(false); @@ -1337,15 +1337,15 @@ size_t nxt = 0; /* Index of the next character from fmt */ size_t j = 0; /* Index to the first not printed nonformating character */ - + size_t counter = 0; /* Number of characters printed */ int retval; /* Return values from nested functions */ - + while (true) { i = nxt; wchar_t uc = str_decode(fmt, &nxt, STR_NO_LIMIT); - + if (uc == 0) break; - + /* Control character */ if (uc == '%') { @@ -1359,11 +1359,11 @@ counter += retval; } - + j = i; - + /* Parse modifiers */ uint32_t flags = 0; bool end = false; - + do { i = nxt; @@ -1390,5 +1390,5 @@ }; } while (!end); - + /* Width & '*' operator */ int width = 0; @@ -1397,5 +1397,5 @@ width *= 10; width += uc - '0'; - + i = nxt; uc = str_decode(fmt, &nxt, STR_NO_LIMIT); @@ -1416,5 +1416,5 @@ } } - + /* Precision and '*' operator */ int precision = -1; @@ -1427,5 +1427,5 @@ precision *= 10; precision += uc - '0'; - + i = nxt; uc = str_decode(fmt, &nxt, STR_NO_LIMIT); @@ -1446,7 +1446,7 @@ } } - + qualifier_t qualifier; - + switch (uc) { case 't': @@ -1495,7 +1495,7 @@ qualifier = PrintfQualifierInt; } - + unsigned int base = 10; - + switch (uc) { /* @@ -1504,15 +1504,15 @@ case 's': precision = max(0, precision); - + if (qualifier == PrintfQualifierLong) retval = print_wstr(va_arg(ap, wchar_t *), width, precision, flags, ps); else retval = print_str(va_arg(ap, char *), width, precision, flags, ps); - + if (retval < 0) { counter = -counter; goto out; } - + counter += retval; j = nxt; @@ -1523,14 +1523,14 @@ else retval = print_char(va_arg(ap, unsigned int), width, flags, ps); - + if (retval < 0) { counter = -counter; goto out; }; - + counter += retval; j = nxt; goto next_char; - + /* * Floating point values @@ -1544,14 +1544,14 @@ retval = print_double(va_arg(ap, double), uc, precision, width, flags, ps); - + if (retval < 0) { counter = -counter; goto out; } - + counter += retval; j = nxt; goto next_char; - + /* * Integer values @@ -1585,10 +1585,10 @@ base = 16; break; - + /* Percentile itself */ case '%': j = i; goto next_char; - + /* * Bad formatting. @@ -1601,9 +1601,9 @@ goto next_char; } - + /* Print integers */ size_t size; uint64_t number; - + switch (qualifier) { case PrintfQualifierByte: @@ -1645,5 +1645,5 @@ goto out; } - + if ((retval = print_number(number, width, precision, base, flags, ps)) < 0) { @@ -1651,5 +1651,5 @@ goto out; } - + counter += retval; j = nxt; @@ -1658,5 +1658,5 @@ ; } - + if (i > j) { if ((retval = printf_putnchars(&fmt[j], i - j, ps)) < 0) { @@ -1667,5 +1667,5 @@ counter += retval; } - + out: return ((int) counter); Index: uspace/lib/c/generic/io/snprintf.c =================================================================== --- uspace/lib/c/generic/io/snprintf.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/snprintf.c (revision f1380b76772fb5d1aa03637b5e57bd9b929fea61) @@ -50,9 +50,9 @@ va_list args; va_start(args, fmt); - + int ret = vsnprintf(str, size, fmt, args); - + va_end(args); - + return ret; } Index: uspace/lib/c/generic/io/vprintf.c =================================================================== --- uspace/lib/c/generic/io/vprintf.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/vprintf.c (revision f1380b76772fb5d1aa03637b5e57bd9b929fea61) @@ -52,13 +52,13 @@ size_t offset = 0; size_t chars = 0; - + while (offset < size) { if (fputc(str[chars], (FILE *) stream) <= 0) break; - + chars++; offset += sizeof(wchar_t); } - + return chars; } @@ -80,14 +80,14 @@ stream }; - + /* * Prevent other threads to execute printf_core() */ fibril_mutex_lock(&printf_mutex); - + int ret = printf_core(fmt, &ps, ap); - + fibril_mutex_unlock(&printf_mutex); - + return ret; } Index: uspace/lib/c/generic/io/vsnprintf.c =================================================================== --- uspace/lib/c/generic/io/vsnprintf.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/vsnprintf.c (revision f1380b76772fb5d1aa03637b5e57bd9b929fea61) @@ -65,8 +65,8 @@ { size_t left = data->size - data->len; - + if (left == 0) return ((int) size); - + if (left == 1) { /* We have only one free byte left in buffer @@ -77,5 +77,5 @@ return ((int) size); } - + if (left <= size) { /* We do not have enough space for the whole string @@ -84,29 +84,29 @@ */ size_t index = 0; - + while (index < size) { wchar_t uc = str_decode(str, &index, size); - + if (chr_encode(uc, data->dst, &data->len, data->size - 1) != EOK) break; } - + /* Put trailing zero at end, but not count it * into data->len so it could be rewritten next time */ data->dst[data->len] = 0; - + return ((int) size); } - + /* Buffer is big enough to print the whole string */ memcpy((void *)(data->dst + data->len), (void *) str, size); data->len += size; - + /* Put trailing zero at end, but not count it * into data->len so it could be rewritten next time */ data->dst[data->len] = 0; - + return ((int) size); } @@ -132,11 +132,11 @@ { size_t index = 0; - + while (index < (size / sizeof(wchar_t))) { size_t left = data->size - data->len; - + if (left == 0) return ((int) size); - + if (left == 1) { /* We have only one free byte left in buffer @@ -147,16 +147,16 @@ return ((int) size); } - + if (chr_encode(str[index], data->dst, &data->len, data->size - 1) != EOK) break; - + index++; } - + /* Put trailing zero at end, but not count it * into data->len so it could be rewritten next time */ data->dst[data->len] = 0; - + return ((int) size); } @@ -174,9 +174,9 @@ &data }; - + /* Print 0 at end of string - fix the case that nothing will be printed */ if (size > 0) str[0] = 0; - + /* vsnprintf_write ensures that str will be terminated by zero. */ return printf_core(fmt, &ps, ap); Index: uspace/lib/c/generic/io/window.c =================================================================== --- uspace/lib/c/generic/io/window.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/c/generic/io/window.c (revision f1380b76772fb5d1aa03637b5e57bd9b929fea61) @@ -46,5 +46,5 @@ errno_t ret = async_req_1_2(exch, WINDOW_REGISTER, flags, in, out); async_exchange_end(exch); - + return ret; } @@ -96,21 +96,21 @@ { async_exch_t *exch = async_exchange_begin(sess); - + ipc_call_t answer; aid_t req = async_send_5(exch, WINDOW_RESIZE, x, y, width, height, (sysarg_t) placement_flags, &answer); - + errno_t rc = async_share_out_start(exch, cells, AS_AREA_READ | AS_AREA_CACHEABLE); - + async_exchange_end(exch); - + errno_t ret; async_wait_for(req, &ret); - + if (rc != EOK) return rc; else if (ret != EOK) return ret; - + return EOK; }