From 0ce526f302de68ece342545b4533aab699336028 Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Wed, 19 Aug 2015 11:13:20 -0700 Subject: Fixed minor warnings * Unreferenced exceptions in try-catch statements * Incorrect function documentation * Unlabelled unused variables --- host/lib/usrp_clock/octoclock/kk_ihex_read.h | 6 +++--- host/lib/usrp_clock/octoclock/octoclock_uart.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'host/lib/usrp_clock') diff --git a/host/lib/usrp_clock/octoclock/kk_ihex_read.h b/host/lib/usrp_clock/octoclock/kk_ihex_read.h index 5e210fddb..303622b18 100644 --- a/host/lib/usrp_clock/octoclock/kk_ihex_read.h +++ b/host/lib/usrp_clock/octoclock/kk_ihex_read.h @@ -54,11 +54,11 @@ void ihex_begin_read(struct ihex_state * const ihex); // Begin reading at `address` (the lowest 16 bits of which will be ignored); // this is required only if the high bytes of the 32-bit starting address // are not specified in the input data and they are non-zero -void ihex_read_at_address(struct ihex_state *ihex, +void ihex_read_at_address(struct ihex_state * const ihex, ihex_address_t address); // Read a single character -void ihex_read_byte(struct ihex_state *ihex, char chr, FILE* outfile); +void ihex_read_byte(struct ihex_state * const ihex, const char byte, FILE* outfile); // Read `count` bytes from `data` void ihex_read_bytes(struct ihex_state * ihex, @@ -67,7 +67,7 @@ void ihex_read_bytes(struct ihex_state * ihex, FILE* outfile); // End reading (may call `ihex_data_read` if there is data waiting) -void ihex_end_read(struct ihex_state *ihex, FILE* outfile); +void ihex_end_read(struct ihex_state * const ihex, FILE* outfile); // Called when a complete line has been read, the record type of which is // passed as `type`. The `ihex` structure will have its fields `data`, diff --git a/host/lib/usrp_clock/octoclock/octoclock_uart.cpp b/host/lib/usrp_clock/octoclock/octoclock_uart.cpp index e879c4b70..f366bac30 100644 --- a/host/lib/usrp_clock/octoclock/octoclock_uart.cpp +++ b/host/lib/usrp_clock/octoclock/octoclock_uart.cpp @@ -1,5 +1,5 @@ // -// Copyright 2014 Ettus Research LLC +// Copyright 2014-2015 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -91,7 +91,7 @@ namespace uhd{ while(boost::get_system_time() < exit_time){ _update_cache(); - for(char ch = _getchar(); ch != -1; ch = _getchar()){ + for(char ch = _getchar(); ch != 0; ch = _getchar()){ if(ch == '\r') continue; //Skip carriage returns _rxbuff += ch; @@ -111,7 +111,7 @@ namespace uhd{ void octoclock_uart_iface::_update_cache(){ octoclock_packet_t pkt_out; pkt_out.len = 0; - pkt_out.sequence = 0; + pkt_out.sequence = 0; size_t len = 0; boost::uint8_t octoclock_data[udp_simple::mtu]; @@ -146,7 +146,7 @@ namespace uhd{ char octoclock_uart_iface::_getchar(){ if(LOCAL_STATE_AHEAD){ - return -1; + return 0; } char ch = _cache[_state.pos]; -- cgit v1.2.3