diff options
| author | Andrej Rode <andrej.rode@ettus.com> | 2017-02-20 10:19:53 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-02-20 12:45:32 -0800 |
| commit | 2b33f2bb4c01d4306fd46f78edf6e355a03e2ed7 (patch) | |
| tree | 040c7e3e3df638b86f3c2c64fb99659e5a0210a9 /host | |
| parent | 37ebaa6ad84e90c7d1d0d1133af008e9970a333f (diff) | |
| download | uhd-2b33f2bb4c01d4306fd46f78edf6e355a03e2ed7.tar.gz uhd-2b33f2bb4c01d4306fd46f78edf6e355a03e2ed7.tar.bz2 uhd-2b33f2bb4c01d4306fd46f78edf6e355a03e2ed7.zip | |
uhd: Replace NULL with nullptr in if_addrs and super_recv_packet_handler
This is not a functional change, but it marks the usage of nullptr in UHD.
Commits past this one may also use this C++11 feature.
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/transport/if_addrs.cpp | 4 | ||||
| -rw-r--r-- | host/lib/transport/super_recv_packet_handler.hpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/host/lib/transport/if_addrs.cpp b/host/lib/transport/if_addrs.cpp index 3b8be5dd5..37b41f303 100644 --- a/host/lib/transport/if_addrs.cpp +++ b/host/lib/transport/if_addrs.cpp @@ -36,9 +36,9 @@ std::vector<uhd::transport::if_addrs_t> uhd::transport::get_if_addrs(void){ std::vector<if_addrs_t> if_addrs; struct ifaddrs *ifap; if (getifaddrs(&ifap) == 0){ - for (struct ifaddrs *iter = ifap; iter != NULL; iter = iter->ifa_next){ + for (struct ifaddrs *iter = ifap; iter != nullptr; iter = iter->ifa_next){ //ensure that the entries are valid - if (iter->ifa_addr == NULL) continue; + if (iter->ifa_addr == nullptr) continue; if (iter->ifa_addr->sa_family != AF_INET) continue; if (iter->ifa_netmask->sa_family != AF_INET) continue; if (iter->ifa_broadaddr->sa_family != AF_INET) continue; diff --git a/host/lib/transport/super_recv_packet_handler.hpp b/host/lib/transport/super_recv_packet_handler.hpp index 161d921bc..b6b4fb937 100644 --- a/host/lib/transport/super_recv_packet_handler.hpp +++ b/host/lib/transport/super_recv_packet_handler.hpp @@ -332,9 +332,9 @@ private: void reset() { buff.reset(); - vrt_hdr = NULL; + vrt_hdr = nullptr; time = time_spec_t(0.0); - copy_buff = NULL; + copy_buff = nullptr; } managed_recv_buffer::sptr buff; const uint32_t *vrt_hdr; @@ -409,7 +409,7 @@ private: //get a single packet from the transport layer managed_recv_buffer::sptr &buff = curr_buffer_info.buff; buff = _props[index].get_buff(timeout); - if (buff.get() == NULL) return PACKET_TIMEOUT_ERROR; + if (buff.get() == nullptr) return PACKET_TIMEOUT_ERROR; #ifdef ERROR_INJECT_DROPPED_PACKETS if (++recvd_packets > 1000) @@ -417,7 +417,7 @@ private: recvd_packets = 0; buff.reset(); buff = _props[index].get_buff(timeout); - if (buff.get() == NULL) return PACKET_TIMEOUT_ERROR; + if (buff.get() == nullptr) return PACKET_TIMEOUT_ERROR; } #endif @@ -616,7 +616,7 @@ private: UHD_MSG(fastpath) << "O"; } curr_info[index].buff.reset(); - curr_info[index].copy_buff = NULL; + curr_info[index].copy_buff = nullptr; return; case PACKET_TIMEOUT_ERROR: |