From: kwolekr <kwolekr@minetest.net>
Date: Fri, 12 Dec 2014 19:21:41 +0000 (-0500)
Subject: NodeResolver: Fix some comments and use const references for params
X-Git-Tag: 0.4.11~49
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2c9bbe2736e2c45a7ee66448c5aa5f80549adc53;p=oweals%2Fminetest.git

NodeResolver: Fix some comments and use const references for params
---

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index 112373b1e..1795b199c 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -1285,8 +1285,8 @@ NodeResolver::~NodeResolver()
 }
 
 
-int NodeResolver::addNode(std::string n_wanted, std::string n_alt,
-		content_t c_fallback, content_t *content)
+int NodeResolver::addNode(const std::string &n_wanted, const std::string &n_alt,
+	content_t c_fallback, content_t *content)
 {
 	if (m_is_node_registration_complete) {
 		if (m_ndef->getId(n_wanted, *content))
@@ -1312,8 +1312,8 @@ int NodeResolver::addNode(std::string n_wanted, std::string n_alt,
 }
 
 
-int NodeResolver::addNodeList(const char *nodename,
-		std::vector<content_t> *content_vec)
+int NodeResolver::addNodeList(const std::string &nodename,
+	std::vector<content_t> *content_vec)
 {
 	if (m_is_node_registration_complete) {
 		std::set<content_t> idset;
@@ -1326,7 +1326,7 @@ int NodeResolver::addNodeList(const char *nodename,
 		return idset.size() ? NR_STATUS_SUCCESS : NR_STATUS_FAILURE;
 	} else {
 		m_pending_content_vecs.push_back(
-			std::make_pair(std::string(nodename), content_vec));
+			std::make_pair(nodename, content_vec));
 		return NR_STATUS_PENDING;
 	}
 }
diff --git a/src/nodedef.h b/src/nodedef.h
index 978b9b7cd..dd76717e1 100644
--- a/src/nodedef.h
+++ b/src/nodedef.h
@@ -337,7 +337,7 @@ public:
 			node name resolution.
 		@return Status of node resolution request.
 	*/
-	int addNode(std::string n_wanted, std::string n_alt,
+	int addNode(const std::string &n_wanted, const std::string &n_alt,
 		content_t c_fallback, content_t *content);
 
 	/**
@@ -358,11 +358,12 @@ public:
 
 		@return Status of node resolution request.
 	*/
-	int addNodeList(const char *nodename, std::vector<content_t> *content_vec);
+	int addNodeList(const std::string &nodename,
+		std::vector<content_t> *content_vec);
 
 	/**
-		Removes all pending requests from the resolution queue to be satisfied
-		to content.
+		Removes all pending requests from the resolution queue with the output
+		address of 'content'.
 
 		@param content Location of the content ID for the request being
 			cancelled.
@@ -371,8 +372,8 @@ public:
 	bool cancelNode(content_t *content);
 
 	/**
-		Removes all pending requests from the resolution queue to be satisfied
-		to content_vec.
+		Removes all pending requests from the resolution queue with the output
+		address of 'content_vec'.
 
 		@param content_vec Location of the content ID vector for requests being
 			cancelled.