diff options
author | Ben Pfaff <blp@ovn.org> | 2018-05-25 16:50:29 -0700 |
---|---|---|
committer | Ben Pfaff <blp@ovn.org> | 2018-06-11 15:31:34 -0700 |
commit | fc002ed3a31406190c9c0abb6cd998aa5b8460d7 (patch) | |
tree | 8a3d10a693f8737982543984a38805e21bf7f146 /lib | |
parent | 017344c55eb9e4cbf5cef1e34a7a37a7d4e61d4e (diff) | |
download | openvswitch-fc002ed3a31406190c9c0abb6cd998aa5b8460d7.tar.gz |
bfd: Remove leading tabs from output.
OVS uses spaces for indentation in source code and it makes sense for it to
also use spaces for indentation in output. Spaces also consume less
horizontal space in output, which often makes it easier to read. This
commit transitions one part of output from tabs to spaces and updates
appropriate parts of the tests to match.
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Justin Pettit <jpettit@ovn.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/bfd.c | 54 |
1 files changed, 27 insertions, 27 deletions
@@ -1085,13 +1085,13 @@ log_msg(enum vlog_level level, const struct msg *p, const char *message, ds_put_format(&ds, "%s: %s." - "\n\tvers:%d diag:\"%s\" state:%s mult:%"PRIu8 + "\n vers:%d diag:\"%s\" state:%s mult:%"PRIu8 " length:%"PRIu8 - "\n\tflags: %s" - "\n\tmy_disc:0x%"PRIx32" your_disc:0x%"PRIx32 - "\n\tmin_tx:%"PRIu32"us (%"PRIu32"ms)" - "\n\tmin_rx:%"PRIu32"us (%"PRIu32"ms)" - "\n\tmin_rx_echo:%"PRIu32"us (%"PRIu32"ms)", + "\n flags: %s" + "\n my_disc:0x%"PRIx32" your_disc:0x%"PRIx32 + "\n min_tx:%"PRIu32"us (%"PRIu32"ms)" + "\n min_rx:%"PRIu32"us (%"PRIu32"ms)" + "\n min_rx_echo:%"PRIu32"us (%"PRIu32"ms)", bfd->name, message, p->vers_diag >> VERS_SHIFT, bfd_diag_str(p->vers_diag & DIAG_MASK), bfd_state_str(p->flags & STATE_MASK), @@ -1254,45 +1254,45 @@ bfd_find_by_name(const char *name) OVS_REQUIRES(mutex) static void bfd_put_details(struct ds *ds, const struct bfd *bfd) OVS_REQUIRES(mutex) { - ds_put_format(ds, "\tForwarding: %s\n", + ds_put_format(ds, " Forwarding: %s\n", bfd_forwarding__(CONST_CAST(struct bfd *, bfd)) ? "true" : "false"); - ds_put_format(ds, "\tDetect Multiplier: %d\n", bfd->mult); - ds_put_format(ds, "\tConcatenated Path Down: %s\n", + ds_put_format(ds, " Detect Multiplier: %d\n", bfd->mult); + ds_put_format(ds, " Concatenated Path Down: %s\n", bfd->cpath_down ? "true" : "false"); - ds_put_format(ds, "\tTX Interval: Approx %lldms\n", bfd_tx_interval(bfd)); - ds_put_format(ds, "\tRX Interval: Approx %lldms\n", bfd_rx_interval(bfd)); - ds_put_format(ds, "\tDetect Time: now %+lldms\n", + ds_put_format(ds, " TX Interval: Approx %lldms\n", bfd_tx_interval(bfd)); + ds_put_format(ds, " RX Interval: Approx %lldms\n", bfd_rx_interval(bfd)); + ds_put_format(ds, " Detect Time: now %+lldms\n", bfd->detect_time - time_msec()); - ds_put_format(ds, "\tNext TX Time: now %+lldms\n", + ds_put_format(ds, " Next TX Time: now %+lldms\n", bfd->next_tx -time_msec()); - ds_put_format(ds, "\tLast TX Time: now %+lldms\n", + ds_put_format(ds, " Last TX Time: now %+lldms\n", bfd->last_tx - time_msec()); ds_put_cstr(ds, "\n"); - ds_put_format(ds, "\tLocal Flags: %s\n", bfd_flag_str(bfd->flags)); - ds_put_format(ds, "\tLocal Session State: %s\n", + ds_put_format(ds, " Local Flags: %s\n", bfd_flag_str(bfd->flags)); + ds_put_format(ds, " Local Session State: %s\n", bfd_state_str(bfd->state)); - ds_put_format(ds, "\tLocal Diagnostic: %s\n", bfd_diag_str(bfd->diag)); - ds_put_format(ds, "\tLocal Discriminator: 0x%"PRIx32"\n", bfd->disc); - ds_put_format(ds, "\tLocal Minimum TX Interval: %lldms\n", + ds_put_format(ds, " Local Diagnostic: %s\n", bfd_diag_str(bfd->diag)); + ds_put_format(ds, " Local Discriminator: 0x%"PRIx32"\n", bfd->disc); + ds_put_format(ds, " Local Minimum TX Interval: %lldms\n", bfd_min_tx(bfd)); - ds_put_format(ds, "\tLocal Minimum RX Interval: %lldms\n", bfd->min_rx); + ds_put_format(ds, " Local Minimum RX Interval: %lldms\n", bfd->min_rx); ds_put_cstr(ds, "\n"); - ds_put_format(ds, "\tRemote Flags: %s\n", bfd_flag_str(bfd->rmt_flags)); - ds_put_format(ds, "\tRemote Session State: %s\n", + ds_put_format(ds, " Remote Flags: %s\n", bfd_flag_str(bfd->rmt_flags)); + ds_put_format(ds, " Remote Session State: %s\n", bfd_state_str(bfd->rmt_state)); - ds_put_format(ds, "\tRemote Diagnostic: %s\n", + ds_put_format(ds, " Remote Diagnostic: %s\n", bfd_diag_str(bfd->rmt_diag)); - ds_put_format(ds, "\tRemote Discriminator: 0x%"PRIx32"\n", bfd->rmt_disc); - ds_put_format(ds, "\tRemote Minimum TX Interval: %lldms\n", + ds_put_format(ds, " Remote Discriminator: 0x%"PRIx32"\n", bfd->rmt_disc); + ds_put_format(ds, " Remote Minimum TX Interval: %lldms\n", bfd->rmt_min_tx); - ds_put_format(ds, "\tRemote Minimum RX Interval: %lldms\n", + ds_put_format(ds, " Remote Minimum RX Interval: %lldms\n", bfd->rmt_min_rx); - ds_put_format(ds, "\tRemote Detect Multiplier: %d\n", bfd->rmt_mult); + ds_put_format(ds, " Remote Detect Multiplier: %d\n", bfd->rmt_mult); } static void |