Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 1616 → Rev 1615

/uspace/trunk/libc/generic/io/printf_core.c
37,8 → 37,6
#include <io/printf_core.h>
#include <ctype.h>
#include <string.h>
/* For serialization */
#include <async.h>
 
#define __PRINTF_FLAG_PREFIX 0x00000001 /**< show prefixes 0x or 0*/
#define __PRINTF_FLAG_SIGNED 0x00000002 /**< signed / unsigned number */
446,9 → 444,6
int width, precision;
uint64_t flags;
/* Don't let other threads interfere */
async_serialize_start();
 
counter = 0;
while ((c = fmt[i])) {
457,7 → 452,7
/* print common characters if any processed */
if (i > j) {
if ((retval = printf_putnchars(&fmt[j], (size_t)(i - j), ps)) == EOF) { /* error */
goto minus_out;
return -counter;
}
counter += retval;
}
553,7 → 548,7
*/
case 's':
if ((retval = print_string(va_arg(ap, char*), width, precision, flags, ps)) == EOF) {
goto minus_out;
return -counter;
};
counter += retval;
562,7 → 557,7
case 'c':
c = va_arg(ap, unsigned int);
if ((retval = print_char(c, width, flags, ps)) == EOF) {
goto minus_out;
return -counter;
};
counter += retval;
643,7 → 638,7
number = (uint64_t)va_arg(ap, size_t);
break;
default: /* Unknown qualifier */
goto minus_out;
return -counter;
}
662,7 → 657,7
}
 
if ((retval = print_number(number, width, precision, base, flags, ps)) == EOF ) {
goto minus_out;
return -counter;
};
 
counter += retval;
675,15 → 670,11
if (i > j) {
if ((retval = printf_putnchars(&fmt[j], (size_t)(i - j), ps)) == EOF) { /* error */
goto minus_out;
return -counter;
}
counter += retval;
}
async_serialize_end();
return counter;
minus_out:
async_serialize_end();
return -counter;
}
 
/uspace/trunk/klog/klog.c
41,6 → 41,7
int i;
async_serialize_start();
/* TODO: remove workaround around non-functional vsnprintf */
for (i=0; klog[i + IPC_GET_ARG2(*call)] && i < IPC_GET_ARG3(*call); i++)
putchar(klog[i + IPC_GET_ARG2(*call)]);
putchar('\n');
/uspace/trunk/console/console.c
371,7 → 371,6
/* Commit hangup */
ipc_answer_fast(callid, 0,0,0);
conn->used = 0;
async_serialize_end();
return;
case CONSOLE_PUTCHAR: