argilo
/
gr-osmosdr
forked from sdr/gr-osmosdr
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

hackrf: since devicecount is signed, make comparisons signed as well

This commit is contained in:
Dimitri Stolnikov 2015-12-07 20:27:02 +01:00
parent 3198eb927a
commit 69ec75a0b4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/hackrf/hackrf_sink_c.cc
View File

@ -489,7 +489,7 @@ std::vector<std::string> hackrf_sink_c::get_devices()
#ifdef LIBHACKRF_HAVE_DEVICE_LIST #ifdef LIBHACKRF_HAVE_DEVICE_LIST
hackrf_device_list_t *list = hackrf_device_list(); hackrf_device_list_t *list = hackrf_device_list();
for (unsigned int i = 0; i < list->devicecount; i++) { for (int i = 0; i < list->devicecount; i++) {
label = "HackRF "; label = "HackRF ";
label += hackrf_usb_board_id_name( list->usb_board_ids[i] ); label += hackrf_usb_board_id_name( list->usb_board_ids[i] );

8
lib/hackrf/hackrf_source_c.cc
View File

@ -151,14 +151,14 @@ hackrf_source_c::hackrf_source_c (const std::string &args)
if (hackrf_serial.length() > 1) { if (hackrf_serial.length() > 1) {
ret = hackrf_open_by_serial( hackrf_serial.c_str(), &_dev ); ret = hackrf_open_by_serial( hackrf_serial.c_str(), &_dev );
} else { } else {
unsigned int dev_index = 0; int dev_index = 0;
try { try {
dev_index = boost::lexical_cast< unsigned int >( hackrf_serial ); dev_index = boost::lexical_cast< int >( hackrf_serial );
} catch ( std::exception &ex ) { } catch ( std::exception &ex ) {
throw std::runtime_error( throw std::runtime_error(
"Failed to use '" + hackrf_serial + "' as HackRF device index number: " + ex.what()); "Failed to use '" + hackrf_serial + "' as HackRF device index number: " + ex.what());
} }
hackrf_device_list_t *list = hackrf_device_list(); hackrf_device_list_t *list = hackrf_device_list();
if (dev_index < list->devicecount) { if (dev_index < list->devicecount) {
ret = hackrf_device_list_open(list, dev_index, &_dev); ret = hackrf_device_list_open(list, dev_index, &_dev);
@ -404,7 +404,7 @@ std::vector<std::string> hackrf_source_c::get_devices()
#ifdef LIBHACKRF_HAVE_DEVICE_LIST #ifdef LIBHACKRF_HAVE_DEVICE_LIST
hackrf_device_list_t *list = hackrf_device_list(); hackrf_device_list_t *list = hackrf_device_list();
for (unsigned int i = 0; i < list->devicecount; i++) { for (int i = 0; i < list->devicecount; i++) {
label = "HackRF "; label = "HackRF ";
label += hackrf_usb_board_id_name( list->usb_board_ids[i] ); label += hackrf_usb_board_id_name( list->usb_board_ids[i] );