diff --git a/src/config-store/model/display-functions.cc b/src/config-store/model/display-functions.cc index a3e789c15..bb61fb5a8 100644 --- a/src/config-store/model/display-functions.cc +++ b/src/config-store/model/display-functions.cc @@ -37,7 +37,7 @@ cell_data_function_col_1(GtkTreeViewColumn* col, GtkTreeIter* iter, gpointer user_data) { - ModelNode* node = 0; + ModelNode* node = nullptr; gtk_tree_model_get(model, iter, COL_NODE, &node, -1); if (!node) { @@ -47,13 +47,13 @@ cell_data_function_col_1(GtkTreeViewColumn* col, { StringValue str; node->object->GetAttribute(node->name, str); - g_object_set(renderer, "text", str.Get().c_str(), (char*)0); - g_object_set(renderer, "editable", TRUE, (char*)0); + g_object_set(renderer, "text", str.Get().c_str(), nullptr); + g_object_set(renderer, "editable", TRUE, nullptr); } else { - g_object_set(renderer, "text", "", (char*)0); - g_object_set(renderer, "editable", FALSE, (char*)0); + g_object_set(renderer, "text", "", nullptr); + g_object_set(renderer, "editable", FALSE, nullptr); } } @@ -68,9 +68,9 @@ cell_data_function_col_0(GtkTreeViewColumn* col, GtkTreeIter* iter, gpointer user_data) { - ModelNode* node = 0; + ModelNode* node = nullptr; gtk_tree_model_get(model, iter, COL_NODE, &node, -1); - g_object_set(renderer, "editable", FALSE, (char*)0); + g_object_set(renderer, "editable", FALSE, nullptr); if (!node) { return; @@ -82,22 +82,22 @@ cell_data_function_col_0(GtkTreeViewColumn* col, g_object_set(renderer, "text", node->object->GetInstanceTypeId().GetName().c_str(), - (char*)0); + nullptr); break; case ModelNode::NODE_POINTER: - g_object_set(renderer, "text", node->name.c_str(), (char*)0); + g_object_set(renderer, "text", node->name.c_str(), nullptr); break; case ModelNode::NODE_VECTOR: - g_object_set(renderer, "text", node->name.c_str(), (char*)0); + g_object_set(renderer, "text", node->name.c_str(), nullptr); break; case ModelNode::NODE_VECTOR_ITEM: { std::stringstream oss; oss << node->index; - g_object_set(renderer, "text", oss.str().c_str(), (char*)0); + g_object_set(renderer, "text", oss.str().c_str(), nullptr); } break; case ModelNode::NODE_ATTRIBUTE: - g_object_set(renderer, "text", node->name.c_str(), (char*)0); + g_object_set(renderer, "text", node->name.c_str(), nullptr); break; } } @@ -114,7 +114,7 @@ cell_edited_callback(GtkCellRendererText* cell, GtkTreeModel* model = GTK_TREE_MODEL(user_data); GtkTreeIter iter; gtk_tree_model_get_iter_from_string(model, &iter, path_string); - ModelNode* node = 0; + ModelNode* node = nullptr; gtk_tree_model_get(model, &iter, COL_NODE, &node, -1); if (!node) { @@ -133,8 +133,8 @@ get_col_number_from_tree_view_column(GtkTreeViewColumn* col) { GList* cols; int num; - g_return_val_if_fail(col != 0, -1); - g_return_val_if_fail(gtk_tree_view_column_get_tree_view(col) != 0, -1); + g_return_val_if_fail(col != nullptr, -1); + g_return_val_if_fail(gtk_tree_view_column_get_tree_view(col) != nullptr, -1); cols = gtk_tree_view_get_columns(GTK_TREE_VIEW(gtk_tree_view_column_get_tree_view(col))); num = g_list_index(cols, (gpointer)col); g_list_free(cols); @@ -161,18 +161,24 @@ cell_tooltip_callback(GtkWidget* widget, &y, keyboard_tip, &model, - 0, + nullptr, &iter)) { return FALSE; } - if (!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), x, y, 0, &column, 0, 0)) + if (!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), + x, + y, + nullptr, + &column, + nullptr, + nullptr)) { return FALSE; } int col = get_col_number_from_tree_view_column(column); - ModelNode* node = 0; + ModelNode* node = nullptr; gtk_tree_model_get(model, &iter, COL_NODE, &node, -1); if (!node) { @@ -263,7 +269,7 @@ create_view(GtkTreeStore* model) GtkWidget* view; view = gtk_tree_view_new(); - g_object_set(view, "has-tooltip", TRUE, (char*)0); + g_object_set(view, "has-tooltip", TRUE, nullptr); g_signal_connect(view, "query-tooltip", (GCallback)cell_tooltip_callback, 0); gtk_tree_view_set_grid_lines(GTK_TREE_VIEW(view), GTK_TREE_VIEW_GRID_LINES_BOTH); @@ -274,8 +280,12 @@ create_view(GtkTreeStore* model) gtk_tree_view_append_column(GTK_TREE_VIEW(view), col); renderer = gtk_cell_renderer_text_new(); gtk_tree_view_column_pack_start(col, renderer, TRUE); - gtk_tree_view_column_set_cell_data_func(col, renderer, cell_data_function_col_0, 0, 0); - g_object_set(renderer, "editable", FALSE, (char*)0); + gtk_tree_view_column_set_cell_data_func(col, + renderer, + cell_data_function_col_0, + nullptr, + nullptr); + g_object_set(renderer, "editable", FALSE, nullptr); col = gtk_tree_view_column_new(); gtk_tree_view_column_set_title(col, "Attribute Value"); @@ -283,7 +293,11 @@ create_view(GtkTreeStore* model) renderer = gtk_cell_renderer_text_new(); g_signal_connect(renderer, "edited", (GCallback)cell_edited_callback, model); gtk_tree_view_column_pack_start(col, renderer, TRUE); - gtk_tree_view_column_set_cell_data_func(col, renderer, cell_data_function_col_1, 0, 0); + gtk_tree_view_column_set_cell_data_func(col, + renderer, + cell_data_function_col_1, + nullptr, + nullptr); gtk_tree_view_set_model(GTK_TREE_VIEW(view), GTK_TREE_MODEL(model)); @@ -319,13 +333,13 @@ delete_event_callback(GtkWidget* widget, GdkEvent* event, gpointer user_data) gboolean clean_model_callback(GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer data) { - ModelNode* node = 0; + ModelNode* node = nullptr; gtk_tree_model_get(GTK_TREE_MODEL(model), iter, COL_NODE, &node, -1); if (node) { delete node; } - gtk_tree_store_set(GTK_TREE_STORE(model), iter, COL_NODE, (ModelNode*)0, -1); + gtk_tree_store_set(GTK_TREE_STORE(model), iter, COL_NODE, nullptr, -1); return FALSE; } @@ -341,7 +355,7 @@ cell_data_function_col_1_config_default(GtkTreeViewColumn* col, GtkTreeIter* iter, gpointer user_data) { - ModelTypeid* node = 0; + ModelTypeid* node = nullptr; gtk_tree_model_get(model, iter, COL_TYPEID, &node, -1); if (!node) { @@ -349,13 +363,13 @@ cell_data_function_col_1_config_default(GtkTreeViewColumn* col, } if (node->type == ModelTypeid::NODE_ATTRIBUTE) { - g_object_set(renderer, "text", node->defaultValue.c_str(), (char*)0); - g_object_set(renderer, "editable", TRUE, (char*)0); + g_object_set(renderer, "text", node->defaultValue.c_str(), nullptr); + g_object_set(renderer, "editable", TRUE, nullptr); } else { - g_object_set(renderer, "text", "", (char*)0); - g_object_set(renderer, "editable", FALSE, (char*)0); + g_object_set(renderer, "text", "", nullptr); + g_object_set(renderer, "editable", FALSE, nullptr); } } @@ -369,9 +383,9 @@ cell_data_function_col_0_config_default(GtkTreeViewColumn* col, GtkTreeIter* iter, gpointer user_data) { - ModelTypeid* node = 0; + ModelTypeid* node = nullptr; gtk_tree_model_get(model, iter, COL_NODE, &node, -1); - g_object_set(renderer, "editable", FALSE, (char*)0); + g_object_set(renderer, "editable", FALSE, nullptr); if (!node) { return; @@ -380,10 +394,10 @@ cell_data_function_col_0_config_default(GtkTreeViewColumn* col, switch (node->type) { case ModelTypeid::NODE_TYPEID: - g_object_set(renderer, "text", node->tid.GetName().c_str(), (char*)0); + g_object_set(renderer, "text", node->tid.GetName().c_str(), nullptr); break; case ModelTypeid::NODE_ATTRIBUTE: - g_object_set(renderer, "text", node->name.c_str(), (char*)0); + g_object_set(renderer, "text", node->name.c_str(), nullptr); break; } } @@ -402,7 +416,7 @@ cell_edited_callback_config_default(GtkCellRendererText* cell, GtkTreeModel* model = GTK_TREE_MODEL(user_data); GtkTreeIter iter; gtk_tree_model_get_iter_from_string(model, &iter, path_string); - ModelTypeid* node = 0; + ModelTypeid* node = nullptr; gtk_tree_model_get(model, &iter, COL_NODE, &node, -1); if (!node) { @@ -446,18 +460,24 @@ cell_tooltip_callback_config_default(GtkWidget* widget, &y, keyboard_tip, &model, - 0, + nullptr, &iter)) { return FALSE; } - if (!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), x, y, 0, &column, 0, 0)) + if (!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), + x, + y, + nullptr, + &column, + nullptr, + nullptr)) { return FALSE; } int col = get_col_number_from_tree_view_column(column); - ModelTypeid* node = 0; + ModelTypeid* node = nullptr; gtk_tree_model_get(model, &iter, COL_NODE, &node, -1); if (!node) { @@ -651,7 +671,7 @@ create_view_config_default(GtkTreeStore* model) GtkWidget* view; view = gtk_tree_view_new(); - g_object_set(view, "has-tooltip", TRUE, (char*)0); + g_object_set(view, "has-tooltip", TRUE, nullptr); g_signal_connect(view, "query-tooltip", (GCallback)cell_tooltip_callback_config_default, 0); gtk_tree_view_set_grid_lines(GTK_TREE_VIEW(view), GTK_TREE_VIEW_GRID_LINES_BOTH); @@ -665,9 +685,9 @@ create_view_config_default(GtkTreeStore* model) gtk_tree_view_column_set_cell_data_func(col, renderer, cell_data_function_col_0_config_default, - 0, - 0); - g_object_set(renderer, "editable", FALSE, (char*)0); + nullptr, + nullptr); + g_object_set(renderer, "editable", FALSE, nullptr); col = gtk_tree_view_column_new(); gtk_tree_view_column_set_title(col, "Attribute Value"); @@ -678,8 +698,8 @@ create_view_config_default(GtkTreeStore* model) gtk_tree_view_column_set_cell_data_func(col, renderer, cell_data_function_col_1_config_default, - 0, - 0); + nullptr, + nullptr); gtk_tree_view_set_model(GTK_TREE_VIEW(view), GTK_TREE_MODEL(model)); @@ -697,13 +717,13 @@ clean_model_callback_config_default(GtkTreeModel* model, GtkTreeIter* iter, gpointer data) { - ModelTypeid* node = 0; + ModelTypeid* node = nullptr; gtk_tree_model_get(GTK_TREE_MODEL(model), iter, COL_TYPEID, &node, -1); if (node) { delete node; } - gtk_tree_store_set(GTK_TREE_STORE(model), iter, COL_TYPEID, (ModelTypeid*)0, -1); + gtk_tree_store_set(GTK_TREE_STORE(model), iter, COL_TYPEID, nullptr, -1); return FALSE; } diff --git a/src/config-store/model/gtk-config-store.cc b/src/config-store/model/gtk-config-store.cc index 4e7d63f6b..eb4cc37d3 100644 --- a/src/config-store/model/gtk-config-store.cc +++ b/src/config-store/model/gtk-config-store.cc @@ -43,7 +43,7 @@ GtkConfigStore::ConfigureDefaults() GtkWidget* view; GtkWidget* scroll; - gtk_init(0, 0); + gtk_init(nullptr, nullptr); window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_title(GTK_WINDOW(window), "ns-3 Default attributes."); gtk_window_set_default_size(GTK_WINDOW(window), 600, 600); @@ -54,7 +54,7 @@ GtkConfigStore::ConfigureDefaults() creator.Build(model); view = create_view_config_default(model); - scroll = gtk_scrolled_window_new(0, 0); + scroll = gtk_scrolled_window_new(nullptr, nullptr); gtk_container_add(GTK_CONTAINER(scroll), view); GtkWidget* vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5); @@ -78,7 +78,7 @@ GtkConfigStore::ConfigureDefaults() gtk_main(); - gtk_tree_model_foreach(GTK_TREE_MODEL(model), clean_model_callback_config_default, 0); + gtk_tree_model_foreach(GTK_TREE_MODEL(model), clean_model_callback_config_default, nullptr); gtk_widget_destroy(window); } @@ -90,7 +90,7 @@ GtkConfigStore::ConfigureAttributes() GtkWidget* view; GtkWidget* scroll; - gtk_init(0, 0); + gtk_init(nullptr, nullptr); window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_title(GTK_WINDOW(window), "ns-3 Object attributes."); @@ -103,7 +103,7 @@ GtkConfigStore::ConfigureAttributes() creator.Build(model); view = create_view(model); - scroll = gtk_scrolled_window_new(0, 0); + scroll = gtk_scrolled_window_new(nullptr, nullptr); gtk_container_add(GTK_CONTAINER(scroll), view); GtkWidget* vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5); @@ -127,7 +127,7 @@ GtkConfigStore::ConfigureAttributes() gtk_main(); - gtk_tree_model_foreach(GTK_TREE_MODEL(model), clean_model_callback, 0); + gtk_tree_model_foreach(GTK_TREE_MODEL(model), clean_model_callback, nullptr); gtk_widget_destroy(window); } diff --git a/src/config-store/model/model-typeid-creator.cc b/src/config-store/model/model-typeid-creator.cc index cee40556e..fd360eb99 100644 --- a/src/config-store/model/model-typeid-creator.cc +++ b/src/config-store/model/model-typeid-creator.cc @@ -29,7 +29,7 @@ void ModelTypeidCreator::Build(GtkTreeStore* treestore) { m_treestore = treestore; - m_iters.push_back(0); + m_iters.push_back(nullptr); Iterate(); NS_ASSERT(m_iters.size() == 1); } diff --git a/src/core/model/ptr.h b/src/core/model/ptr.h index 40990e445..9e994b020 100644 --- a/src/core/model/ptr.h +++ b/src/core/model/ptr.h @@ -229,13 +229,13 @@ class Ptr * \note Explicit tests against `0`, `NULL` or `nullptr` are not supported. * All these cases will fail to compile: * \code - * if (p != 0) {...} // Should be `if (p)` + * if (p != nullptr {...} // Should be `if (p)` * if (p != NULL) {...} - * if (p != nullptr {...} + * if (p != 0) {...} * - * if (p == 0) {...} // Should be `if (!p)` + * if (p == nullptr {...} // Should be `if (!p)` * if (p == NULL) {...} - * if (p == nullptr {...} + * if (p == 0) {...} * \endcode * Just use `if (p)` or `if (!p)` as indicated. * diff --git a/src/core/model/system-path.cc b/src/core/model/system-path.cc index ccf53ea3f..ae34acca2 100644 --- a/src/core/model/system-path.cc +++ b/src/core/model/system-path.cc @@ -205,7 +205,7 @@ FindSelfDirectory() { uint32_t bufsize = 1024; char* buffer = (char*)malloc(bufsize); - NS_ASSERT(buffer != 0); + NS_ASSERT(buffer); int status = _NSGetExecutablePath(buffer, &bufsize); if (status == -1) { @@ -228,7 +228,7 @@ FindSelfDirectory() mib[2] = KERN_PROC_PATHNAME; mib[3] = -1; - sysctl(mib, 4, buf, &bufSize, NULL, 0); + sysctl(mib, 4, buf, &bufSize, nullptr, 0); filename = buf; } #endif @@ -318,10 +318,10 @@ MakeTemporaryDirectoryName() char* path = nullptr; path = std::getenv("TMP"); - if (path == nullptr || std::strlen(path) == 0) + if (!path || std::strlen(path) == 0) { path = std::getenv("TEMP"); - if (path == nullptr || std::strlen(path) == 0) + if (path || std::strlen(path) == 0) { path = const_cast("/tmp"); } diff --git a/src/core/test/random-variable-stream-test-suite.cc b/src/core/test/random-variable-stream-test-suite.cc index 48c5950fe..6b34ab755 100644 --- a/src/core/test/random-variable-stream-test-suite.cc +++ b/src/core/test/random-variable-stream-test-suite.cc @@ -321,7 +321,7 @@ class TestCaseBase : public TestCase uint32_t seed; if (RngSeedManager::GetRun() == 0) { - seed = static_cast(time(0)); + seed = static_cast(time(nullptr)); m_seedSet = true; NS_LOG_DEBUG( "Special run number value of zero; seeding with time of day: " << seed); diff --git a/src/core/test/rng-test-suite.cc b/src/core/test/rng-test-suite.cc index d884f1ea4..a257d657f 100644 --- a/src/core/test/rng-test-suite.cc +++ b/src/core/test/rng-test-suite.cc @@ -135,7 +135,7 @@ RngUniformTestCase::ChiSquaredTest(Ptr u) void RngUniformTestCase::DoRun() { - RngSeedManager::SetSeed(static_cast(time(0))); + RngSeedManager::SetSeed(static_cast(time(nullptr))); double sum = 0.; double maxStatistic = gsl_cdf_chisq_Qinv(0.05, N_BINS); @@ -242,7 +242,7 @@ RngNormalTestCase::ChiSquaredTest(Ptr n) void RngNormalTestCase::DoRun() { - RngSeedManager::SetSeed(static_cast(time(0))); + RngSeedManager::SetSeed(static_cast(time(nullptr))); double sum = 0.; double maxStatistic = gsl_cdf_chisq_Qinv(0.05, N_BINS); @@ -348,7 +348,7 @@ RngExponentialTestCase::ChiSquaredTest(Ptr e) void RngExponentialTestCase::DoRun() { - RngSeedManager::SetSeed(static_cast(time(0))); + RngSeedManager::SetSeed(static_cast(time(nullptr))); double sum = 0.; double maxStatistic = gsl_cdf_chisq_Qinv(0.05, N_BINS); @@ -457,7 +457,7 @@ RngParetoTestCase::ChiSquaredTest(Ptr p) void RngParetoTestCase::DoRun() { - RngSeedManager::SetSeed(static_cast(time(0))); + RngSeedManager::SetSeed(static_cast(time(nullptr))); double sum = 0.; double maxStatistic = gsl_cdf_chisq_Qinv(0.05, N_BINS); diff --git a/src/fd-net-device/helper/netmap-device-creator.cc b/src/fd-net-device/helper/netmap-device-creator.cc index bd78db69d..e0e1fa368 100644 --- a/src/fd-net-device/helper/netmap-device-creator.cc +++ b/src/fd-net-device/helper/netmap-device-creator.cc @@ -41,7 +41,7 @@ int main(int argc, char* argv[]) { int c; - char* path = NULL; + char* path = nullptr; opterr = 0; @@ -69,7 +69,7 @@ main(int argc, char* argv[]) // us. We see it here as the "path" string. We can't do anything useful // unless we have that string. // - ABORT_IF(path == NULL, "path is a required argument", 0); + ABORT_IF(!path, "path is a required argument", 0); LOG("Provided path is \"" << path << "\""); // // The whole reason for all of the hoops we went through to call out to this diff --git a/src/fd-net-device/helper/netmap-net-device-helper.cc b/src/fd-net-device/helper/netmap-net-device-helper.cc index c68c6ce0d..2ec463ae7 100644 --- a/src/fd-net-device/helper/netmap-net-device-helper.cc +++ b/src/fd-net-device/helper/netmap-net-device-helper.cc @@ -286,7 +286,7 @@ NetmapNetDeviceHelper::CreateFileDescriptor() const status = ::execlp(NETMAP_DEV_CREATOR, NETMAP_DEV_CREATOR, // argv[0] (filename) oss.str().c_str(), // argv[1] (-pcmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS) { diff --git a/src/fd-net-device/model/dpdk-net-device.cc b/src/fd-net-device/model/dpdk-net-device.cc index 4d895bfd3..b8898b780 100644 --- a/src/fd-net-device/model/dpdk-net-device.cc +++ b/src/fd-net-device/model/dpdk-net-device.cc @@ -92,7 +92,7 @@ DpdkNetDevice::GetTypeId() } DpdkNetDevice::DpdkNetDevice() - : m_mempool(NULL) + : m_mempool(nullptr) { NS_LOG_FUNCTION(this); } @@ -205,7 +205,7 @@ DpdkNetDevice::HandleRx() for (uint16_t i = 0; i < m_rxBuffer->length; i++) { - struct rte_mbuf* pkt = NULL; + struct rte_mbuf* pkt = nullptr; pkt = m_rxBuffer->pkts[i]; if (!pkt) @@ -306,7 +306,7 @@ DpdkNetDevice::InitDpdk(int argc, char** argv, std::string dpdkDriver) RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id()); - if (m_mempool == NULL) + if (!m_mempool) { rte_exit(EXIT_FAILURE, "Cannot init mbuf pool\n"); } @@ -380,7 +380,7 @@ DpdkNetDevice::InitDpdk(int argc, char** argv, std::string dpdkDriver) RTE_ETH_TX_BUFFER_SIZE(m_maxRxPktBurst), 0, rte_eth_dev_socket_id(m_portId)); - if (m_txBuffer == NULL || m_rxBuffer == NULL) + if (!m_txBuffer || !m_rxBuffer) { rte_exit(EXIT_FAILURE, "Cannot allocate buffer for rx/tx on port %u\n", m_portId); } @@ -409,7 +409,7 @@ DpdkNetDevice::AllocateBuffer(size_t len) struct rte_mbuf* pkt = rte_pktmbuf_alloc(m_mempool); if (!pkt) { - return NULL; + return nullptr; } uint8_t* buf = rte_pktmbuf_mtod(pkt, uint8_t*); return buf; @@ -435,7 +435,7 @@ DpdkNetDevice::Write(uint8_t* buffer, size_t length) struct rte_mbuf** pkt = new struct rte_mbuf*[1]; int queueId = 0; - if (buffer == NULL || m_txBuffer->length == m_maxTxPktBurst) + if (!buffer || m_txBuffer->length == m_maxTxPktBurst) { NS_LOG_ERROR("Error allocating mbuf" << buffer); return -1; diff --git a/src/fd-net-device/model/netmap-net-device.cc b/src/fd-net-device/model/netmap-net-device.cc index 78344216a..7af7de7bd 100644 --- a/src/fd-net-device/model/netmap-net-device.cc +++ b/src/fd-net-device/model/netmap-net-device.cc @@ -151,7 +151,7 @@ NetmapNetDeviceFdReader::DoRead() // advance the netmap pointers and sync the fd rxring->head = rxring->cur = nm_ring_next(rxring, i); - ioctl(m_fd, NIOCRXSYNC, NULL); + ioctl(m_fd, NIOCRXSYNC, nullptr); break; } @@ -328,7 +328,7 @@ NetmapNetDevice::SyncAndNotifyQueue() { // we sync the netmap ring periodically. // the traffic control layer can write packets during the period between two syncs. - ioctl(GetFileDescriptor(), NIOCTXSYNC, NULL); + ioctl(GetFileDescriptor(), NIOCTXSYNC, nullptr); // we need of a nearly periodic notification to queue limits of the transmitted bytes. uint32_t totalTransmittedBytes = m_totalQueuedBytes - GetBytesInNetmapTxRing(); @@ -353,7 +353,7 @@ NetmapNetDevice::SyncAndNotifyQueue() NS_LOG_DEBUG("Space in the netmap ring of " << nm_ring_space(txring) << " packets"); } - ioctl(GetFileDescriptor(), NIOCTXSYNC, NULL); + ioctl(GetFileDescriptor(), NIOCTXSYNC, nullptr); } ssize_t diff --git a/src/internet/model/global-router-interface.cc b/src/internet/model/global-router-interface.cc index 5d473b163..64d6de500 100644 --- a/src/internet/model/global-router-interface.cc +++ b/src/internet/model/global-router-interface.cc @@ -230,7 +230,7 @@ GlobalRoutingLSA::ClearLinkRecords() delete p; p = nullptr; - *i = 0; + *i = nullptr; } NS_LOG_LOGIC("Clear list"); m_linkRecords.clear(); @@ -565,7 +565,7 @@ GlobalRouter::ClearLSAs() delete p; p = nullptr; - *i = 0; + *i = nullptr; } NS_LOG_LOGIC("Clear list of LSAs"); m_LSAs.clear(); diff --git a/src/netanim/test/netanim-test.cc b/src/netanim/test/netanim-test.cc index 84007ef23..29ea6d771 100644 --- a/src/netanim/test/netanim-test.cc +++ b/src/netanim/test/netanim-test.cc @@ -105,7 +105,7 @@ void AbstractAnimationInterfaceTestCase::CheckFileExistence() { FILE* fp = fopen(m_traceFileName, "r"); - NS_TEST_ASSERT_MSG_NE(fp, 0, "Trace file was not created"); + NS_TEST_ASSERT_MSG_NE(fp, nullptr, "Trace file was not created"); fclose(fp); unlink(m_traceFileName); } diff --git a/src/network/test/pcap-file-test-suite.cc b/src/network/test/pcap-file-test-suite.cc index c5a1684ba..8ccc71087 100644 --- a/src/network/test/pcap-file-test-suite.cc +++ b/src/network/test/pcap-file-test-suite.cc @@ -508,7 +508,7 @@ FileHeaderTestCase::DoRun() // FILE* p = std::fopen(m_testFilename.c_str(), "r+b"); NS_TEST_ASSERT_MSG_NE(p, - 0, + nullptr, "fopen(" << m_testFilename << ") should have been able to open a correctly created pcap file"); @@ -650,7 +650,7 @@ FileHeaderTestCase::DoRun() // p = std::fopen(m_testFilename.c_str(), "r+b"); NS_TEST_ASSERT_MSG_NE(p, - 0, + nullptr, "fopen(" << m_testFilename << ") should have been able to open a correctly created pcap file"); @@ -806,7 +806,7 @@ RecordHeaderTestCase::DoRun() // FILE* p = std::fopen(m_testFilename.c_str(), "r+b"); NS_TEST_ASSERT_MSG_NE(p, - 0, + nullptr, "fopen() should have been able to open a correctly created pcap file"); // @@ -978,7 +978,7 @@ RecordHeaderTestCase::DoRun() // p = std::fopen(m_testFilename.c_str(), "r+b"); NS_TEST_ASSERT_MSG_NE(p, - 0, + nullptr, "fopen() should have been able to open a correctly created pcap file"); // diff --git a/src/olsr/model/olsr-routing-protocol.cc b/src/olsr/model/olsr-routing-protocol.cc index e030e0cc6..c2dc2eb2a 100644 --- a/src/olsr/model/olsr-routing-protocol.cc +++ b/src/olsr/model/olsr-routing-protocol.cc @@ -2377,7 +2377,7 @@ OLSR::mac_failed (Ptr p) } OLSR_link_tuple* link_tuple = state_.find_link_tuple (ch->next_hop ()); - if (link_tuple != NULL) + if (link_tuple) { link_tuple->lost_time () = now + OLSR_NEIGHB_HOLD_TIME; link_tuple->time () = now + OLSR_NEIGHB_HOLD_TIME; diff --git a/src/visualizer/model/pyviz.cc b/src/visualizer/model/pyviz.cc index 28e8c1a80..11928bcdc 100644 --- a/src/visualizer/model/pyviz.cc +++ b/src/visualizer/model/pyviz.cc @@ -501,7 +501,7 @@ PyViz::TraceDevQueueDrop(std::string context, Ptr packet) PacketSample lastPacket; lastPacket.time = Simulator::Now(); lastPacket.packet = packet->Copy(); - lastPacket.device = NULL; + lastPacket.device = nullptr; last.lastDroppedPackets.push_back(lastPacket); while (last.lastDroppedPackets.size() > captureOptions->numLastPackets) { diff --git a/src/visualizer/model/visual-simulator-impl.cc b/src/visualizer/model/visual-simulator-impl.cc index ab7e7f2cf..1f4cb1c2d 100644 --- a/src/visualizer/model/visual-simulator-impl.cc +++ b/src/visualizer/model/visual-simulator-impl.cc @@ -119,7 +119,7 @@ VisualSimulatorImpl::Run() { if (!Py_IsInitialized()) { - const wchar_t* argv[] = {L"python", NULL}; + const wchar_t* argv[] = {L"python", nullptr}; Py_Initialize(); PySys_SetArgv(1, (wchar_t**)argv); PyRun_SimpleString("import visualizer\n"