Changeset 09d13c8e in mainline


Ignore:
Timestamp:
2018-01-13T14:57:38Z (7 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bd76871
Parents:
18bb198
Message:

Prefix PRINTF_ATTRIBUTE and NVERIFY_PRINTF macros with _HELENOS_ prefix,
because they are used in standard headers.

Files:
19 edited

Legend:

Unmodified
Added
Removed

  • boot/generic/include/printf.h

    r18bb198 r09d13c8e  
    4141extern int puts(const char *);
    4242extern int printf(const char *, ...)
    43     PRINTF_ATTRIBUTE(1, 2);
     43    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
    4444extern int vprintf(const char *, va_list);
    4545

  • boot/generic/include/printf_verify.h

    r18bb198 r09d13c8e  
    3333#define BOOT_PRINTF_VERIFY_H_
    3434
    35 #ifndef NVERIFY_PRINTF
     35#ifndef _HELENOS_NVERIFY_PRINTF
    3636
    37 #define PRINTF_ATTRIBUTE(start, end) \
     37#define _HELENOS_PRINTF_ATTRIBUTE(start, end) \
    3838        __attribute__((format(gnu_printf, start, end)))
    3939
    40 #else /* NVERIFY_PRINTF */
     40#else /* _HELENOS_NVERIFY_PRINTF */
    4141
    42 #define PRINTF_ATTRIBUTE(start, end)
     42#define _HELENOS_PRINTF_ATTRIBUTE(start, end)
    4343
    44 #endif /* NVERIFY_PRINTF */
     44#endif /* _HELENOS_NVERIFY_PRINTF */
    4545
    4646#endif

  • kernel/generic/include/interrupt.h

    r18bb198 r09d13c8e  
    6161
    6262extern void fault_from_uspace(istate_t *, const char *, ...)
    63     PRINTF_ATTRIBUTE(2, 3);
     63    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
    6464extern void fault_if_from_uspace(istate_t *, const char *, ...)
    65     PRINTF_ATTRIBUTE(2, 3);
     65    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
    6666extern istate_t *istate_get(thread_t *);
    6767extern iroutine_t exc_register(unsigned int, const char *, bool, iroutine_t);

  • kernel/generic/include/log.h

    r18bb198 r09d13c8e  
    4848extern int log_vprintf(const char *, va_list);
    4949extern int log_printf(const char *, ...)
    50     PRINTF_ATTRIBUTE(1, 2);
     50    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
    5151extern int log(log_facility_t, log_level_t, const char *, ...)
    52     PRINTF_ATTRIBUTE(3, 4);
     52    _HELENOS_PRINTF_ATTRIBUTE(3, 4);
    5353
    5454extern sys_errno_t sys_klog(sysarg_t, void *buf, size_t size,

  • kernel/generic/include/panic.h

    r18bb198 r09d13c8e  
    6666extern void panic_common(panic_category_t, struct istate *, int,
    6767    uintptr_t, const char *, ...) __attribute__ ((noreturn))
    68     PRINTF_ATTRIBUTE(5, 6);
     68    _HELENOS_PRINTF_ATTRIBUTE(5, 6);
    6969
    7070#endif

  • kernel/generic/include/print.h

    r18bb198 r09d13c8e  
    4444extern int puts(const char *s);
    4545extern int printf(const char *fmt, ...)
    46     PRINTF_ATTRIBUTE(1, 2);
     46    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
    4747extern int snprintf(char *str, size_t size, const char *fmt, ...)
    48     PRINTF_ATTRIBUTE(3, 4);
     48    _HELENOS_PRINTF_ATTRIBUTE(3, 4);
    4949
    5050extern int vprintf(const char *fmt, va_list ap);

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

    r18bb198 r09d13c8e  
    3636#define KERN_PRINTF_VERIFY_H_
    3737
    38 #ifndef NVERIFY_PRINTF
     38#ifndef _HELENOS_NVERIFY_PRINTF
    3939
    4040#ifdef __clang__
    41 #define PRINTF_ATTRIBUTE(start, end) \
     41#define _HELENOS_PRINTF_ATTRIBUTE(start, end) \
    4242        __attribute__((format(__printf__, start, end)))
    4343#else
    44 #define PRINTF_ATTRIBUTE(start, end) \
     44#define _HELENOS_PRINTF_ATTRIBUTE(start, end) \
    4545        __attribute__((format(gnu_printf, start, end)))
    4646#endif
    4747
    4848
    49 #else /* NVERIFY_PRINTF */
     49#else /* _HELENOS_NVERIFY_PRINTF */
    5050
    51 #define PRINTF_ATTRIBUTE(start, end)
     51#define _HELENOS_PRINTF_ATTRIBUTE(start, end)
    5252
    53 #endif /* NVERIFY_PRINTF */
     53#endif /* _HELENOS_NVERIFY_PRINTF */
    5454
    5555#endif

  • kernel/test/print/print5.c

    r18bb198 r09d13c8e  
    3737 *
    3838 */
    39 #define NVERIFY_PRINTF
     39#define _HELENOS_NVERIFY_PRINTF
    4040
    4141#include <print.h>

  • uspace/app/bdsh/errors.h

    r18bb198 r09d13c8e  
    4949
    5050extern void cli_error(int, const char *, ...)
    51     PRINTF_ATTRIBUTE(2, 3);
     51    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
    5252
    5353#endif

  • uspace/app/fontviewer/fontviewer.c

    r18bb198 r09d13c8e  
    139139
    140140static int text(drawctx_t *, font_t *, source_t *, surface_coord_t x,
    141     surface_coord_t , const char *, ...) PRINTF_ATTRIBUTE(6, 7);
     141    surface_coord_t , const char *, ...) _HELENOS_PRINTF_ATTRIBUTE(6, 7);
    142142static int text(drawctx_t *drawctx, font_t *font, source_t *source,
    143143    surface_coord_t x, surface_coord_t y, const char *fmt, ...)

  • uspace/app/tester/print/print5.c

    r18bb198 r09d13c8e  
    3737 *
    3838 */
    39 #define NVERIFY_PRINTF
     39#define _HELENOS_NVERIFY_PRINTF
    4040
    4141#include <stdio.h>

  • uspace/app/top/screen.h

    r18bb198 r09d13c8e  
    4545extern void print_data(data_t *);
    4646extern void show_warning(const char *, ...)
    47     PRINTF_ATTRIBUTE(1, 2);
     47    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
    4848
    4949extern int tgetchar(unsigned int);

  • uspace/dist/src/c/demos/top/screen.h

    r18bb198 r09d13c8e  
    4545extern void print_data(data_t *);
    4646extern void show_warning(const char *, ...)
    47     PRINTF_ATTRIBUTE(1, 2);
     47    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
    4848
    4949extern errno_t tgetchar(unsigned int);

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

    r18bb198 r09d13c8e  
    4444extern void kio_command(const void *, size_t);
    4545extern int kio_printf(const char *, ...)
    46     PRINTF_ATTRIBUTE(1, 2);
     46    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
    4747extern int kio_vprintf(const char *, va_list);
    4848

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

    r18bb198 r09d13c8e  
    6060
    6161extern void log_msg(log_t, log_level_t, const char *, ...)
    62     PRINTF_ATTRIBUTE(3, 4);
     62    _HELENOS_PRINTF_ATTRIBUTE(3, 4);
    6363extern void log_msgv(log_t, log_level_t, const char *, va_list);
    6464

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

    r18bb198 r09d13c8e  
    3636#define LIBC_IO_VERIFY_H_
    3737
    38 #ifndef NVERIFY_PRINTF
     38#ifndef _HELENOS_NVERIFY_PRINTF
    3939
    4040#ifdef __clang__
    41 #define PRINTF_ATTRIBUTE(start, end) \
     41#define _HELENOS_PRINTF_ATTRIBUTE(start, end) \
    4242        __attribute__((format(__printf__, start, end)))
    4343#else
    44 #define PRINTF_ATTRIBUTE(start, end) \
     44#define _HELENOS_PRINTF_ATTRIBUTE(start, end) \
    4545        __attribute__((format(gnu_printf, start, end)))
    4646#endif
    4747
    48 #else /* NVERIFY_PRINTF */
     48#else /* _HELENOS_NVERIFY_PRINTF */
    4949
    50 #define PRINTF_ATTRIBUTE(start, end)
     50#define _HELENOS_PRINTF_ATTRIBUTE(start, end)
    5151
    52 #endif /* NVERIFY_PRINTF */
     52#endif /* _HELENOS_NVERIFY_PRINTF */
    5353
    5454#endif

  • uspace/lib/c/include/stdio.h

    r18bb198 r09d13c8e  
    112112/* Formatted string output functions */
    113113extern int fprintf(FILE *, const char*, ...)
    114     PRINTF_ATTRIBUTE(2, 3);
     114    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
    115115extern int vfprintf(FILE *, const char *, va_list);
    116116
    117117extern int printf(const char *, ...)
    118     PRINTF_ATTRIBUTE(1, 2);
     118    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
    119119extern int vprintf(const char *, va_list);
    120120
    121121extern int snprintf(char *, size_t , const char *, ...)
    122     PRINTF_ATTRIBUTE(3, 4);
     122    _HELENOS_PRINTF_ATTRIBUTE(3, 4);
    123123extern int vasprintf(char **, const char *, va_list);
    124124extern int asprintf(char **, const char *, ...)
    125     PRINTF_ATTRIBUTE(2, 3);
     125    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
    126126extern int vsnprintf(char *, size_t, const char *, va_list);
    127127
    128128extern int printf_size(const char *, ...)
    129     PRINTF_ATTRIBUTE(1, 2);
     129    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
    130130extern int vprintf_size(const char *, va_list);
    131131

  • uspace/lib/drv/include/ddf/log.h

    r18bb198 r09d13c8e  
    3939extern errno_t ddf_log_init(const char *);
    4040extern void ddf_msg(log_level_t, const char *, ...)
    41     PRINTF_ATTRIBUTE(2, 3);
     41    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
    4242
    4343extern void ddf_dump_buffer(char *, size_t, const void *, size_t, size_t,

  • uspace/lib/posix/include/posix/stdio.h

    r18bb198 r09d13c8e  
    9999extern int puts(const char *);
    100100
    101 extern int fprintf(FILE *, const char*, ...) PRINTF_ATTRIBUTE(2, 3);
     101extern int fprintf(FILE *, const char*, ...) _HELENOS_PRINTF_ATTRIBUTE(2, 3);
    102102extern int vfprintf(FILE *, const char *, va_list);
    103103
    104 extern int printf(const char *, ...) PRINTF_ATTRIBUTE(1, 2);
     104extern int printf(const char *, ...) _HELENOS_PRINTF_ATTRIBUTE(1, 2);
    105105extern int vprintf(const char *, va_list);
    106106
    107 extern int snprintf(char *, size_t , const char *, ...) PRINTF_ATTRIBUTE(3, 4);
     107extern int snprintf(char *, size_t , const char *, ...) _HELENOS_PRINTF_ATTRIBUTE(3, 4);
    108108#ifdef _GNU_SOURCE
    109109extern int vasprintf(char **, const char *, va_list);
    110 extern int asprintf(char **, const char *, ...) PRINTF_ATTRIBUTE(2, 3);
     110extern int asprintf(char **, const char *, ...) _HELENOS_PRINTF_ATTRIBUTE(2, 3);
    111111#endif
    112112extern int vsnprintf(char *, size_t, const char *, va_list);
    … …  
    176176/* Formatted Output */
    177177extern int __POSIX_DEF__(dprintf)(int fildes, const char *__restrict__ format, ...)
    178     PRINTF_ATTRIBUTE(2, 3);
     178    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
    179179extern int __POSIX_DEF__(vdprintf)(int fildes, const char *__restrict__ format, va_list ap);
    180180extern int __POSIX_DEF__(sprintf)(char *__restrict__ s, const char *__restrict__ format, ...)
    181     PRINTF_ATTRIBUTE(2, 3);
     181    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
    182182extern int __POSIX_DEF__(vsprintf)(char *__restrict__ s, const char *__restrict__ format, va_list ap);
    183183
Note: See TracChangeset for help on using the changeset viewer.