Changeset 5572ad1 in mainline


Ignore:
Timestamp:
2012-08-23T21:50:46Z (12 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
276e44a
Parents:
ae827d0 (diff), db81577 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge mainline changes

Files:
3 added
19 edited

Legend:

Unmodified
Added
Removed

  • boot/generic/include/printf.h

    rae827d0 r5572ad1  
    3535#include <typedefs.h>
    3636#include <stdarg.h>
    37 
    38 #ifndef NVERIFY_PRINTF
    39 
    40 #define PRINTF_ATTRIBUTE(start, end) \
    41         __attribute__((format(gnu_printf, start, end)))
    42 
    43 #else /* NVERIFY_PRINTF */
    44 
    45 #define PRINTF_ATTRIBUTE(start, end)
    46 
    47 #endif /* NVERIFY_PRINTF */
     37#include <printf_verify.h>
    4838
    4939#define EOF  (-1)

  • kernel/generic/include/interrupt.h

    rae827d0 r5572ad1  
    5959extern exc_table_t exc_table[];
    6060
    61 extern void fault_from_uspace(istate_t *, const char *, ...);
     61extern void fault_from_uspace(istate_t *, const char *, ...)
     62    PRINTF_ATTRIBUTE(2, 3);
    6263extern void fault_if_from_uspace(istate_t *, const char *, ...)
    6364    PRINTF_ATTRIBUTE(2, 3);

  • kernel/generic/include/print.h

    rae827d0 r5572ad1  
    3838#include <typedefs.h>
    3939#include <stdarg.h>
    40 
    41 #ifndef NVERIFY_PRINTF
    42 
    43 #define PRINTF_ATTRIBUTE(start, end) \
    44         __attribute__((format(gnu_printf, start, end)))
    45 
    46 #else /* NVERIFY_PRINTF */
    47 
    48 #define PRINTF_ATTRIBUTE(start, end)
    49 
    50 #endif /* NVERIFY_PRINTF */
     40#include <printf/verify.h>
    5141
    5242#define EOF  (-1)

  • uspace/app/bdsh/errors.h

    rae827d0 r5572ad1  
    3030#define ERRORS_H
    3131
     32#include <io/verify.h>
     33
    3234/* Various error levels */
    3335#define CL_EFATAL  -1
    … …  
    4648extern volatile int cli_errno;
    4749
    48 extern void cli_error(int, const char *, ...);
     50extern void cli_error(int, const char *, ...)
     51    PRINTF_ATTRIBUTE(2, 3);
    4952
    5053#endif

  • uspace/app/top/screen.h

    rae827d0 r5572ad1  
    3636
    3737#include <io/console.h>
     38#include <io/verify.h>
    3839#include "top.h"
    3940
    … …  
    4344extern void screen_done(void);
    4445extern void print_data(data_t *);
    45 extern void show_warning(const char *, ...);
     46extern void show_warning(const char *, ...)
     47    PRINTF_ATTRIBUTE(1, 2);
    4648
    4749extern int tgetchar(unsigned int);

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

    rae827d0 r5572ad1  
    3636
    3737#include <io/console.h>
     38#include <io/verify.h>
    3839#include "top.h"
    3940
    … …  
    4344extern void screen_done(void);
    4445extern void print_data(data_t *);
    45 extern void print_warning(const char *, ...);
     46extern void print_warning(const char *, ...)
     47    PRINTF_ATTRIBUTE(1, 2);
    4648
    4749extern int tgetchar(unsigned int);

  • uspace/drv/bus/isa/i8237.c

    rae827d0 r5572ad1  
    351351       
    352352        /* 16 bit transfers are a bit special */
    353         ddf_msg(LVL_DEBUG, "Unspoiled address: %p and size: %zu.", pa, size);
     353        ddf_msg(LVL_DEBUG, "Unspoiled address %#" PRIx32 " (size %" PRIu16 ")",
     354            pa, size);
    354355        if (channel > 4) {
    355356                /* Size must be aligned to 16 bits */
    … …  
    367368        const dma_channel_t dma_channel = controller_8237.channels[channel];
    368369       
    369         ddf_msg(LVL_DEBUG, "Setting channel %u, to address %p(%zu), mode %hhx.",
    370             channel, pa, size, mode);
     370        ddf_msg(LVL_DEBUG, "Setting channel %u to address %#" PRIx32 " "
     371            "(size %" PRIu16 "), mode %hhx.", channel, pa, size, mode);
    371372       
    372373        /* Mask DMA request */

  • uspace/drv/char/ps2mouse/ps2mouse.c

    rae827d0 r5572ad1  
    7575        const ssize_t size = chardev_read(sess, &data, 1); \
    7676        if (size != 1) { \
    77                 ddf_msg(LVL_ERROR, "Failed reading byte: %d)", size);\
     77                ddf_msg(LVL_ERROR, "Failed reading byte: %zd)", size);\
    7878                return size < 0 ? size : EIO; \
    7979        } \

  • uspace/drv/nic/rtl8139/driver.c

    rae827d0 r5572ad1  
    620620                /* Check if the header is valid, otherwise we are lost in the buffer */
    621621                if (size == 0 || size > RTL8139_FRAME_MAX_LENGTH) {
    622                         ddf_msg(LVL_ERROR, "Receiver error -> receiver reset (size: %4"PRIu16", "
    623                             "header 0x%4"PRIx16". Offset: %zu)", size, frame_header,
     622                        ddf_msg(LVL_ERROR, "Receiver error -> receiver reset (size: %4" PRIu16 ", "
     623                            "header 0x%4" PRIx16 ". Offset: %d)", size, frame_header,
    624624                            rx_offset);
    625625                        goto rx_err;
    … …  
    11621162
    11631163        /* Allocate buffer for receiver */
    1164         ddf_msg(LVL_DEBUG, "Allocating receiver buffer of the size %zu bytes",
     1164        ddf_msg(LVL_DEBUG, "Allocating receiver buffer of the size %d bytes",
    11651165            RxBUF_TOT_LENGTH);
    11661166
    … …  
    12491249        /* Gain control over port's registers. */
    12501250        if (pio_enable(rtl8139->io_addr, RTL8139_IO_SIZE, &rtl8139->io_port)) {
    1251                 ddf_msg(LVL_ERROR, "Cannot gain the port %lx for device %s.", rtl8139->io_addr,
     1251                ddf_msg(LVL_ERROR, "Cannot gain the port %p for device %s.", rtl8139->io_addr,
    12521252                    ddf_dev_get_name(dev));
    12531253                return EADDRNOTAVAIL;
    … …  
    12961296
    12971297        assert(dev);
    1298         ddf_msg(LVL_NOTE, "RTL8139_dev_add %s (handle = %d)",
     1298        ddf_msg(LVL_NOTE, "RTL8139_dev_add %s (handle = %zu)",
    12991299            ddf_dev_get_name(dev), ddf_dev_get_handle(dev));
    13001300
    … …  
    13281328        rc = nic_connect_to_services(nic_data);
    13291329        if (rc != EOK) {
    1330                 ddf_msg(LVL_ERROR, "Failed to connect to services", rc);
     1330                ddf_msg(LVL_ERROR, "Failed to connect to services (%d)", rc);
    13311331                goto err_irq;
    13321332        }
    … …  
    21392139                pio_write_32(rtl8139->io_port + TCTR, 0);
    21402140
    2141                 ddf_msg(LVL_DEBUG, "Periodic mode. Interrupt mask %"PRIx16", poll.full_skips %"
    2142                     PRIu32", last timer %"PRIu32".", rtl8139->int_mask,
    2143                     rtl8139->poll_timer.full_skips, rtl8139->poll_timer.last_val);
     2141                ddf_msg(LVL_DEBUG, "Periodic mode. Interrupt mask %" PRIx16 ", "
     2142                    "poll.full_skips %zu, last timer %" PRIu32,
     2143                    rtl8139->int_mask, rtl8139->poll_timer.full_skips,
     2144                    rtl8139->poll_timer.last_val);
    21442145                break;
    21452146        default:

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

    rae827d0 r5572ad1  
    3838#include <sys/types.h>
    3939#include <stdarg.h>
     40#include <io/verify.h>
    4041
    4142extern size_t klog_write(const void *, size_t);
    4243extern void klog_update(void);
    43 extern int klog_printf(const char *, ...);
     44extern int klog_printf(const char *, ...)
     45    PRINTF_ATTRIBUTE(1, 2);
    4446extern int klog_vprintf(const char *, va_list);
    4547

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

    rae827d0 r5572ad1  
    3636
    3737#include <stdarg.h>
     38#include <io/verify.h>
    3839
    3940typedef enum {
    … …  
    4445        LVL_DEBUG,
    4546        LVL_DEBUG2,
    46 
     47       
    4748        /** For checking range of values */
    4849        LVL_LIMIT
    … …  
    5051
    5152extern int log_init(const char *, log_level_t);
    52 extern void log_msg(log_level_t, const char *, ...);
     53extern void log_msg(log_level_t, const char *, ...)
     54    PRINTF_ATTRIBUTE(2, 3);
    5355extern void log_msgv(log_level_t, const char *, va_list);
    5456

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

    rae827d0 r5572ad1  
    3939#include <stdarg.h>
    4040#include <str.h>
    41 
    42 #ifndef NVERIFY_PRINTF
    43 
    44 #define PRINTF_ATTRIBUTE(start, end) \
    45         __attribute__((format(gnu_printf, start, end)))
    46 
    47 #else /* NVERIFY_PRINTF */
    48 
    49 #define PRINTF_ATTRIBUTE(start, end)
    50 
    51 #endif /* NVERIFY_PRINTF */
     41#include <io/verify.h>
    5242
    5343#define EOF  (-1)

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

    rae827d0 r5572ad1  
    3535
    3636#include <io/log.h>
     37#include <io/verify.h>
    3738
    3839extern int ddf_log_init(const char *, log_level_t);
    39 extern void ddf_msg(log_level_t, const char *, ...);
     40extern void ddf_msg(log_level_t, const char *, ...)
     41    PRINTF_ATTRIBUTE(2, 3);
    4042
    4143extern void ddf_dump_buffer(char *, size_t, const void *, size_t, size_t,

  • uspace/srv/net/ethip/pdu.c

    rae827d0 r5572ad1  
    6969            frame->size);
    7070
    71         log_msg(LVL_DEBUG, "Encoding Ethernet frame src=%llx dest=%llx etype=%x",
    72             frame->src, frame->dest, frame->etype_len);
     71        log_msg(LVL_DEBUG, "Encoding Ethernet frame "
     72            "src=%" PRIx64 " dest=%" PRIx64 " etype=%x",
     73            frame->src.addr, frame->dest.addr, frame->etype_len);
    7374        log_msg(LVL_DEBUG, "Encoded Ethernet frame (%zu bytes)", size);
    7475
    … …  
    104105            frame->size);
    105106
    106         log_msg(LVL_DEBUG, "Decoding Ethernet frame src=%llx dest=%llx etype=%x",
    107             frame->src, frame->dest, frame->etype_len);
     107        log_msg(LVL_DEBUG, "Decoding Ethernet frame "
     108            "src=%" PRIx64 " dest=%" PRIx64 " etype=%x",
     109            frame->src.addr, frame->dest.addr, frame->etype_len);
    108110        log_msg(LVL_DEBUG, "Decoded Ethernet frame payload (%zu bytes)", frame->size);
    109111

  • uspace/srv/net/tcp/conn.c

    rae827d0 r5572ad1  
    999999        } else {
    10001000                log_msg(LVL_DEBUG, "%s: Nothing left in segment, dropping "
    1001                     "(xfer_size=%zu, SEG.LEN=%zu, seg->ctrl=%u)",
    1002                     conn->name, xfer_size, seg->len, (unsigned)seg->ctrl);
     1001                    "(xfer_size=%zu, SEG.LEN=%" PRIu32 ", seg->ctrl=%u)",
     1002                    conn->name, xfer_size, seg->len, (unsigned int) seg->ctrl);
    10031003                /* Nothing left in segment */
    10041004                tcp_segment_delete(seg);
    … …  
    11461146void tcp_conn_segment_arrived(tcp_conn_t *conn, tcp_segment_t *seg)
    11471147{
    1148         log_msg(LVL_DEBUG, "%c: tcp_conn_segment_arrived(%p)",
     1148        log_msg(LVL_DEBUG, "%s: tcp_conn_segment_arrived(%p)",
    11491149            conn->name, seg);
    11501150

  • uspace/srv/net/tcp/segment.c

    rae827d0 r5572ad1  
    250250        log_msg(LVL_DEBUG2, "Segment dump:");
    251251        log_msg(LVL_DEBUG2, " - ctrl = %u", (unsigned)seg->ctrl);
    252         log_msg(LVL_DEBUG2, " - seq = % " PRIu32, seg->seq);
    253         log_msg(LVL_DEBUG2, " - ack = % " PRIu32, seg->ack);
    254         log_msg(LVL_DEBUG2, " - len = % " PRIu32, seg->len);
    255         log_msg(LVL_DEBUG2, " - wnd = % " PRIu32, seg->wnd);
    256         log_msg(LVL_DEBUG2, " - up = % " PRIu32, seg->up);
     252        log_msg(LVL_DEBUG2, " - seq = %" PRIu32, seg->seq);
     253        log_msg(LVL_DEBUG2, " - ack = %" PRIu32, seg->ack);
     254        log_msg(LVL_DEBUG2, " - len = %" PRIu32, seg->len);
     255        log_msg(LVL_DEBUG2, " - wnd = %" PRIu32, seg->wnd);
     256        log_msg(LVL_DEBUG2, " - up = %" PRIu32, seg->up);
    257257}
    258258

  • uspace/srv/net/tcp/sock.c

    rae827d0 r5572ad1  
    114114        *rsock = NULL;
    115115
    116         sock = calloc(sizeof(tcp_sockdata_t), 1);
     116        sock = calloc(1, sizeof(tcp_sockdata_t));
    117117        if (sock == NULL)
    118118                return ENOMEM;
    … …  
    277277
    278278        socket->backlog = backlog;
    279         socket->lconn = calloc(sizeof(tcp_conn_t *), backlog);
     279        socket->lconn = calloc(backlog, sizeof(tcp_conn_t *));
    280280        if (socket->lconn == NULL) {
    281281                fibril_mutex_unlock(&socket->lock);
    … …  
    293293        for (i = 0; i < backlog; i++) {
    294294
    295                 lconn = calloc(sizeof(tcp_sock_lconn_t), 1);
     295                lconn = calloc(1, sizeof(tcp_sock_lconn_t));
    296296                if (lconn == NULL) {
    297297                        /* XXX Clean up */

  • uspace/srv/net/tcp/tqueue.c

    rae827d0 r5572ad1  
    172172
    173173        xfer_seqlen = min(snd_buf_seqlen, avail_wnd);
    174         log_msg(LVL_DEBUG, "%s: snd_buf_seqlen = %zu, SND.WND = %zu, "
     174        log_msg(LVL_DEBUG, "%s: snd_buf_seqlen = %zu, SND.WND = %" PRIu32 ", "
    175175            "xfer_seqlen = %zu", conn->name, snd_buf_seqlen, conn->snd_wnd,
    176176            xfer_seqlen);

  • uspace/srv/net/udp/sock.c

    rae827d0 r5572ad1  
    104104
    105105        log_msg(LVL_DEBUG, "udp_sock_socket()");
    106         sock = calloc(sizeof(udp_sockdata_t), 1);
     106        sock = calloc(1, sizeof(udp_sockdata_t));
    107107        if (sock == NULL) {
    108108                async_answer_0(callid, ENOMEM);
Note: See TracChangeset for help on using the changeset viewer.