Changeset 7afd12e5 in mainline


Ignore:
Timestamp:
2018-08-04T14:23:17Z (6 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7ab7075f
Parents:
c8c418cf
Message:

unify format verification

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • boot/generic/include/printf_verify.h

    rc8c418cf r7afd12e5  
    3333#define BOOT_PRINTF_VERIFY_H_
    3434
    35 #ifndef _HELENOS_NVERIFY_PRINTF
    36 
     35#ifdef __clang__
     36#define _HELENOS_PRINTF_ATTRIBUTE(start, end) \
     37        __attribute__((format(__printf__, start, end)))
     38#else
    3739#define _HELENOS_PRINTF_ATTRIBUTE(start, end) \
    3840        __attribute__((format(gnu_printf, start, end)))
    39 
    40 #else /* _HELENOS_NVERIFY_PRINTF */
    41 
    42 #define _HELENOS_PRINTF_ATTRIBUTE(start, end)
    43 
    44 #endif /* _HELENOS_NVERIFY_PRINTF */
     41#endif
    4542
    4643#endif

  • kernel/generic/include/printf/verify.h

    rc8c418cf r7afd12e5  
    3636#define KERN_PRINTF_VERIFY_H_
    3737
    38 #ifndef _HELENOS_NVERIFY_PRINTF
    39 
    4038#ifdef __clang__
    4139#define _HELENOS_PRINTF_ATTRIBUTE(start, end) \
    … …  
    4644#endif
    4745
    48 
    49 #else /* _HELENOS_NVERIFY_PRINTF */
    50 
    51 #define _HELENOS_PRINTF_ATTRIBUTE(start, end)
    52 
    53 #endif /* _HELENOS_NVERIFY_PRINTF */
    54 
    5546#endif
    5647

  • kernel/test/print/print5.c

    rc8c418cf r7afd12e5  
    3737 *
    3838 */
    39 #define _HELENOS_NVERIFY_PRINTF
     39#pragma GCC diagnostic ignored "-Wformat"
    4040
    4141#include <print.h>

  • uspace/lib/c/include/io/verify.h

    rc8c418cf r7afd12e5  
    3636#define LIBC_IO_VERIFY_H_
    3737
    38 #ifndef _HELENOS_NVERIFY_PRINTF
    39 
    4038#ifdef __clang__
    4139#define _HELENOS_PRINTF_ATTRIBUTE(start, end) \
    … …  
    4644#endif
    4745
    48 #else /* _HELENOS_NVERIFY_PRINTF */
    49 
    50 #define _HELENOS_PRINTF_ATTRIBUTE(start, end)
    51 
    52 #endif /* _HELENOS_NVERIFY_PRINTF */
    53 
    5446#endif
    5547
Note: See TracChangeset for help on using the changeset viewer.