Index: boot/generic/include/printf.h =================================================================== --- boot/generic/include/printf.h (revision dd133498180af40b7b8f6a78e32761ec7fc14d3c) +++ boot/generic/include/printf.h (revision aa492fe19494af0906b221865dbd7568f0b09cda) @@ -35,15 +35,5 @@ #include #include - -#ifndef NVERIFY_PRINTF - -#define PRINTF_ATTRIBUTE(start, end) \ - __attribute__((format(gnu_printf, start, end))) - -#else /* NVERIFY_PRINTF */ - -#define PRINTF_ATTRIBUTE(start, end) - -#endif /* NVERIFY_PRINTF */ +#include #define EOF (-1) Index: boot/generic/include/printf_verify.h =================================================================== --- boot/generic/include/printf_verify.h (revision aa492fe19494af0906b221865dbd7568f0b09cda) +++ boot/generic/include/printf_verify.h (revision aa492fe19494af0906b221865dbd7568f0b09cda) @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2012 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @file + */ + +#ifndef BOOT_PRINTF_VERIFY_H_ +#define BOOT_PRINTF_VERIFY_H_ + +#ifndef NVERIFY_PRINTF + +#define PRINTF_ATTRIBUTE(start, end) \ + __attribute__((format(gnu_printf, start, end))) + +#else /* NVERIFY_PRINTF */ + +#define PRINTF_ATTRIBUTE(start, end) + +#endif /* NVERIFY_PRINTF */ + +#endif + +/** @} + */ Index: kernel/generic/include/interrupt.h =================================================================== --- kernel/generic/include/interrupt.h (revision dd133498180af40b7b8f6a78e32761ec7fc14d3c) +++ kernel/generic/include/interrupt.h (revision aa492fe19494af0906b221865dbd7568f0b09cda) @@ -59,5 +59,6 @@ extern exc_table_t exc_table[]; -extern void fault_from_uspace(istate_t *, const char *, ...); +extern void fault_from_uspace(istate_t *, const char *, ...) + PRINTF_ATTRIBUTE(2, 3); extern void fault_if_from_uspace(istate_t *, const char *, ...) PRINTF_ATTRIBUTE(2, 3); Index: kernel/generic/include/print.h =================================================================== --- kernel/generic/include/print.h (revision dd133498180af40b7b8f6a78e32761ec7fc14d3c) +++ kernel/generic/include/print.h (revision aa492fe19494af0906b221865dbd7568f0b09cda) @@ -38,15 +38,5 @@ #include #include - -#ifndef NVERIFY_PRINTF - -#define PRINTF_ATTRIBUTE(start, end) \ - __attribute__((format(gnu_printf, start, end))) - -#else /* NVERIFY_PRINTF */ - -#define PRINTF_ATTRIBUTE(start, end) - -#endif /* NVERIFY_PRINTF */ +#include #define EOF (-1) Index: kernel/generic/include/printf/verify.h =================================================================== --- kernel/generic/include/printf/verify.h (revision aa492fe19494af0906b221865dbd7568f0b09cda) +++ kernel/generic/include/printf/verify.h (revision aa492fe19494af0906b221865dbd7568f0b09cda) @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2012 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup generic + * @{ + */ +/** @file + */ + +#ifndef KERN_PRINTF_VERIFY_H_ +#define KERN_PRINTF_VERIFY_H_ + +#ifndef NVERIFY_PRINTF + +#define PRINTF_ATTRIBUTE(start, end) \ + __attribute__((format(gnu_printf, start, end))) + +#else /* NVERIFY_PRINTF */ + +#define PRINTF_ATTRIBUTE(start, end) + +#endif /* NVERIFY_PRINTF */ + +#endif + +/** @} + */ Index: uspace/app/bdsh/errors.h =================================================================== --- uspace/app/bdsh/errors.h (revision dd133498180af40b7b8f6a78e32761ec7fc14d3c) +++ uspace/app/bdsh/errors.h (revision aa492fe19494af0906b221865dbd7568f0b09cda) @@ -30,4 +30,6 @@ #define ERRORS_H +#include + /* Various error levels */ #define CL_EFATAL -1 @@ -46,5 +48,6 @@ extern volatile int cli_errno; -extern void cli_error(int, const char *, ...); +extern void cli_error(int, const char *, ...) + PRINTF_ATTRIBUTE(2, 3); #endif Index: uspace/app/top/screen.h =================================================================== --- uspace/app/top/screen.h (revision dd133498180af40b7b8f6a78e32761ec7fc14d3c) +++ uspace/app/top/screen.h (revision aa492fe19494af0906b221865dbd7568f0b09cda) @@ -36,4 +36,5 @@ #include +#include #include "top.h" @@ -43,5 +44,6 @@ extern void screen_done(void); extern void print_data(data_t *); -extern void show_warning(const char *, ...); +extern void show_warning(const char *, ...) + PRINTF_ATTRIBUTE(1, 2); extern int tgetchar(unsigned int); Index: uspace/dist/src/c/demos/top/screen.h =================================================================== --- uspace/dist/src/c/demos/top/screen.h (revision dd133498180af40b7b8f6a78e32761ec7fc14d3c) +++ uspace/dist/src/c/demos/top/screen.h (revision aa492fe19494af0906b221865dbd7568f0b09cda) @@ -36,4 +36,5 @@ #include +#include #include "top.h" @@ -43,5 +44,6 @@ extern void screen_done(void); extern void print_data(data_t *); -extern void print_warning(const char *, ...); +extern void print_warning(const char *, ...) + PRINTF_ATTRIBUTE(1, 2); extern int tgetchar(unsigned int); Index: uspace/lib/c/include/io/klog.h =================================================================== --- uspace/lib/c/include/io/klog.h (revision dd133498180af40b7b8f6a78e32761ec7fc14d3c) +++ uspace/lib/c/include/io/klog.h (revision aa492fe19494af0906b221865dbd7568f0b09cda) @@ -38,8 +38,10 @@ #include #include +#include extern size_t klog_write(const void *, size_t); extern void klog_update(void); -extern int klog_printf(const char *, ...); +extern int klog_printf(const char *, ...) + PRINTF_ATTRIBUTE(1, 2); extern int klog_vprintf(const char *, va_list); Index: uspace/lib/c/include/io/log.h =================================================================== --- uspace/lib/c/include/io/log.h (revision dd133498180af40b7b8f6a78e32761ec7fc14d3c) +++ uspace/lib/c/include/io/log.h (revision aa492fe19494af0906b221865dbd7568f0b09cda) @@ -36,4 +36,5 @@ #include +#include typedef enum { @@ -44,5 +45,5 @@ LVL_DEBUG, LVL_DEBUG2, - + /** For checking range of values */ LVL_LIMIT @@ -50,5 +51,6 @@ extern int log_init(const char *, log_level_t); -extern void log_msg(log_level_t, const char *, ...); +extern void log_msg(log_level_t, const char *, ...) + PRINTF_ATTRIBUTE(2, 3); extern void log_msgv(log_level_t, const char *, va_list); Index: uspace/lib/c/include/io/verify.h =================================================================== --- uspace/lib/c/include/io/verify.h (revision aa492fe19494af0906b221865dbd7568f0b09cda) +++ uspace/lib/c/include/io/verify.h (revision aa492fe19494af0906b221865dbd7568f0b09cda) @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2012 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_IO_VERIFY_H_ +#define LIBC_IO_VERIFY_H_ + +#ifndef NVERIFY_PRINTF + +#define PRINTF_ATTRIBUTE(start, end) \ + __attribute__((format(gnu_printf, start, end))) + +#else /* NVERIFY_PRINTF */ + +#define PRINTF_ATTRIBUTE(start, end) + +#endif /* NVERIFY_PRINTF */ + +#endif + +/** @} + */ Index: uspace/lib/c/include/stdio.h =================================================================== --- uspace/lib/c/include/stdio.h (revision dd133498180af40b7b8f6a78e32761ec7fc14d3c) +++ uspace/lib/c/include/stdio.h (revision aa492fe19494af0906b221865dbd7568f0b09cda) @@ -39,15 +39,5 @@ #include #include - -#ifndef NVERIFY_PRINTF - -#define PRINTF_ATTRIBUTE(start, end) \ - __attribute__((format(gnu_printf, start, end))) - -#else /* NVERIFY_PRINTF */ - -#define PRINTF_ATTRIBUTE(start, end) - -#endif /* NVERIFY_PRINTF */ +#include #define EOF (-1) Index: uspace/lib/drv/include/ddf/log.h =================================================================== --- uspace/lib/drv/include/ddf/log.h (revision dd133498180af40b7b8f6a78e32761ec7fc14d3c) +++ uspace/lib/drv/include/ddf/log.h (revision aa492fe19494af0906b221865dbd7568f0b09cda) @@ -35,7 +35,9 @@ #include +#include extern int ddf_log_init(const char *, log_level_t); -extern void ddf_msg(log_level_t, const char *, ...); +extern void ddf_msg(log_level_t, const char *, ...) + PRINTF_ATTRIBUTE(2, 3); extern void ddf_dump_buffer(char *, size_t, const void *, size_t, size_t,