Index: uspace/console/console.c =================================================================== --- uspace/console/console.c (revision c738d657d3d585f90fca437b475d4589b00e50be) +++ uspace/console/console.c (revision d7baee61b7e0ef91ce4828e0e32c18c917b49a87) @@ -120,5 +120,4 @@ { async_msg_2(fb_info.phone, FB_CURSOR_GOTO, row, col); - } @@ -137,5 +136,4 @@ { async_msg_3(fb_info.phone, FB_PUTCHAR, c, row, col); - } Index: uspace/console/gcons.c =================================================================== --- uspace/console/gcons.c (revision c738d657d3d585f90fca437b475d4589b00e50be) +++ uspace/console/gcons.c (revision d7baee61b7e0ef91ce4828e0e32c18c917b49a87) @@ -90,6 +90,5 @@ { return async_req_2(fbphone, FB_VIEWPORT_CREATE, - (x << 16) | y, (width << 16) | height, - NULL, NULL); + (x << 16) | y, (width << 16) | height, NULL, NULL); } @@ -97,5 +96,4 @@ { async_msg(fbphone, FB_CLEAR, 0); - } @@ -123,8 +121,8 @@ ic_pixmaps[state]); - if (state != CONS_DISCONNECTED && state != CONS_KERNEL && state != - CONS_DISCONNECTED_SEL) { + if (state != CONS_DISCONNECTED && state != CONS_KERNEL && + state != CONS_DISCONNECTED_SEL) { snprintf(data, 5, "%d", consnum + 1); - for (i=0; data[i]; i++) + for (i = 0; data[i]; i++) tran_putch(data[i], 1, 2 + i); } @@ -169,6 +167,6 @@ return; - if (consnum == active_console || console_state[consnum] == - CONS_HAS_DATA) + if (consnum == active_console || + console_state[consnum] == CONS_HAS_DATA) return; @@ -358,10 +356,10 @@ set_style(MAIN_COLOR, MAIN_COLOR); clear(); - draw_pixmap(_binary_helenos_ppm_start, (size_t) - &_binary_helenos_ppm_size, xres - 66, 2); - draw_pixmap(_binary_nameic_ppm_start, (size_t) - &_binary_nameic_ppm_size, 5, 17); - - for (i=0;i < CONSOLE_COUNT; i++) + draw_pixmap(_binary_helenos_ppm_start, + (size_t) &_binary_helenos_ppm_size, xres - 66, 2); + draw_pixmap(_binary_nameic_ppm_start, + (size_t) &_binary_nameic_ppm_size, 5, 17); + + for (i = 0;i < CONSOLE_COUNT; i++) redraw_state(i); vp_switch(console_vp); @@ -431,18 +429,18 @@ return; - pm = make_pixmap(_binary_anim_1_ppm_start, (int) - &_binary_anim_1_ppm_size); + pm = make_pixmap(_binary_anim_1_ppm_start, + (int) &_binary_anim_1_ppm_size); async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); - pm = make_pixmap(_binary_anim_2_ppm_start, (int) - &_binary_anim_2_ppm_size); + pm = make_pixmap(_binary_anim_2_ppm_start, + (int) &_binary_anim_2_ppm_size); async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); - pm = make_pixmap(_binary_anim_3_ppm_start, (int) - &_binary_anim_3_ppm_size); + pm = make_pixmap(_binary_anim_3_ppm_start, + (int) &_binary_anim_3_ppm_size); async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); - pm = make_pixmap(_binary_anim_4_ppm_start, (int) - &_binary_anim_4_ppm_size); + pm = make_pixmap(_binary_anim_4_ppm_start, + (int) &_binary_anim_4_ppm_size); async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); @@ -479,7 +477,7 @@ /* create console viewport */ /* Align width & height to character size */ - console_vp = vp_create(CONSOLE_MARGIN, CONSOLE_TOP, ALIGN_DOWN(xres - - 2 * CONSOLE_MARGIN, 8), ALIGN_DOWN(yres - (CONSOLE_TOP + - CONSOLE_MARGIN), 16)); + console_vp = vp_create(CONSOLE_MARGIN, CONSOLE_TOP, + ALIGN_DOWN(xres - 2 * CONSOLE_MARGIN, 8), + ALIGN_DOWN(yres - (CONSOLE_TOP + CONSOLE_MARGIN), 16)); if (console_vp < 0) return; @@ -488,6 +486,6 @@ status_start += (xres - 800) / 2; for (i = 0; i < CONSOLE_COUNT; i++) { - cstatus_vp[i] = vp_create(status_start + CONSOLE_MARGIN + i * - (STATUS_WIDTH + STATUS_SPACE), STATUS_TOP, + cstatus_vp[i] = vp_create(status_start + CONSOLE_MARGIN + + i * (STATUS_WIDTH + STATUS_SPACE), STATUS_TOP, STATUS_WIDTH, STATUS_HEIGHT); if (cstatus_vp[i] < 0) @@ -499,14 +497,14 @@ /* Initialize icons */ ic_pixmaps[CONS_SELECTED] = - make_pixmap(_binary_cons_selected_ppm_start, (int) - &_binary_cons_selected_ppm_size); - ic_pixmaps[CONS_IDLE] = make_pixmap(_binary_cons_idle_ppm_start, (int) - &_binary_cons_idle_ppm_size); + make_pixmap(_binary_cons_selected_ppm_start, + (int) &_binary_cons_selected_ppm_size); + ic_pixmaps[CONS_IDLE] = make_pixmap(_binary_cons_idle_ppm_start, + (int) &_binary_cons_idle_ppm_size); ic_pixmaps[CONS_HAS_DATA] = - make_pixmap(_binary_cons_has_data_ppm_start, (int) - &_binary_cons_has_data_ppm_size); + make_pixmap(_binary_cons_has_data_ppm_start, + (int) &_binary_cons_has_data_ppm_size); ic_pixmaps[CONS_DISCONNECTED] = - make_pixmap(_binary_cons_idle_ppm_start, (int) - &_binary_cons_idle_ppm_size); + make_pixmap(_binary_cons_idle_ppm_start, + (int) &_binary_cons_idle_ppm_size); ic_pixmaps[CONS_KERNEL] = make_pixmap(_binary_cons_kernel_ppm_start, (int) &_binary_cons_kernel_ppm_size); Index: uspace/fb/fb.c =================================================================== --- uspace/fb/fb.c (revision c738d657d3d585f90fca437b475d4589b00e50be) +++ uspace/fb/fb.c (revision d7baee61b7e0ef91ce4828e0e32c18c917b49a87) @@ -150,15 +150,18 @@ /* Conversion routines between different color representations */ -static void rgb_byte0888(void *dst, int rgb) +static void +rgb_byte0888(void *dst, int rgb) { *(int *)dst = rgb; } -static int byte0888_rgb(void *src) +static int +byte0888_rgb(void *src) { return (*(int *)src) & 0xffffff; } -static void bgr_byte0888(void *dst, int rgb) +static void +bgr_byte0888(void *dst, int rgb) { *((uint32_t *) dst) = BLUE(rgb, 8) << 16 | GREEN(rgb, 8) << 8 | @@ -166,12 +169,14 @@ } -static int byte0888_bgr(void *src) +static int +byte0888_bgr(void *src) { int color = *(uint32_t *)(src); - return ((color & 0xff) << 16) | (((color >> 8) & 0xff) << 8) | ((color - >> 16) & 0xff); -} - -static void rgb_byte888(void *dst, int rgb) + return ((color & 0xff) << 16) | (((color >> 8) & 0xff) << 8) | + ((color >> 16) & 0xff); +} + +static void +rgb_byte888(void *dst, int rgb) { uint8_t *scr = dst; @@ -187,5 +192,6 @@ } -static int byte888_rgb(void *src) +static int +byte888_rgb(void *src) { uint8_t *scr = src; @@ -198,5 +204,6 @@ /** 16-bit depth (5:5:5) */ -static void rgb_byte555(void *dst, int rgb) +static void +rgb_byte555(void *dst, int rgb) { /* 5-bit, 5-bits, 5-bits */ @@ -206,13 +213,15 @@ /** 16-bit depth (5:5:5) */ -static int byte555_rgb(void *src) +static int +byte555_rgb(void *src) { int color = *(uint16_t *)(src); - return (((color >> 10) & 0x1f) << (16 + 3)) | (((color >> 5) & 0x1f) << - (8 + 3)) | ((color & 0x1f) << 3); + return (((color >> 10) & 0x1f) << (16 + 3)) | + (((color >> 5) & 0x1f) << (8 + 3)) | ((color & 0x1f) << 3); } /** 16-bit depth (5:6:5) */ -static void rgb_byte565(void *dst, int rgb) +static void +rgb_byte565(void *dst, int rgb) { /* 5-bit, 6-bits, 5-bits */ @@ -222,13 +231,15 @@ /** 16-bit depth (5:6:5) */ -static int byte565_rgb(void *src) +static int +byte565_rgb(void *src) { int color = *(uint16_t *)(src); - return (((color >> 11) & 0x1f) << (16 + 3)) | (((color >> 5) & 0x3f) << - (8 + 2)) | ((color & 0x1f) << 3); + return (((color >> 11) & 0x1f) << (16 + 3)) | + (((color >> 5) & 0x3f) << (8 + 2)) | ((color & 0x1f) << 3); } /** Put pixel - 8-bit depth (3:2:3) */ -static void rgb_byte8(void *dst, int rgb) +static void +rgb_byte8(void *dst, int rgb) { *(uint8_t *)dst = RED(rgb, 3) << 5 | GREEN(rgb, 2) << 3 | BLUE(rgb, 3); @@ -236,9 +247,10 @@ /** Return pixel color - 8-bit depth (3:2:3) */ -static int byte8_rgb(void *src) +static int +byte8_rgb(void *src) { int color = *(uint8_t *)src; - return (((color >> 5) & 0x7) << (16 + 5)) | (((color >> 3) & 0x3) << - (8 + 6)) | ((color & 0x7) << 5); + return (((color >> 5) & 0x7) << (16 + 5)) | + (((color >> 3) & 0x3) << (8 + 6)) | ((color & 0x7) << 5); } @@ -250,6 +262,6 @@ * @param color RGB color */ -static void putpixel(viewport_t *vport, unsigned int x, unsigned int y, int - color) +static void +putpixel(viewport_t *vport, unsigned int x, unsigned int y, int color) { int dx = vport->x + x; @@ -257,5 +269,6 @@ if (! (vport->paused && vport->dbdata)) - (*screen.rgb2scr)(&screen.fbaddress[POINTPOS(dx,dy)], COLOR(color)); + (*screen.rgb2scr)(&screen.fbaddress[POINTPOS(dx,dy)], + COLOR(color)); if (vport->dbdata) { @@ -267,19 +280,21 @@ /** Get pixel from viewport */ -static int getpixel(viewport_t *vport, unsigned int x, unsigned int y) +static int +getpixel(viewport_t *vport, unsigned int x, unsigned int y) { int dx = vport->x + x; int dy = vport->y + y; - return COLOR((*screen.scr2rgb)(&screen.fbaddress[POINTPOS(dx,dy)])); -} - -static inline void putpixel_mem(char *mem, unsigned int x, unsigned int y, int - color) + return COLOR((*screen.scr2rgb)(&screen.fbaddress[POINTPOS(dx, dy)])); +} + +static inline void +putpixel_mem(char *mem, unsigned int x, unsigned int y, int color) { (*screen.rgb2scr)(&mem[POINTPOS(x,y)], COLOR(color)); } -static void draw_rectangle(viewport_t *vport, unsigned int sx, unsigned int sy, +static void +draw_rectangle(viewport_t *vport, unsigned int sx, unsigned int sy, unsigned int width, unsigned int height, int color) { @@ -316,5 +331,6 @@ /** Fill viewport with background color */ -static void clear_port(viewport_t *vport) +static void +clear_port(viewport_t *vport) { draw_rectangle(vport, 0, 0, vport->width, vport->height, @@ -327,5 +343,6 @@ * @param lines Positive number - scroll up, negative - scroll down */ -static void scroll_port_nodb(viewport_t *vport, int lines) +static void +scroll_port_nodb(viewport_t *vport, int lines) { int y; @@ -351,5 +368,6 @@ /** Refresh given viewport from double buffer */ -static void refresh_viewport_db(viewport_t *vport) +static void +refresh_viewport_db(viewport_t *vport) { unsigned int y, srcy, srcoff, dsty, dstx; @@ -369,5 +387,6 @@ /** Scroll viewport that has double buffering enabled */ -static void scroll_port_db(viewport_t *vport, int lines) +static void +scroll_port_db(viewport_t *vport, int lines) { ++vport->paused; @@ -394,5 +413,6 @@ /** Scrolls viewport given number of lines */ -static void scroll_port(viewport_t *vport, int lines) +static void +scroll_port(viewport_t *vport, int lines) { if (vport->dbdata) @@ -403,5 +423,6 @@ } -static void invert_pixel(viewport_t *vport, unsigned int x, unsigned int y) +static void +invert_pixel(viewport_t *vport, unsigned int x, unsigned int y) { putpixel(vport, x, y, ~getpixel(vport, x, y)); @@ -420,5 +441,6 @@ * @param transparent If false, print background color */ -static void draw_glyph(viewport_t *vport,uint8_t glyph, unsigned int sx, +static void +draw_glyph(viewport_t *vport,uint8_t glyph, unsigned int sx, unsigned int sy, style_t style, int transparent) { @@ -441,5 +463,6 @@ /** Invert character at given position */ -static void invert_char(viewport_t *vport,unsigned int row, unsigned int col) +static void +invert_char(viewport_t *vport,unsigned int row, unsigned int col) { unsigned int x; @@ -460,10 +483,11 @@ * @return New viewport number */ -static int viewport_create(unsigned int x, unsigned int y,unsigned int width, +static int +viewport_create(unsigned int x, unsigned int y,unsigned int width, unsigned int height) { int i; - for (i=0; i < MAX_VIEWPORTS; i++) { + for (i = 0; i < MAX_VIEWPORTS; i++) { if (!viewports[i].initialized) break; @@ -491,5 +515,4 @@ return i; } - /** Initialize framebuffer as a chardev output device @@ -503,5 +526,6 @@ * */ -static bool screen_init(void *addr, unsigned int xres, unsigned int yres, +static bool +screen_init(void *addr, unsigned int xres, unsigned int yres, unsigned int scan, unsigned int visual, bool invert_colors) { @@ -559,5 +583,6 @@ /** Hide cursor if it is shown */ -static void cursor_hide(viewport_t *vport) +static void +cursor_hide(viewport_t *vport) { if (vport->cursor_active && vport->cursor_shown) { @@ -568,5 +593,6 @@ /** Show cursor if cursor showing is enabled */ -static void cursor_print(viewport_t *vport) +static void +cursor_print(viewport_t *vport) { /* Do not check for cursor_shown */ @@ -578,5 +604,6 @@ /** Invert cursor, if it is enabled */ -static void cursor_blink(viewport_t *vport) +static void +cursor_blink(viewport_t *vport) { if (vport->cursor_shown) @@ -594,6 +621,7 @@ * @param transparent If false, print background color with character */ -static void draw_char(viewport_t *vport, char c, unsigned int row, unsigned int - col, style_t style, int transparent) +static void +draw_char(viewport_t *vport, char c, unsigned int row, unsigned int col, + style_t style, int transparent) { /* Optimize - do not hide cursor if we are going to overwrite it */ @@ -623,5 +651,6 @@ * @param data Text data fitting exactly into viewport */ -static void draw_text_data(viewport_t *vport, keyfield_t *data) +static void +draw_text_data(viewport_t *vport, keyfield_t *data) { int i; @@ -642,11 +671,11 @@ } - /** Return first free pixmap */ -static int find_free_pixmap(void) +static int +find_free_pixmap(void) { int i; - for (i=0;i < MAX_PIXMAPS;i++) + for (i = 0;i < MAX_PIXMAPS;i++) if (!pixmaps[i].data) return i; @@ -654,5 +683,6 @@ } -static void putpixel_pixmap(int pm, unsigned int x, unsigned int y, int color) +static void +putpixel_pixmap(int pm, unsigned int x, unsigned int y, int color) { pixmap_t *pmap = &pixmaps[pm]; @@ -663,5 +693,6 @@ /** Create a new pixmap and return appropriate ID */ -static int shm2pixmap(unsigned char *shm, size_t size) +static int +shm2pixmap(unsigned char *shm, size_t size) { int pm; @@ -706,5 +737,6 @@ * to redefine static variables with __thread */ -static int shm_handle(ipc_callid_t callid, ipc_call_t *call, int vp) +static int +shm_handle(ipc_callid_t callid, ipc_call_t *call, int vp) { static keyfield_t *interbuffer = NULL; @@ -718,5 +750,5 @@ int retval = 0; viewport_t *vport = &viewports[vp]; - unsigned int x,y; + unsigned int x, y; switch (IPC_GET_METHOD(*call)) { @@ -775,6 +807,6 @@ ppm_draw(shm, shm_size, IPC_GET_ARG1(*call), - IPC_GET_ARG2(*call), vport->width - x, vport->height - - y, (putpixel_cb_t)putpixel, vport); + IPC_GET_ARG2(*call), vport->width - x, + vport->height - y, (putpixel_cb_t)putpixel, vport); break; case FB_DRAW_TEXT_DATA: @@ -799,5 +831,6 @@ } -static void copy_vp_to_pixmap(viewport_t *vport, pixmap_t *pmap) +static void +copy_vp_to_pixmap(viewport_t *vport, pixmap_t *pmap) { int y; @@ -815,6 +848,6 @@ for (y = 0; y < height; y++) { - tmp = (vport->y + y) * screen.scanline + vport->x * - screen.pixelbytes; + tmp = (vport->y + y) * screen.scanline + + vport->x * screen.pixelbytes; memcpy(pmap->data + rowsize * y, screen.fbaddress + tmp, rowsize); @@ -823,5 +856,6 @@ /** Save viewport to pixmap */ -static int save_vp_to_pixmap(viewport_t *vport) +static int +save_vp_to_pixmap(viewport_t *vport) { int pm; @@ -874,7 +908,7 @@ realrowsize = realwidth * screen.pixelbytes; - for (y=0; y < realheight; y++) { - tmp = (vport->y + y) * screen.scanline + vport->x * - screen.pixelbytes; + for (y = 0; y < realheight; y++) { + tmp = (vport->y + y) * screen.scanline + + vport->x * screen.pixelbytes; memcpy(screen.fbaddress + tmp, pmap->data + y * srcrowsize, realrowsize); @@ -884,5 +918,6 @@ /** Tick animation one step forward */ -static void anims_tick(void) +static void +anims_tick(void) { int i; @@ -894,5 +929,5 @@ return; - for (i=0; i < MAX_ANIMATIONS; i++) { + for (i = 0; i < MAX_ANIMATIONS; i++) { if (!animations[i].animlen || !animations[i].initialized || !animations[i].enabled) @@ -911,7 +946,8 @@ static int pointer_pixmap = -1; -static void mouse_show(void) -{ - int i,j; +static void +mouse_show(void) +{ + int i, j; int visibility; int color; @@ -942,6 +978,6 @@ for (j = 0; j < pointer_width; j++) { bytepos = i * ((pointer_width - 1) / 8 + 1) + j / 8; - visibility = pointer_mask_bits[bytepos] & (1 << (j % - 8)); + visibility = pointer_mask_bits[bytepos] & + (1 << (j % 8)); if (visibility) { color = pointer_bits[bytepos] & (1 << (j % 8)) @@ -950,5 +986,5 @@ i < screen.yres) putpixel(&viewports[0], pointer_x + j, - pointer_y+i, color); + pointer_y + i, color); } } @@ -956,5 +992,6 @@ } -static void mouse_hide(void) +static void +mouse_hide(void) { /* Restore image under the cursor */ @@ -965,5 +1002,6 @@ } -static void mouse_move(unsigned int x, unsigned int y) +static void +mouse_move(unsigned int x, unsigned int y) { mouse_hide(); @@ -973,5 +1011,6 @@ } -static int anim_handle(ipc_callid_t callid, ipc_call_t *call, int vp) +static int +anim_handle(ipc_callid_t callid, ipc_call_t *call, int vp) { int handled = 1; @@ -1070,5 +1109,6 @@ /** Handler for messages concerning pixmap handling */ -static int pixmap_handle(ipc_callid_t callid, ipc_call_t *call, int vp) +static int +pixmap_handle(ipc_callid_t callid, ipc_call_t *call, int vp) { int handled = 1; @@ -1123,5 +1163,6 @@ * */ -static void fb_client_connection(ipc_callid_t iid, ipc_call_t *icall) +static void +fb_client_connection(ipc_callid_t iid, ipc_call_t *icall) { ipc_callid_t callid; @@ -1144,5 +1185,5 @@ while (1) { if (vport->cursor_active || anims_enabled) - callid = async_get_call_timeout(&call,250000); + callid = async_get_call_timeout(&call, 250000); else callid = async_get_call(&call); @@ -1179,5 +1220,5 @@ break; } - ipc_answer_fast(callid,0,0,0); + ipc_answer_fast(callid, 0, 0, 0); draw_char(vport, c, row, col, vport->style, @@ -1265,6 +1306,7 @@ case FB_VIEWPORT_CREATE: retval = viewport_create(IPC_GET_ARG1(call) >> 16, - IPC_GET_ARG1(call) & 0xffff, IPC_GET_ARG2(call) - >> 16, IPC_GET_ARG2(call) & 0xffff); + IPC_GET_ARG1(call) & 0xffff, + IPC_GET_ARG2(call) >> 16, + IPC_GET_ARG2(call) & 0xffff); break; case FB_VIEWPORT_DELETE: @@ -1301,10 +1343,11 @@ retval = ENOENT; } - ipc_answer_fast(callid,retval,0,0); + ipc_answer_fast(callid,retval, 0, 0); } } /** Initialization of framebuffer */ -int fb_init(void) +int +fb_init(void) { void *fb_ph_addr; Index: uspace/libc/generic/io/printf_core.c =================================================================== --- uspace/libc/generic/io/printf_core.c (revision c738d657d3d585f90fca437b475d4589b00e50be) +++ uspace/libc/generic/io/printf_core.c (revision d7baee61b7e0ef91ce4828e0e32c18c917b49a87) @@ -246,13 +246,13 @@ if (flags & __PRINTF_FLAG_PREFIX) { switch(base) { - case 2: /* Binary formating is not standard, but usefull */ - size += 2; - break; - case 8: - size++; - break; - case 16: - size += 2; - break; + case 2: /* Binary formating is not standard, but usefull */ + size += 2; + break; + case 8: + size++; + break; + case 16: + size += 2; + break; } } @@ -306,30 +306,30 @@ if (flags & __PRINTF_FLAG_PREFIX) { switch(base) { - case 2: /* Binary formating is not standard, but usefull */ - if (printf_putchar('0', ps) == 1) + case 2: /* Binary formating is not standard, but usefull */ + if (printf_putchar('0', ps) == 1) + counter++; + if (flags & __PRINTF_FLAG_BIGCHARS) { + if (printf_putchar('B', ps) == 1) counter++; - if (flags & __PRINTF_FLAG_BIGCHARS) { - if (printf_putchar('B', ps) == 1) - counter++; - } else { - if (printf_putchar('b', ps) == 1) - counter++; - } - break; - case 8: - if (printf_putchar('o', ps) == 1) + } else { + if (printf_putchar('b', ps) == 1) counter++; - break; - case 16: - if (printf_putchar('0', ps) == 1) + } + break; + case 8: + if (printf_putchar('o', ps) == 1) + counter++; + break; + case 16: + if (printf_putchar('0', ps) == 1) + counter++; + if (flags & __PRINTF_FLAG_BIGCHARS) { + if (printf_putchar('X', ps) == 1) counter++; - if (flags & __PRINTF_FLAG_BIGCHARS) { - if (printf_putchar('X', ps) == 1) - counter++; - } else { - if (printf_putchar('x', ps) == 1) - counter++; - } - break; + } else { + if (printf_putchar('x', ps) == 1) + counter++; + } + break; } } @@ -472,10 +472,10 @@ ++i; switch (c = fmt[i]) { - case '#': flags |= __PRINTF_FLAG_PREFIX; break; - case '-': flags |= __PRINTF_FLAG_LEFTALIGNED; break; - case '+': flags |= __PRINTF_FLAG_SHOWPLUS; break; - case ' ': flags |= __PRINTF_FLAG_SPACESIGN; break; - case '0': flags |= __PRINTF_FLAG_ZEROPADDED; break; - default: end = 1; + case '#': flags |= __PRINTF_FLAG_PREFIX; break; + case '-': flags |= __PRINTF_FLAG_LEFTALIGNED; break; + case '+': flags |= __PRINTF_FLAG_SHOWPLUS; break; + case ' ': flags |= __PRINTF_FLAG_SPACESIGN; break; + case '0': flags |= __PRINTF_FLAG_ZEROPADDED; break; + default: end = 1; }; @@ -521,27 +521,27 @@ switch (fmt[i++]) { - /** TODO: unimplemented qualifiers: - * t ptrdiff_t - ISO C 99 - */ - case 'h': /* char or short */ - qualifier = PrintfQualifierShort; - if (fmt[i] == 'h') { - i++; - qualifier = PrintfQualifierByte; - } - break; - case 'l': /* long or long long*/ - qualifier = PrintfQualifierLong; - if (fmt[i] == 'l') { - i++; - qualifier = PrintfQualifierLongLong; - } - break; - case 'z': /* size_t */ - qualifier = PrintfQualifierSizeT; - break; - default: - qualifier = PrintfQualifierInt; /* default type */ - --i; + /** TODO: unimplemented qualifiers: + * t ptrdiff_t - ISO C 99 + */ + case 'h': /* char or short */ + qualifier = PrintfQualifierShort; + if (fmt[i] == 'h') { + i++; + qualifier = PrintfQualifierByte; + } + break; + case 'l': /* long or long long*/ + qualifier = PrintfQualifierLong; + if (fmt[i] == 'l') { + i++; + qualifier = PrintfQualifierLongLong; + } + break; + case 'z': /* size_t */ + qualifier = PrintfQualifierSizeT; + break; + default: + qualifier = PrintfQualifierInt; /* default type */ + --i; } @@ -553,61 +553,61 @@ * String and character conversions. */ - case 's': - if ((retval = print_string(va_arg(ap, char*), width, precision, flags, ps)) < 0) { - goto minus_out; - }; + case 's': + if ((retval = print_string(va_arg(ap, char*), width, precision, flags, ps)) < 0) { + goto minus_out; + } - counter += retval; - j = i + 1; - goto next_char; - case 'c': - c = va_arg(ap, unsigned int); - if ((retval = print_char(c, width, flags, ps)) < 0) { - goto minus_out; - }; - - counter += retval; - j = i + 1; - goto next_char; - - /* - * Integer values - */ - case 'P': /* pointer */ - flags |= __PRINTF_FLAG_BIGCHARS; - case 'p': - flags |= __PRINTF_FLAG_PREFIX; - base = 16; - qualifier = PrintfQualifierPointer; - break; - case 'b': - base = 2; - break; - case 'o': - base = 8; - break; - case 'd': - case 'i': - flags |= __PRINTF_FLAG_SIGNED; - case 'u': - break; - case 'X': - flags |= __PRINTF_FLAG_BIGCHARS; - case 'x': - base = 16; - break; - /* percentile itself */ - case '%': - j = i; - goto next_char; - /* - * Bad formatting. - */ - default: - /* Unknown format - * now, the j is index of '%' so we will - * print whole bad format sequence - */ - goto next_char; + counter += retval; + j = i + 1; + goto next_char; + case 'c': + c = va_arg(ap, unsigned int); + if ((retval = print_char(c, width, flags, ps)) < 0) { + goto minus_out; + } + + counter += retval; + j = i + 1; + goto next_char; + + /* + * Integer values + */ + case 'P': /* pointer */ + flags |= __PRINTF_FLAG_BIGCHARS; + case 'p': + flags |= __PRINTF_FLAG_PREFIX; + base = 16; + qualifier = PrintfQualifierPointer; + break; + case 'b': + base = 2; + break; + case 'o': + base = 8; + break; + case 'd': + case 'i': + flags |= __PRINTF_FLAG_SIGNED; + case 'u': + break; + case 'X': + flags |= __PRINTF_FLAG_BIGCHARS; + case 'x': + base = 16; + break; + /* percentile itself */ + case '%': + j = i; + goto next_char; + /* + * Bad formatting. + */ + default: + /* Unknown format + * now, the j is index of '%' so we will + * print whole bad format sequence + */ + goto next_char; } @@ -616,34 +616,34 @@ /* print number */ switch (qualifier) { - case PrintfQualifierByte: - size = sizeof(unsigned char); - number = (uint64_t)va_arg(ap, unsigned int); - break; - case PrintfQualifierShort: - size = sizeof(unsigned short); - number = (uint64_t)va_arg(ap, unsigned int); - break; - case PrintfQualifierInt: - size = sizeof(unsigned int); - number = (uint64_t)va_arg(ap, unsigned int); - break; - case PrintfQualifierLong: - size = sizeof(unsigned long); - number = (uint64_t)va_arg(ap, unsigned long); - break; - case PrintfQualifierLongLong: - size = sizeof(unsigned long long); - number = (uint64_t)va_arg(ap, unsigned long long); - break; - case PrintfQualifierPointer: - size = sizeof(void *); - number = (uint64_t)(unsigned long)va_arg(ap, void *); - break; - case PrintfQualifierSizeT: - size = sizeof(size_t); - number = (uint64_t)va_arg(ap, size_t); - break; - default: /* Unknown qualifier */ - goto minus_out; + case PrintfQualifierByte: + size = sizeof(unsigned char); + number = (uint64_t)va_arg(ap, unsigned int); + break; + case PrintfQualifierShort: + size = sizeof(unsigned short); + number = (uint64_t)va_arg(ap, unsigned int); + break; + case PrintfQualifierInt: + size = sizeof(unsigned int); + number = (uint64_t)va_arg(ap, unsigned int); + break; + case PrintfQualifierLong: + size = sizeof(unsigned long); + number = (uint64_t)va_arg(ap, unsigned long); + break; + case PrintfQualifierLongLong: + size = sizeof(unsigned long long); + number = (uint64_t)va_arg(ap, unsigned long long); + break; + case PrintfQualifierPointer: + size = sizeof(void *); + number = (uint64_t)(unsigned long)va_arg(ap, void *); + break; + case PrintfQualifierSizeT: + size = sizeof(size_t); + number = (uint64_t)va_arg(ap, size_t); + break; + default: /* Unknown qualifier */ + goto minus_out; }